Ignore:
Timestamp:
Jan 4, 2013 10:09:48 AM (10 years ago)
Author:
srkline
Message:

Changes to SASCALC and other locations in the code that identify the instrument from the account name that is stored in the file header. New designation of NGA for the 10-m SANS, and NGB is reserved for the NG3 30-m SANS when it is moved into the new guide hall. Changes to incorporate the 10m SANS are functional, but INCOMPLETE since many of the instrument details have not been filled in yet (they haven't been measured yet).

File:
1 edited

Legend:

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

    r871 r886  
    309309//      Variable ,lambda,sdd,,refNum,trans,thick,xcenter,ycenter,numatten 
    310310//      Variable lastPoint, beamstop,dum 
    311         Variable lastPoint,ctime,detcnt,cntrate,instrumentNum 
     311        Variable lastPoint,ctime,detcnt,cntrate//,instrumentNum 
    312312 
    313313        Wave/T GFilenames = $"root:myGlobals:CatVSHeaderInfo:Filenames" 
     
    445445// number of guides and sample position, only for NCNR 
    446446#if (exists("NCNR")==6) 
    447         instrumentNum = str2num(getAcctName(fname)[3])          // "[NGxSANSxx]" -- [3] should be then instrument number 
    448         Variable/G root:Packages:NIST:SAS:instrument = instrumentNum            //so that Ng can be correctly calculated 
     447//      instrumentNum = str2num(getAcctName(fname)[3])          // "[NGxSANSxx]" -- [3] should be then instrument number 
     448//      Variable/G root:Packages:NIST:SAS:instrument = instrumentNum            //so that Ng can be correctly calculated 
     449 
     450        // acct name is "[NGxSANSxx]" -- [1,3] is the instrument "name" "NGx" 
     451        //so that Ng can be correctly calculated 
     452        String/G root:Packages:NIST:SAS:gInstStr = getAcctName(fname)[1,3]  
    449453         
    450454        InsertPoints lastPoint,1,GNumGuides 
Note: See TracChangeset for help on using the changeset viewer.