Changeset 139 for sans/SASCalc

Timestamp:

Aug 3, 2007 5:16:46 PM (16 years ago)

Author:

srkline

Message:

Added the option for an arbitrary diameter of sample aperture

-the aperture must still be circular, as the resolution calculations require circular apertures

File:

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

sans/SASCalc/trunk/SASCALC.ipf

@@ -28 +28 @@
 // - "simulation" of data and error bars given a model and a total number of detector counts
 // - streamline code (globals needed in panel vs. wave needed for calculation)
+//
+// - there is a lot of re-calculation of things (a consequence of the fake-OO) that could be streamlined
 //
 // Done:
@@ -85 +87 @@
         String/G root:SAS:gSourceApString = "1.43 cm;2.54 cm;3.81 cm;"
         String/G root:SAS:gDeltaLambdaStr = "0.11;0.15;0.34;"
-        String/G root:SAS:gApPopStr = "1/16\";1/8\";3/16\";1/4\";5/16\";3/8\";7/16\";1/2\";9/16\";5/8\";11/16\";3/4\";"
+        String/G root:SAS:gApPopStr = "1/16\";1/8\";3/16\";1/4\";5/16\";3/8\";7/16\";1/2\";9/16\";5/8\";11/16\";3/4\";other;"
+        Variable/G root:SAS:gSamApOther = 10            //non-standard aperture diameter, in mm
         
         //tick labels for SDD slider
@@ -302 +305 @@
         SetDataFolder fldrSav0
         
+        SetVariable setvar0_3,pos={140,94},size={110,15},title="Diam (mm)",disable=1
+        SetVariable setvar0_3,limits={0,100,0.1},value= root:SAS:gSamApOther,proc=SourceApOtherSetVarProc
         // set up a fake dependency to trigger recalculation
         //root:SAS:gCalculate := ReCalculateInten(root:SAS:gTouched)
@@ -530 +535 @@
         return(0)
 End
+
 
 // change the wavelength spread
@@ -1284 +1290 @@
 end
 
+// change the sample aperture to a non-standard value
+Function SourceApOtherSetVarProc(ctrlName,varNum,varStr,varName) : SetVariableControl
+        String ctrlName
+        Variable varNum
+        String varStr
+        String varName
+                
+        WAVE rw=root:SAS:realsRead
+        rw[24] = varNum                 //sample aperture diameter in mm
+        ReCalculateInten(1)
+        return(0)
+End
+
 //parses the control for A2 diam
 // updates the wave and global
@@ -1290 +1309 @@
         ControlInfo popup0_1
         
+//      Print "In sampleApertureDiam()"
         //set the global
         NVAR a2=root:SAS:gSamAp
-        //1st item is 1/16", popup steps by 1/16"
-        a2 = 2.54/16.0 * (V_Value)
-        
+        
+        if(cmpstr(S_Value,"other") == 0)                // "other" selected
+                //enable the setvar, diameter in mm!
+                SetVariable setvar0_3 disable=0
+                // read its value (a global)
+                NVAR a2other = root:SAS:gSamApOther
+                a2=a2other/10                           //a2 in cm
+        else
+                SetVariable setvar0_3 disable=1
+                //1st item is 1/16", popup steps by 1/16"
+                a2 = 2.54/16.0 * (V_Value)                      //convert to cm         
+        endif
         WAVE rw=root:SAS:realsRead
         rw[24] = a2*10                  //sample aperture diameter in mm