Ignore:
Timestamp:
Mar 31, 2010 2:54:41 PM (13 years ago)
Author:
ajj
Message:

Update to CatVSTable to show sample position, TISANE to fix a couple of startup bugs and FuzzySpheres? to add the lorentzian term.

File:
1 edited

Legend:

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

    r647 r656  
    5757        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Field" 
    5858        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:MCR"              //added Mar 2008 
     59        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Pos"              //added Mar 2010 
    5960#if (exists("ILL_D22")==6) 
    6061        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Reactorpower"       //activate for ILL, June 2008, 
     
    8384        WAVE Field = $"root:myGlobals:CatVSHeaderInfo:Field" 
    8485        WAVE MCR = $"root:myGlobals:CatVSHeaderInfo:MCR"                //added Mar 2008 
     86        WAVE Pos = $"root:myGlobals:CatVSHeaderInfo:Pos" 
    8587         
    8688         
     
    100102                ModifyTable width(:myGlobals:CatVSHeaderInfo:Field)=50 
    101103                ModifyTable width(:myGlobals:CatVSHeaderInfo:MCR)=50 
     104                ModifyTable width(:myGlobals:CatVSHedaerInfo:Pos)=30 
    102105#if (exists("ILL_D22")==6) 
    103106                ModifyTable width(:myGlobals:CatVSHeaderInfo:Reactorpower)=50           //activate for ILL, June 2008 
     
    209212        Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 
    210213        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR"               //added Mar 2008 
    211          
     214        Wave GPos = $"root:myGlobals:CatVSHeaderInfo:Pos" 
    212215#if (exists("ILL_D22")==6) 
    213216        Wave GReactPow = $"root:myGlobals:CatVSHeaderInfo:ReactorPower"         //activate for ILL June 2008 ( and the sort line too) 
    214         Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GReactPow 
     217        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,GReactPow 
    215218#endif 
    216219 
     
    219222        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,gNumGuides 
    220223#else 
    221         //must be HFIR or ANSTO 
    222         Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
     224//      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
     225        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,gNumGuides 
    223226#endif 
    224227 
     
    248251        Wave Field= $"root:myGlobals:CatVSHeaderInfo:Field" 
    249252        Wave MCR = $"root:myGlobals:CatVSHeaderInfo:MCR"                //added Mar 2008 
     253        Wave Pos = $"root:myGlobals:CatVSHeaderInfo:Pos" 
    250254#if (exists("ILL_D22")==6) 
    251255// for ILL 
    252256        Wave ReactorPower = $"root:myGlobals:CatVSHeaderInfo:reactorpower"       //activate for ILL, June 08 (+ edit line) 
    253         Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, ReactorPower as "Data File Catalog" 
     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" 
    254258#endif 
    255259 
     
    258262//      Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 
    259263// with numGuides 
    260         Edit Filenames, Labels, DateAndTime, SDD, Lambda, numGuides, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 
     264        Edit Filenames, Labels, DateAndTime, SDD, Lambda, numGuides, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, Pos as "Data File Catalog" 
    261265// alternate ordering, put the magnetic information first 
    262266//      Edit Filenames, Labels, RotAngle, Temperature, Field, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens as "Data File Catalog" 
     
    304308        Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 
    305309        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR" 
     310        Wave GPos = $"root:myGlobals:CatVSHeaderInfo:Pos" 
    306311#if (exists("ILL_D22")==6) 
    307312        Wave GReactpow = $"root:myGlobals:CatVSHeaderInfo:reactorpower"         //activate for ILL, Jne 2008, (+ last insert @ end of function)  
     
    393398        InsertPoints lastPoint,1,GMCR 
    394399        GMCR[lastPoint]  = getMonitorCount(fname)/ctime         //total monitor count / total count time 
     400 
     401        //Sample Position 
     402        InsertPoints lastPoint,1,GPos 
     403        GPos[lastPoint] = getSamplePosition(fname) 
    395404 
    396405#if (exists("ILL_D22")==6) 
Note: See TracChangeset for help on using the changeset viewer.