Changeset 814 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Jul 7, 2011 12:02:44 PM (12 years ago)

Author:

srkline

Message:

Made the preferences for detector corrections permanent within an experiment. previously they remained only as long as the preferences panel was open, then reverting back to the default values.

File:

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

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

@@ -1218 +1218 @@
         DoWindow/F Pref_Panel
         if(V_flag==0)
-                Initialize_Preferences()
+                // only re-initialize if the variables don't exist, so you don't overwrite what users have changed
+                if( exists("root:Packages:NIST:gXML_Write") != 2 )              //if the global variable does not exist, initialize
+                        Initialize_Preferences()
+                endif
                 Pref_Panel()
         Endif
@@ -1300 +1303 @@
         
         NVAR gVal = root:Packages:NIST:gXML_Write
+        gVal = checked
+End
+
+Function DoTransCorrPref(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+        
+        NVAR gVal = root:Packages:NIST:gDoTransmissionCorr
+        gVal = checked
+End
+
+Function DoEfficiencyCorrPref(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+        
+        NVAR gVal = root:Packages:NIST:gDoDetectorEffCorr
         gVal = checked
 End
@@ -1344 +1363 @@
         SetVariable PrefCtrl_1e,pos={21,195},size={200,15},title="# Phi Steps (annular avg)"
         SetVariable PrefCtrl_1e,limits={1,360,1},value= root:Packages:NIST:gNPhiSteps
-        CheckBox PrefCtrl_1f title="Do Transmssion Correction?",size={140,14},value=1
+        CheckBox PrefCtrl_1f title="Do Transmssion Correction?",size={140,14},value=root:Packages:NIST:gDoTransmissionCorr,proc=DoTransCorrPref
         CheckBox PrefCtrl_1f pos={255,100},help={"TURN OFF ONLY FOR DEBUGGING. This corrects the data for angle dependent transmssion."}
-        CheckBox PrefCtrl_1g title="Do Efficiency Correction?",size={140,14}
-        CheckBox PrefCtrl_1g value=1,pos={255,120},help={"TURN OFF ONLY FOR DEBUGGING. This corrects the data for angle dependent detector efficiency."}
+        CheckBox PrefCtrl_1g title="Do Efficiency Correction?",size={140,14},proc=DoEfficiencyCorrPref
+        CheckBox PrefCtrl_1g value=root:Packages:NIST:gDoDetectorEffCorr,pos={255,120},help={"TURN OFF ONLY FOR DEBUGGING. This corrects the data for angle dependent detector efficiency."}