Changeset 1122 for sans/Dev/trunk/NCNR_User_Procedures/Common

Timestamp:

Feb 6, 2019 12:25:46 PM (4 years ago)

Author:

srkline

Message:

changes to the USANS procedures to accommodate the re-ordering of the data columns in the raw USANS data that is to be output from NICE, versus what was previously written out by ICP.

A global flag switches between the two reading modes. On startup, the preferences panel is automatically opened to the USANS tab so that the user can immediately set the flag correctly. Currently it defaults to "checked" to read the New data format.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -1428 +1428 @@
         
         /// items for USANS Reduction
-        
+        val = NumVarOrDefault("root:Packages:NIST:gUseNICEDataFormat", 1 )
+        Variable/G root:Packages:NIST:gUseNICEDataFormat=val    
         
         /// items for everyone
@@ -1494 +1495 @@
         gVal = checked
 End
+
+Function UseNICEDataFormat(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+        
+        NVAR gVal = root:Packages:NIST:gUseNICEDataFormat
+        gVal = checked
+End
+
+
 
 Function PrefDoneButtonProc(ctrlName) : ButtonControl
@@ -1553 +1564 @@
 
 //on tab(2) - USANS
-        GroupBox PrefCtrl_2a pos={21,100},size={1,1},title="nothing to set",fSize=12
-
-        GroupBox PrefCtrl_2a,disable=1
+//      GroupBox PrefCtrl_2a pos={21,100},size={1,1},title="nothing to set",fSize=12
+//      GroupBox PrefCtrl_2a,disable=1
+        CheckBox PrefCtrl_2a,pos={21,100},size={171,14},proc=UseNICEDataFormat,title="Read New NICE data format"
+        CheckBox PrefCtrl_2a,help={"Check this if raw data was collected using NICE. If data was collected using ICP, leave this unchecked."}
+        CheckBox PrefCtrl_2a,value= root:Packages:NIST:gUseNICEDataFormat
+
+
+        CheckBox PrefCtrl_2a,disable=1
+
 
 
@@ -1611 +1628 @@
         return(0)
 End
+
+
+
+
+