Changeset 1217 for sans/Dev/trunk

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

Location:

sans/Dev/trunk

Files:

• NCNR_Help_Files/VSANS_Reduction_Help_v0.1.ihf (modified) (previous)
• NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf (modified) (7 diffs)
• NCNR_User_Procedures/Reduction/VSANS/VC_VCALCPanel_MockUp.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/VSANS/V_Sector_Average.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf

@@ -1447 +1447 @@
         NewDataFolder/O root:myGlobals:Attenuators
         //do explicitly to avoid data folder problems, redundant, but it must work without fail
-        Variable num=10         //10 needed for tables after June 2007
+//      Variable num=10         //10 needed for tables after June 2007
+        Variable num=11         //11 needed for tables after Sep 2019
 
         Make/O/N=(num) root:myGlobals:Attenuators:ng3att0
@@ -1608 +1609 @@
 // xxxx JAN 2013 -- Using John's measured values from 23 JAN 2013
 //
-// xxxx there are 13 discrete wavelengths in NGBLambda = 13 (only 10 used for 30m)
-// xxxx there are only 9 attenuators, not 10 as in the 30m
 //
 // -- updated MAY 2013 --
@@ -1620 +1619 @@
         NewDataFolder/O root:myGlobals:Attenuators
         
-//      Variable num=13         //13 needed for tables to cover 3A - 30A
         Variable num=12         //12 needed for tables to cover 3A - 30A
         
@@ -1648 +1646 @@
         Make/O/N=(num) root:myGlobals:Attenuators:NGBatt10_err  
         
-        //NGB wave has 13 elements, the transmission of att# at the wavelengths 
+        //NGB wave has 12 elements, the transmission of att# at the wavelengths 
         //lambda = 3A to 30A
         // note that some of the higher attenuations and ALL of the 30A data is interpolated
@@ -1657 +1655 @@
 
 // new calibrations MAY 2013
-        root:myGlobals:Attenuators:NGBatt0 = {1,1,1,1,1,1,1,1,1,1,1,1,1}        
+        root:myGlobals:Attenuators:NGBatt0 = {1,1,1,1,1,1,1,1,1,1,1,1}  
         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}
         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}
@@ -1671 +1669 @@
   // percent errors as measured, MAY 2013 values
   // zero error for zero attenuators, large values put in for unknown values (either 2% or 5%)
-        root:myGlobals:Attenuators:NGBatt0_err = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+        root:myGlobals:Attenuators:NGBatt0_err = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
         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}
         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}
@@ -1684 +1682 @@
 
 
-//// (old) New calibration, Jan 2013 John Barker
+//// (old) calibration, Jan 2013 John Barker
 //      root:myGlobals:Attenuators:NGBatt0 = {1,1,1,1,1,1,1,1,1,1,1,1,1}        
 //      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}

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_VCALCPanel_MockUp.ipf

@@ -98 +98 @@
         SetVariable setVar_a,limits={0.3,30,0.2},value=_NUM:28
 
-        ValDisplay valDisp_a,pos={30,380},size={150,15},fstyle=1,title="Beam Intensity",value=root:Packages:NIST:VSANS:VCALC:gBeamIntensity
+        ValDisplay valDisp_a,pos={30,380},size={200,15},fstyle=1,title="Beam Intensity",value=root:Packages:NIST:VSANS:VCALC:gBeamIntensity
 
         SetDrawEnv fstyle= 1

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Sector_Average.ipf

@@ -19 +19 @@
         String folderStr,detStr,folderPath
 
-
-        Variable xctr = V_getDet_beam_center_x_pix(folderStr,detStr)
-        Variable yctr = V_getDet_beam_center_y_pix(folderStr,detStr)
+        Variable xctr,yctr
+        
+        if(cmpstr(detStr,"B")==0)
+                //if "B", the center is already in pixels by definition, and x_pix, y_pix fields do not exist
+                xctr = V_getDet_beam_center_x(folderStr,detStr)
+                yctr = V_getDet_beam_center_y(folderStr,detStr)
+        else
+                xctr = V_getDet_beam_center_x_pix(folderStr,detStr)
+                yctr = V_getDet_beam_center_y_pix(folderStr,detStr)
+        endif
+
 
         Duplicate/O qTotal,$(folderPath+":phi")