Ignore:
Timestamp:
Oct 22, 2009 11:04:32 AM (13 years ago)
Author:
srkline
Message:

Fixed logic error in writing the XY box count values to the empty beam header that could result in INF transmission.

Updated critera for "RAW" data files to include "SIM" as well.

Added NCNR_Utils to the includes list for Analysis.

File:
1 edited

Legend:

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

    r570 r577  
    5555        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Field" 
    5656        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:MCR"              //added Mar 2008 
    57 //      Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Reactorpower"       //activate for ILL, June 2008 
     57//#ifdef ILL_D22 
     58//      Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Reactorpower"       //activate for ILL, June 2008, 
     59//#endif 
    5860 
    5961        If(V_Flag==0) 
     
    7274                ModifyTable width(:myGlobals:CatVSHeaderInfo:Field)=50 
    7375                ModifyTable width(:myGlobals:CatVSHeaderInfo:MCR)=50 
     76//#ifdef ILL_D22 
    7477//              ModifyTable width(:myGlobals:CatVSHeaderInfo:Reactorpower)=50           //activate for ILL, June 2008 
    75                  
     78//#endif 
     79 
    7680                ModifyTable width(Point)=0              //JUN04, remove point numbers - confuses users since point != run 
    7781        Endif 
     
    170174        Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 
    171175        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR"               //added Mar 2008 
     176//#ifdef ILL_D22 
    172177//      Wave GReactPow = $"root:myGlobals:CatVSHeaderInfo:ReactorPower"         //activate for ILL June 2008 ( and the sort line too) 
    173178//      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GReactPow 
    174  
     179//#else 
    175180        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
     181//#endif 
     182 
    176183        return(0) 
    177184End 
     
    198205        Wave Field= $"root:myGlobals:CatVSHeaderInfo:Field" 
    199206        Wave MCR = $"root:myGlobals:CatVSHeaderInfo:MCR"                //added Mar 2008 
     207//#ifdef ILL_D22 
     208// for ILL 
    200209//      Wave ReactorPower = $"root:myGlobals:CatVSHeaderInfo:reactorpower"       //activate for ILL, June 08 (+ edit line) 
    201  
     210//      Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, ReactorPower as "Data File Catalog" 
     211//#else 
    202212// original order, magnetic at the end 
    203213        Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 
    204 // for ILL 
    205 //      Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, ReactorPower as "Data File Catalog" 
    206214// alternate ordering, put the magnetic information first 
    207215//      Edit Filenames, Labels, RotAngle, Temperature, Field, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens as "Data File Catalog" 
     216//#endif 
     217 
    208218        String name="CatVSTable" 
    209219        DoWindow/C $name 
     
    244254        Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 
    245255        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR" 
     256//#ifdef ILL_D22 
    246257//      Wave GReactpow = $"root:myGlobals:CatVSHeaderInfo:reactorpower"         //activate for ILL, Jne 2008, (+ last insert @ end of function)  
     258//#endif 
    247259        lastPoint = numpnts(GLambda) 
    248260                 
     
    331343        InsertPoints lastPoint,1,GMCR 
    332344        GMCR[lastPoint]  = getMonitorCount(fname)/ctime         //total monitor count / total count time 
    333          
    334         // Reactor Power (activate for ILL) 
     345 
     346//#ifdef ILL_D22         
     347//      // Reactor Power (activate for ILL) 
    335348//      InsertPoints lastPoint,1,GReactpow 
    336349//      GReactPow[lastPoint]  = getReactorPower(fname) 
    337          
     350//#endif         
     351 
    338352        return(0) 
    339353End 
     
    663677        //Notebook CatWin,text=temp 
    664678End 
    665  
Note: See TracChangeset for help on using the changeset viewer.