Ignore:
Timestamp:
Sep 26, 2019 1:13:02 PM (3 years ago)
Author:
srkline
Message:

fixed minor bugs in attenuator table definition (didn't affect calculations), VCALC display, and sector averaging of the back detector on VSANS

File:
1 edited

Legend:

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

    r1209 r1217  
    14471447        NewDataFolder/O root:myGlobals:Attenuators 
    14481448        //do explicitly to avoid data folder problems, redundant, but it must work without fail 
    1449         Variable num=10         //10 needed for tables after June 2007 
     1449//      Variable num=10         //10 needed for tables after June 2007 
     1450        Variable num=11         //11 needed for tables after Sep 2019 
    14501451 
    14511452        Make/O/N=(num) root:myGlobals:Attenuators:ng3att0 
     
    16081609// xxxx JAN 2013 -- Using John's measured values from 23 JAN 2013 
    16091610// 
    1610 // xxxx there are 13 discrete wavelengths in NGBLambda = 13 (only 10 used for 30m) 
    1611 // xxxx there are only 9 attenuators, not 10 as in the 30m 
    16121611// 
    16131612// -- updated MAY 2013 -- 
     
    16201619        NewDataFolder/O root:myGlobals:Attenuators 
    16211620         
    1622 //      Variable num=13         //13 needed for tables to cover 3A - 30A 
    16231621        Variable num=12         //12 needed for tables to cover 3A - 30A 
    16241622         
     
    16481646        Make/O/N=(num) root:myGlobals:Attenuators:NGBatt10_err   
    16491647         
    1650         //NGB wave has 13 elements, the transmission of att# at the wavelengths  
     1648        //NGB wave has 12 elements, the transmission of att# at the wavelengths  
    16511649        //lambda = 3A to 30A 
    16521650        // note that some of the higher attenuations and ALL of the 30A data is interpolated 
     
    16571655 
    16581656// new calibrations MAY 2013 
    1659         root:myGlobals:Attenuators:NGBatt0 = {1,1,1,1,1,1,1,1,1,1,1,1,1}         
     1657        root:myGlobals:Attenuators:NGBatt0 = {1,1,1,1,1,1,1,1,1,1,1,1 
    16601658        root:myGlobals:Attenuators:NGBatt1 = {0.512,0.474,0.418,0.392,0.354,0.325,0.294,0.27,0.255,0.222,0.185,0.155} 
    16611659        root:myGlobals:Attenuators:NGBatt2 = {0.268,0.227,0.184,0.16,0.129,0.108,0.0904,0.0777,0.0689,0.0526,0.0372,0.0263} 
     
    16711669  // percent errors as measured, MAY 2013 values 
    16721670  // zero error for zero attenuators, large values put in for unknown values (either 2% or 5%) 
    1673         root:myGlobals:Attenuators:NGBatt0_err = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } 
     1671        root:myGlobals:Attenuators:NGBatt0_err = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } 
    16741672        root:myGlobals:Attenuators:NGBatt1_err = {0.174,0.256,0.21,0.219,0.323,0.613,0.28,0.135,0.195,0.216,0.214,19.8} 
    16751673        root:myGlobals:Attenuators:NGBatt2_err = {0.261,0.458,0.388,0.419,0.354,0.668,0.321,0.206,0.302,0.305,0.315,31.1} 
     
    16841682 
    16851683 
    1686 //// (old) New calibration, Jan 2013 John Barker 
     1684//// (old) calibration, Jan 2013 John Barker 
    16871685//      root:myGlobals:Attenuators:NGBatt0 = {1,1,1,1,1,1,1,1,1,1,1,1,1}         
    16881686//      root:myGlobals:Attenuators:NGBatt1 = {0.522,0.476,0.42007,0.39298,0.36996,0.35462,0.31637,0.29422,0.27617,0.24904,0.22263,0.18525,0.15} 
Note: See TracChangeset for help on using the changeset viewer.