Changeset 1184

Timestamp:

Feb 9, 2022 2:52:36 PM (6 months ago)

Author:

ilavsky

Message:

Fix old spec scan usaxs reduction for Diesel guys

Location:

trunk/User Procedures

Files:

• Indra 2/IN3_Main.ipf (modified) (1 diff)
• Indra 2/IN3_Rwave.ipf (modified) (1 diff)
• Irena/IR3_SimpleFits.ipf (modified) (2 diffs)

trunk/User Procedures/Indra 2/IN3_Main.ipf

@@ -1368 +1368 @@
         SetVariable RemoveDropoutsFraction,limits={0,1,0.1},variable= root:Packages:Indra3:RemoveDropoutsFraction, proc=IN3_ParametersChanged
 
+        //modify any parameetrs not for old spe scans
+        NVAR SmoothRCurveData = root:Packages:Indra3:SmoothRCurveData
+        CheckBox SmoothRCurveData,pos={10,590},size={150,14},title="Smooth?", proc=IN3_MainPanelCheckBox
+        CheckBox SmoothRCurveData,variable= root:Packages:Indra3:SmoothRCurveData, help={"Check, if you want to smooth the data when reducing it"}
+
         CheckBox FindMinQForData,pos={10,610},size={150,14},title="Find MinQ automatically?", noproc
         CheckBox FindMinQForData,variable= root:Packages:Indra3:FindMinQForData, help={"Check, if you want to locate min-q for data start"}

trunk/User Procedures/Indra 2/IN3_Rwave.ipf

@@ -98 +98 @@
         Wave R_Error = root:Packages:Indra3:R_Error
         Wave MeasTime = root:Packages:Indra3:MeasTime
-        NVAR SmoothRCurveData=SmoothRCurveData
+        NVAR SmoothRCurveData = root:Packages:Indra3:SmoothRCurveData
         if(SmoothRCurveData)
                 //firs remove NaNs as this is really difficult to deal with...

trunk/User Procedures/Irena/IR3_SimpleFits.ipf

@@ -3342 +3342 @@
         Wave/Z InvBckgWaveModel
         if(WaveExists(InvBckgWaveModel))
-                CheckDisplayed /W=IR3J_LogLogDataDisplay IntWave, InvBckgWaveModel
-                if(V_Flag) 
+                CheckDisplayed /W=IR3J_LogLogDataDisplay InvBckgWaveModel
+                if(!V_Flag) 
                         AppendToGraph /W=IR3J_LogLogDataDisplay InvBckgWaveModel vs QWaveModel
                         ModifyGraph lstyle(InvBckgWaveModel)=3,rgb(InvBckgWaveModel)=(1,12815,52428)
@@ -3389 +3389 @@
         NVAR DataQstartPoint = root:Packages:Irena:SimpleFits:DataQstartPoint
         SVAR InvBackgModel = root:Packages:Irena:SimpleFits:InvBackgModel
-        Wave IntWave = root:Packages:Irena:SimpleFits:OriginalDataIntWave
+        Wave/Z IntWave = root:Packages:Irena:SimpleFits:OriginalDataIntWave
+        if(!WaveExists(IntWave))        //not yet setup properly, abort.
+                return 0
+        endif
         Wave QWave = root:Packages:Irena:SimpleFits:OriginalDataQWave
         NVAR InvBckgMinQ = root:Packages:Irena:SimpleFits:InvBckgMinQ