Ignore:
Timestamp:
Apr 13, 2010 10:13:48 AM (13 years ago)
Author:
srkline
Message:

Fixed some typos in help files.

Fixed some incorrect logic in conditional compilation for CatVSTable with different facilities.

Use proper save path in UCALC so that the suggested .bt5 ending is preserved.

--this line, and those below, will be ignored--

M trunk/NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf
M trunk/NCNR_User_Procedures/Reduction/USANS/U_CALC.ipf
M trunk/NCNR_Help_Files/Scattering_Simulation_v1.0.ihf
M trunk/NCNR_Help_Files/SANS_Reduction_Help_v5.20.ihf
M trunk/NCNR_Help_Files/SANS_Model_Docs_v4.10.ihf
M trunk/NCNR_Help_Files/SANS_Analysis_Docs_v4.10.ihf
M trunk/NCNR_Help_Files/USANSReductionHelp_v2.3.ihf

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf

    r684 r689  
    5858        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:MCR"              //added Mar 2008 
    5959        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Pos"              //added Mar 2010 
    60 #if (exists("ILL_D22")==6) 
    61         Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Reactorpower"       //activate for ILL, June 2008, 
     60         
     61        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Reactorpower"       //only used for for ILL, June 2008, 
    6262        WAVE ReactorPower = $"root:myGlobals:CatVSHeaderInfo:Reactorpower" 
    63 #endif 
    6463 
    6564        WAVE/T Filenames = $"root:myGlobals:CatVSHeaderInfo:Filenames" 
     
    213212        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR"               //added Mar 2008 
    214213        Wave GPos = $"root:myGlobals:CatVSHeaderInfo:Pos" 
     214        Wave/Z GReactPow = $"root:myGlobals:CatVSHeaderInfo:ReactorPower"               //activate for ILL June 2008 ( and the sort line too) 
     215 
    215216#if (exists("ILL_D22")==6) 
    216         Wave GReactPow = $"root:myGlobals:CatVSHeaderInfo:ReactorPower"         //activate for ILL June 2008 ( and the sort line too) 
    217217        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GReactPow 
    218 #endif 
    219  
    220 #if (exists("NCNR")==6) 
     218#elif (exists("NCNR")==6) 
    221219        //      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
    222220        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,gNumGuides 
     
    252250        Wave MCR = $"root:myGlobals:CatVSHeaderInfo:MCR"                //added Mar 2008 
    253251        Wave Pos = $"root:myGlobals:CatVSHeaderInfo:Pos" 
     252        Wave/Z ReactorPower = $"root:myGlobals:CatVSHeaderInfo:reactorpower"       //activate for ILL, June 08 (+ edit line) 
    254253#if (exists("ILL_D22")==6) 
    255 // for ILL 
    256         Wave ReactorPower = $"root:myGlobals:CatVSHeaderInfo:reactorpower"       //activate for ILL, June 08 (+ edit line) 
    257         Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, Pos, ReactorPower as "Data File Catalog" 
    258 #endif 
    259  
    260 #if (exists("NCNR")==6) 
     254        Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, ReactorPower as "Data File Catalog" 
     255#elif (exists("NCNR")==6) 
    261256// original order, magnetic at the end 
    262257//      Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 
     
    309304        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR" 
    310305        Wave GPos = $"root:myGlobals:CatVSHeaderInfo:Pos" 
    311 #if (exists("ILL_D22")==6) 
    312306        Wave GReactpow = $"root:myGlobals:CatVSHeaderInfo:reactorpower"         //activate for ILL, Jne 2008, (+ last insert @ end of function)  
    313 #endif 
     307 
    314308        lastPoint = numpnts(GLambda) 
    315309                 
Note: See TracChangeset for help on using the changeset viewer.