Changeset 216

Timestamp:

Nov 30, 2007 10:51:58 AM (15 years ago)

Author:

srkline

Message:

Changed upper limit of SDD @ NG3 to be 1317 cm, not 1319 cm (too keep Cedric happy)

File:

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

sans/SASCalc/trunk/SASCALC.ipf

@@ -100 +100 @@
         Make/O/D/N=5 root:SAS:tickSDDNG3,root:SAS:tickSDDNG7
         Make/O/T/N=5 root:SAS:lblSDDNG3,root:SAS:lblSDDNG7
-        root:SAS:tickSDDNG3 = {133,400,700,1000,1319}
-        root:SAS:lblSDDNG3 = {"133","400","700","1000","1319"}
+        root:SAS:tickSDDNG3 = {133,400,700,1000,1317}
+        root:SAS:lblSDDNG3 = {"133","400","700","1000","1317"}
         root:SAS:tickSDDNG7 = {100,450,800,1150,1530}
         root:SAS:lblSDDNG7 = {"100","450","800","1150","1530"}
@@ -125 +125 @@
         Variable/G lambda_t = 5.50
         Variable/G l2r_lower = 132.3
-        Variable/G l2r_upper =  1319.2
+        Variable/G l2r_upper =  1317
         Variable/G lambda_lower = 2.5
         Variable/G lambda_upper = 20.0
@@ -281 +281 @@
         Slider SC_Slider_1,pos={234,45},size={150,45},proc=DetDistSliderProc,live=0
         Slider SC_Slider_1,tkLblRot= 90,userTicks={root:SAS:tickSDDNG3,root:SAS:lblSDDNG3 }
-        Slider SC_Slider_1,limits={133,1319,1},variable= root:SAS:gDetDist,vert= 0,thumbColor= (1,16019,65535)
+        Slider SC_Slider_1,limits={133,1317,1},variable= root:SAS:gDetDist,vert= 0,thumbColor= (1,16019,65535)
         Slider SC_Slider_2,pos={394,21},size={47,65},proc=OffsetSliderProc,live=0,ticks=4
         Slider SC_Slider_2,limits={0,25,1},variable= root:SAS:gOffset,thumbColor= (1,16019,65535)
@@ -297 +297 @@
         PopupMenu popup0_1,mode=8,popvalue="1/2\"",value= root:SAS:gApPopStr
         SetVariable setvar0,pos={301,107},size={130,15},title="Det Dist (cm)",proc=SDDSetVarProc
-        SetVariable setvar0,limits={133,1319,1},value=root:SAS:gDetDist
+        SetVariable setvar0,limits={133,1317,1},value=root:SAS:gDetDist
         SetVariable setvar0_1,pos={321,129},size={110,15},title="Offset (cm)",proc=OffsetSetVarProc
         SetVariable setvar0_1,limits={0,25,1},value= root:SAS:gOffset
@@ -357 +357 @@
                 dlStr = "0.11;0.15;0.34;"
                 //detector limits
-                SetVariable setvar0,limits={133,1319,1}
+                SetVariable setvar0,limits={133,1317,1}
                 NVAR detDist=root:SAS:gDetDist
                 if(detDist < 133 )
                         detDist = 133
-                elseif (detDist > 1319 )
-                        detDist = 1319
+                elseif (detDist > 1317 )
+                        detDist = 1317
                 endif
-                Slider SC_Slider_1,limits={133,1319,1},userTicks={root:SAS:tickSDDNG3,root:SAS:lblSDDNG3 }
+                Slider SC_Slider_1,limits={133,1317,1},userTicks={root:SAS:tickSDDNG3,root:SAS:lblSDDNG3 }
                 Slider SC_Slider_1,variable=root:SAS:gDetDist           //forces update
         else                    //ng7
@@ -699 +699 @@
         Wave inten = $("aveint_"+num2str(ct))
         inten *= offset
-        Print "new offset = ",offset
+//      Print "new offset = ",offset
         
         ct +=1