Changeset 1177 for sans

Timestamp:

Jul 5, 2019 3:06:39 PM (4 years ago)

Author:

srkline

Message:

fixed a bug where during a reduction using MRED - the beginning/end trim points could be incorrectly read from the global values if the protocol did not have explicit values set. Now, if nothing is set, the default values are set and written to the protocol.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Protocol_Reduction.ipf (modified) (1 diff)

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

@@ -520 +520 @@
         //w[7]
         // beginning trim points
+        // if null, then write out the default trim string to the protocol so that it will be used if recalled
         SVAR gBegPtsStr=root:Packages:NIST:VSANS:Globals:Protocols:gBegPtsStr
-        w[7] = gBegPtsStr
+        if(strlen(gBegPtsStr)==0)
+                w[7] = ksBinTrimBegDefault
+        else
+                w[7] = gBegPtsStr
+        endif
         
         //w[8]
         // End trim points
+        // if null, then write out the default trim string to the protocol so that it will be used if recalled
         SVAR gEndPtsStr=root:Packages:NIST:VSANS:Globals:Protocols:gEndPtsStr   
-        w[8] = gEndPtsStr
-        
+        if(strlen(gEndPtsStr)==0)
+                w[8] = ksBinTrimEndDefault
+        else
+                w[8] = gEndPtsStr
+        endif
+
         //w[9]
         //collimation type (filled in at averaging?)