Changeset 1238 for sans

Timestamp:

Feb 4, 2020 2:09:57 PM (3 years ago)

Author:

srkline

Message:

1) bug fix in the BT5 loader for USANS where an incorrect detector (of the 5) was specified (from B. Maranville). No impact on reduced data.

2) Cleaned up steps of generating DIV files and added file generation time into the DIV file that is saved.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• USANS/BT5_Loader.ipf (modified) (1 diff)
• VSANS/V_DIVUtils.ipf (modified) (3 diffs)
• VSANS/V_ISO8601_Util.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/BT5_Loader.ipf

@@ -154 +154 @@
                         v2 = v2/(1.0-v2*MainDeadTime/countTime)   // Deadtime correction
                         v3 = v3/(1.0-v3*MainDeadTime/countTime)   // Deadtime correction
-                        v4 = v6/(1.0-v4*MainDeadTime/countTime)   // Deadtime correction
+                        v4 = v4/(1.0-v4*MainDeadTime/countTime)   // Deadtime correction        // bug fix 1/31/20 from B. Maranville
                         v5 = v5/(1.0-v5*MainDeadTime/countTime)   // Deadtime correction
                         v6 = v6/(1.0-v6*MainDeadTime/countTime)   // Deadtime correction

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

@@ -179 +179 @@
 
 
-
-
-Proc V_DIVCopy_proc(reducedFolderType,carriageStr,first)
+Proc V_DIVCopy_proc(reducedFolderType,carriageStr,firstCopy)
         String reducedFolderType="COR",carriageStr="F"
-        Variable first=1
+        String firstCopy="Yes"
+
+
+        Prompt reducedFolderType,"Save files to disk?"
+        Prompt carriageStr,"Detector Carriage",popup,"F;M;B;"
+        Prompt firstCopy,"First time copying a carriage?",popup,"Yes;No;"
+        
+        Variable first
+        if(cmpstr(firstCopy,"Yes")==0)
+                first = 1
+        else
+                first = 0
+        endif
         
         Vf_DIVCopy_proc(reducedFolderType,carriageStr,first)
@@ -193 +203 @@
         String reducedFolderType,carriageStr
         Variable first
+        
 
         String topath = "root:Packages:NIST:VSANS:STO:entry:instrument:detector_"
@@ -698 +709 @@
 
         NewDataFolder/O/S root:VSANS_DIV_file:entry     
-                Make/O/T/N=1    title   = "This is a DIV file for VSANS: VSANS_DIV"
-                Make/O/T/N=1    start_date      = "2017-02-28T08:15:30-5:00"
+                Make/O/T/N=1    title   = "This is a DIV file for VSANS: VSANS_DIV generated on "+V_CurrentTime_to_ISO8601String(DateTime)
+                Make/O/T/N=1    start_date      = V_CurrentTime_to_ISO8601String(DateTime)
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument          
                         Make/O/T/N=1    name    = "NG3_VSANS"

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

@@ -45 +45 @@
 
 //
-// Call w/ DateTime as the argument
+// Call w/ DateTime as the argument as V_CurrentTime_to_ISO8601String(DateTime)
 //
 // TODO -- verify that this is correct