Changeset 1096 for sans

Timestamp:

Apr 18, 2018 12:36:25 PM (5 years ago)

Author:

srkline

Message:

bug fixes in transmission calculation to use the panel as defined when the box coordinates are set, and to treat empty cell files (intent) as scattering files for the purpose of calculating transmission.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Transmission.ipf (modified) (2 diffs)

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

@@ -275 +275 @@
         NVAR gTrnGrpID = root:Packages:NIST:VSANS:Globals:Transmission:gTrnGrpID
 
-        return(V_getFileIntentPurposeIDList("SAMPLE","SCATTERING",gTrnGrpID,0))
+        String retStr = V_getFileIntentPurposeIDList("SAMPLE","SCATTERING",gTrnGrpID,0)
+
+// and be sure to add in the empty cell, since it's not a "sample"
+        retStr += V_getFileIntentPurposeIDList("EMPTY CELL","SCATTERING",gTrnGrpID,0)
+        
+        return(retStr)
 End
 
@@ -451 +456 @@
                 // x- need to get the panel string for the sum.
                 // x- the detector string is currently hard-wired
+                detStr = V_getReduction_BoxPanel(emptyFileName)
+                
                 SVAR gEmptyPanel = root:Packages:NIST:VSANS:Globals:Transmission:gEmptyPanel
-                detStr = gEmptyPanel
+                gEmptyPanel = detStr