Changeset 187 for sans/SASCalc

Timestamp:

Oct 25, 2007 4:38:44 PM (15 years ago)

Author:

srkline

Message:

Added offset of models for better display in plotting

File:

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

sans/SASCalc/trunk/SASCALC.ipf

@@ -94 +94 @@
         Variable/G root:SAS:gSamApOther = 10            //non-standard aperture diameter, in mm
         Variable/G root:SAS:gUsingLenses = 0            //0=no lenses, 1=lenses(or prisms)
+        Variable/G root:SAS:gModelOffsetFactor = 1
         
         //tick labels for SDD slider
@@ -283 +284 @@
         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)
-        CheckBox checkNG3,pos={20,18},size={36,14},proc=SelectInstrumentCheckProc,title="NG3"
+        CheckBox checkNG3,pos={20,19},size={36,14},proc=SelectInstrumentCheckProc,title="NG3"
         CheckBox checkNG3,value=1,mode=1
-        CheckBox checkNG7,pos={66,18},size={36,14},proc=SelectInstrumentCheckProc,title="NG7"
+        CheckBox checkNG7,pos={66,19},size={36,14},proc=SelectInstrumentCheckProc,title="NG7"
         CheckBox checkNG7,value=0,mode=1
         CheckBox checkChamber,pos={172,48},size={57,14},proc=TableCheckProc,title="Chamber"
@@ -300 +301 @@
         SetVariable setvar0_1,limits={0,25,1},value= root:SAS:gOffset
         SetVariable setvar0_2,pos={6,130},size={90,15},title="Lambda",proc=LambdaSetVarProc
-        SetVariable setvar0_2,limits={5,20,0.1},value= root:SAS:gLambda
+        SetVariable setvar0_2,limits={4,20,0.1},value= root:SAS:gLambda
         PopupMenu popup0_2,pos={108,127},size={55,20},proc=DeltaLambdaPopMenuProc
         PopupMenu popup0_2,mode=1,popvalue="0.15",value= root:SAS:gDeltaLambdaStr
@@ -307 +308 @@
         Button ClearButton title="Clear",size={60,20},pos={377,166}
         Button ClearButton proc=ClearButtonProc
-        GroupBox group0,pos={6,1},size={108,33},title="Instrument"
+        GroupBox group0,pos={6,1},size={108,36},title="Instrument"
         SetDataFolder fldrSav0
         
@@ -605 +606 @@
         root:SAS:aveint *= root:SAS:fSubS
         
+        //multiply by current offset (>=1)
+        root:SAS:aveint *= root:SAS:gModelOffsetFactor
+        
 End
 
@@ -648 +652 @@
         String str=""
         NVAR ct=root:SAS:gFreezeCount
+        
+        
         SetDataFolder root:SAS
         
@@ -688 +694 @@
         endswitch
         
+        NVAR offset = root:SAS:gModelOffsetFactor
+        offset = 2^ct
+        //multiply by current offset (>=1)
+        Wave inten = $("aveint_"+num2str(ct))
+        inten *= offset
+        Print "new offset = ",offset
+        
         ct +=1
         SetDataFolder root:
@@ -726 +739 @@
         endif
         
+        //reset offset value
+        NVAR offset = root:SAS:gModelOffsetFactor
+        offset = 1
+        ReCalculateInten(1)
         return(0)
 End