Ignore:
Timestamp:
Nov 25, 2009 2:40:15 PM (13 years ago)
Author:
srkline
Message:

USANS:

  • added warning for mutliple scattering to the panel (red if trouble)
  • improved handling of .bt5 files if the peak can't be found
  • added a routine to save the fake "cor" file along with the .bt5 files. The cor file is much more useful.

SANS:

  • updated (again) the SASCALC flux numbers. Also made some more of the flux paramters to be instrument specific globals to make future changes easier.
File:
1 edited

Legend:

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

    r588 r605  
    4747        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:XCenter" 
    4848        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:YCenter" 
    49         //Make/O/B/N=0 $"root:myGlobals:CatVSHeaderInfo:NumGuides" 
     49        Make/O/B/N=0 $"root:myGlobals:CatVSHeaderInfo:nGuides" 
    5050        Make/O/B/N=0 $"root:myGlobals:CatVSHeaderInfo:NumAttens" 
    5151        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:RunNumber" 
     
    7373        WAVE XCenter = $"root:myGlobals:CatVSHeaderInfo:XCenter" 
    7474        WAVE YCenter = $"root:myGlobals:CatVSHeaderInfo:YCenter" 
    75         //WAVE/B NumGuides = $"root:myGlobals:CatVSHeaderInfo:NumGuides" 
     75        WAVE/B NumGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides" 
    7676        WAVE/B NumAttens = $"root:myGlobals:CatVSHeaderInfo:NumAttens" 
    7777        WAVE RunNumber = $"root:myGlobals:CatVSHeaderInfo:RunNumber" 
     
    101101                ModifyTable width(:myGlobals:CatVSHeaderInfo:Reactorpower)=50           //activate for ILL, June 2008 
    102102#endif 
     103 
     104                ModifyTable width(:myGlobals:CatVSHeaderInfo:nGuides)=40 
    103105 
    104106                ModifyTable width(Point)=0              //JUN04, remove point numbers - confuses users since point != run 
     
    190192        Wave GXCenter = $"root:myGlobals:CatVSHeaderInfo:XCenter" 
    191193        Wave GYCenter = $"root:myGlobals:CatVSHeaderInfo:YCenter" 
    192         //Wave/B GNumGuides = $"root:myGlobals:CatVSHeaderInfo:NumGuides" 
     194        Wave/B GNumGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides" 
    193195        Wave/B GNumAttens = $"root:myGlobals:CatVSHeaderInfo:NumAttens" 
    194196        Wave GRunNumber = $"root:myGlobals:CatVSHeaderInfo:RunNumber" 
     
    202204        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GReactPow 
    203205#else 
    204         Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
     206//      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
     207        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,gNumGuides 
    205208#endif 
    206209 
     
    223226        Wave XCenter = $"root:myGlobals:CatVSHeaderInfo:XCenter" 
    224227        Wave YCenter = $"root:myGlobals:CatVSHeaderInfo:YCenter" 
    225         //Wave/B NumGuides = $"root:myGlobals:CatVSHeaderInfo:NumGuides" 
     228        Wave/B NumGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides" 
    226229        Wave/B NumAttens = $"root:myGlobals:CatVSHeaderInfo:NumAttens" 
    227230        Wave RotAngle =  $"root:myGlobals:CatVSHeaderInfo:RotAngle" 
     
    235238#else 
    236239// original order, magnetic at the end 
    237         Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 
     240//      Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 
     241// with numGuides 
     242        Edit Filenames, Labels, DateAndTime, SDD, Lambda, numGuides, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 
    238243// alternate ordering, put the magnetic information first 
    239244//      Edit Filenames, Labels, RotAngle, Temperature, Field, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens as "Data File Catalog" 
     
    270275        Wave GXCenter = $"root:myGlobals:CatVSHeaderInfo:XCenter" 
    271276        Wave GYCenter = $"root:myGlobals:CatVSHeaderInfo:YCenter" 
    272         //Wave/B GNumGuides = $"root:myGlobals:CatVSHeaderInfo:NumGuides" 
     277        Wave/B GNumGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides" 
    273278        Wave/B GNumAttens = $"root:myGlobals:CatVSHeaderInfo:NumAttens" 
    274279        Wave GRunNumber = $"root:myGlobals:CatVSHeaderInfo:RunNumber" 
     
    373378        GReactPow[lastPoint]  = getReactorPower(fname) 
    374379#endif   
     380 
     381// number of guides 
     382        InsertPoints lastPoint,1,GNumGuides 
     383        GNumGuides[lastPoint]  = numGuides(getSourceToSampleDist(fname)) 
    375384 
    376385        return(0) 
Note: See TracChangeset for help on using the changeset viewer.