Ignore:
Timestamp:
Jul 23, 2008 1:11:58 PM (14 years ago)
Author:
srkline
Message:

Several changes:

New version of ILL_DataReadWrite. Some changes added to Lionel's work to get the transmission calculation working corectly.

Changes to the wrapper to get the cursors on/off working correctly, as well as USANS matrix recalculation during normal fitting and during Global fitting. It may ask to recalculate the matrix occasionally when using the full data set - even though it really doesn't need to - but this is as a precaution.

Re-worked the header of the GRASP-export ASCII data to much more closely match the VAX output. I couldn't find any problem with the data block, so maybe GRASP was having trouble with the header.

File:
1 edited

Legend:

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

    r328 r394  
    5555        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Field" 
    5656        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:MCR"              //added Mar 2008 
    57  
     57//      Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Reactorpower"       //activate for ILL, June 2008 
    5858 
    5959        If(V_Flag==0) 
     
    7171                ModifyTable width(:myGlobals:CatVSHeaderInfo:RotAngle)=50 
    7272                ModifyTable width(:myGlobals:CatVSHeaderInfo:Field)=50 
     73                ModifyTable width(:myGlobals:CatVSHeaderInfo:MCR)=50 
     74//              ModifyTable width(:myGlobals:CatVSHeaderInfo:Reactorpower)=50           //activate for ILL, June 2008 
    7375                 
    7476                ModifyTable width(Point)=0              //JUN04, remove point numbers - confuses users since point != run 
     
    168170        Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 
    169171        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR"               //added Mar 2008 
    170  
     172//      Wave GReactPow = $"root:myGlobals:CatVSHeaderInfo:ReactorPower"         //activate for ILL June 2008 ( and the sort line too) 
     173//      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GReactPow 
    171174 
    172175        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
     
    195198        Wave Field= $"root:myGlobals:CatVSHeaderInfo:Field" 
    196199        Wave MCR = $"root:myGlobals:CatVSHeaderInfo:MCR"                //added Mar 2008 
    197  
     200//      Wave ReactorPower = $"root:myGlobals:CatVSHeaderInfo:reactorpower"       //activate for ILL, June 08 (+ edit line) 
    198201 
    199202// original order, magnetic at the end 
    200203        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" 
    201206// alternate ordering, put the magnetic information first 
    202207//      Edit Filenames, Labels, RotAngle, Temperature, Field, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens as "Data File Catalog" 
     
    239244        Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 
    240245        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR" 
    241          
     246//      Wave GReactpow = $"root:myGlobals:CatVSHeaderInfo:reactorpower"         //activate for ILL, Jne 2008, (+ last insert @ end of function)  
    242247        lastPoint = numpnts(GLambda) 
    243248                 
     
    326331        InsertPoints lastPoint,1,GMCR 
    327332        GMCR[lastPoint]  = getMonitorCount(fname)/ctime         //total monitor count / total count time 
     333         
     334        // Reactor Power (activate for ILL) 
     335//      InsertPoints lastPoint,1,GReactpow 
     336//      GReactPow[lastPoint]  = getReactorPower(fname) 
    328337         
    329338        return(0) 
Note: See TracChangeset for help on using the changeset viewer.