Changeset 240

Timestamp:

Jan 15, 2008 10:46:43 AM (13 years ago)

Author:

srkline

Message:

added /W=SASCALC flags to ControlInfo? statements to make sure it's working on the right window, if SASCALC is not on the top.

File:

• sans/SASCalc/trunk/SASCALC.ipf (modified) (9 diffs)

sans/SASCalc/trunk/SASCALC.ipf

@@ -333 +333 @@
         //poll the controls on the panel, and change needed values
         Variable isNG3,Ng,mode
-        ControlInfo checkNG3
+        ControlInfo/W=SASCALC checkNG3
         isNG3=V_value
-        ControlInfo SC_slider
+        ControlInfo/W=SASCALC SC_slider
         Ng=V_value
         SVAR A1str= root:Packages:NIST:SAS:gSourceApString// = "1.43 cm;2.54 cm;3.81 cm;"
@@ -342 +342 @@
                 switch(ng)      
                         case 0:
-                                ControlInfo popup0
+                                ControlInfo/W=SASCALC popup0
                                 mode=V_value
                                 A1str="1.43 cm;2.54 cm;3.81 cm;"
@@ -373 +373 @@
                 switch(ng)      
                         case 0:
-                                ControlInfo popup0
+                                ControlInfo/W=SASCALC popup0
                                 mode=V_value
                                 A1str="1.43 cm;2.22 cm;3.81 cm;"
@@ -389 +389 @@
         ControlUpdate popup0
         PopupMenu popup0,mode=mode              //source Ap
-        ControlInfo popup0
+        ControlInfo/W=SASCALC popup0
         SourceAperturePopMenuProc("",0,S_Value)                 //send popNum==0 so recalculation won't be done
         
         ControlUpdate popup0_2          // delta lambda pop
-        ControlInfo popup0_2
+        ControlInfo/W=SASCALC popup0_2
         DeltaLambdaPopMenuProc("",0,S_Value)            //sets the global and the wave
 End
@@ -597 +597 @@
 
 
-Proc DoTest()
-
+Proc DoTest(nCts)
+        variable nCts = 1e6
+        
+        test2DSphere(nCts)
+        
+        root:Packages:NIST:SAS:linear_data = root:sim_lin
+        
         S_CircularAverageTo1D("Packages:NIST:SAS")
         
@@ -605 +610 @@
         
         //root:Packages:NIST:SAS:aveint = S_SphereForm(1,80,1e-6,0,root:Packages:NIST:SAS:qval)
-        root:Packages:NIST:SAS:aveint = S_Debye(1000,100,0,qval)
+        //root:Packages:NIST:SAS:aveint = S_Debye(1000,100,0,qval)
         
         // multiply by beamstop shadowing
-        root:Packages:NIST:SAS:aveint *= root:Packages:NIST:SAS:fSubS
+        //root:Packages:NIST:SAS:aveint *= root:Packages:NIST:SAS:fSubS
         
         //multiply by current offset (>=1)
-        root:Packages:NIST:SAS:aveint *= root:Packages:NIST:SAS:gModelOffsetFactor
+        //root:Packages:NIST:SAS:aveint *= root:Packages:NIST:SAS:gModelOffsetFactor
         
 End
@@ -1353 +1358 @@
 // updates the wave
 Function sourceApertureDiam()
-        ControlInfo popup0
+        ControlInfo/W=SASCALC popup0
         Variable diam
         sscanf S_Value, "%g cm", diam
@@ -1378 +1383 @@
 // returns a2 in cm
 Function sampleApertureDiam()
-        ControlInfo popup0_1
+        ControlInfo/W=SASCALC popup0_1
         
 //      Print "In sampleApertureDiam()"
@@ -1403 +1408 @@
 //1=huber 2=chamber
 Function tableposition()
-        ControlInfo checkHuber
+        ControlInfo/W=SASCALC checkHuber
         if(V_Value)
                 return(1)               //huber