Changeset 109

Timestamp:

May 2, 2007 4:09:28 PM (16 years ago)

Author:

srkline

Message:

Added more informative dialog for setABSparams. Now a panel is presented that asks the same question in a more logical way, with two nicelay labeled buttons and a pale green background for the pollen of spring. Closes trac ticket #6.

File:

• sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/ProtocolAsPanel.ipf (modified) (3 diffs)

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/ProtocolAsPanel.ipf

@@ -1970 +1970 @@
         //ask user if he wants to use a transmision file for absolute scaling
         //or if he wants to enter his own information
-        DoAlert 1,"<Yes> to enter your own values, <No> to select an empty beam flux file"
-        If ( (V_Flag==1) ) 
-                //yes selected, prompt for values
+        err = UseStdOrEmpForABS()
+        //DoAlert 1,"<Yes> to enter your own values, <No> to select an empty beam flux file"
+        If ( err==1 ) 
+                //secondary standard selected, prompt for values
                 Execute "AskForAbsoluteParams()"                //missing parameters
         else
-                //no selected, prompt for file, and use this to calculate KAPPA
+                //empty beam flux file selected, prompt for file, and use this to calculate KAPPA
                 Variable kappa=1
                 
@@ -2073 +2074 @@
                 // SRK JUL 2006 don't clear the contents - just kill the window to force new data to be loaded
                 // - obsucre bug if "ask" in ABS section of protocol clears RAW folder, then Q-axes can't be set from RAW:RealsRead
-                //ClearDataFolder("RAW")        
-        Endif
-        Print "Kappa was successfully calculated as = ",kappa
+                //ClearDataFolder("RAW")
+                Print "Kappa was successfully calculated as = ",kappa   
+        Endif
+        
 End
 
@@ -2125 +2127 @@
         return(err)
 End
+
+Function UseStdOrEmpForABS()
+                
+        NewPanel/K=2 /W=(139,341,402,448) as "Absolute Scaling"
+        DoWindow/C junkABSWindow
+        ModifyPanel cbRGB=(57346,65535,49151)
+        SetDrawLayer UserBack
+        SetDrawEnv fstyle= 1
+        DrawText 21,20,"Method of absolute calibration"
+        Button button0,pos={52,33},size={150,20},proc=UserSelectABS_Continue,title="Empty Beam Flux"
+        Button button1,pos={52,65},size={150,20},proc=UserSelectABS_Continue,title="Secondary Standard"
+        
+        PauseForUser junkABSWindow
+        NVAR val = root:myGlobals:tmpAbsVal
+        return(val)
+End
+
+//returns 0 if button0 (empty beam flux)
+// or 1 if secondary standard
+Function UserSelectABS_Continue(ctrlName) :buttonControl
+        String ctrlName
+        
+        variable val=0
+        If(cmpstr(ctrlName,"button0")==0)
+                val=0           
+        else
+                val=1
+        endif
+//      print "val = ",ctrlName,val
+        Variable/G root:myGlobals:tmpAbsVal = val
+        DoWindow/K junkABSWindow                //kill panel
+        return(0)
+end
+
 
 //save the protocol as an IGOR text wave (.itx)