Changeset 742 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf

Timestamp:

Sep 16, 2010 11:30:35 AM (12 years ago)

Author:

srkline

Message:

fix for ticket #279: calculation of the slope when desmearing.

Now the behavior is for the desmearing panel to use the slope as found when loading the .cor data. For a fresh file, it proceeds as usual. For a previously-loaded file, be sure to NOT re-load the file (<no> from the dialog) so that the slope is not recalculated, and the data is simply plotted. Then the slope information is copied along with the data to the desmearing folder.

The changed behavior is when selecting the "Extrapolate" tab. Now the extrapolation is automatically calculated from the loading parameters (not re-fit) and displayed on the graph. If the extrapolation is good, nothing needs to be done. In fact, since the extrapolation (slope) should be acceptable from the load, the mask, extrapolate, and smooth tabs can all be skipped, proceeding directly to the desmear tab.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf

@@ -90 +90 @@
         Variable/G gMaxSlowIter = 10000
         
-        Variable/G gNptsExtrap = 10             //points for high q extrapolation
+        Variable/G gNptsExtrap = 15             //points for high q extrapolation
         Variable/G gChi2Target = 1              //chi^2 target
         Variable/G gPowerM = -4
@@ -744 +744 @@
         Variable num=numpnts(iw),retVal
         
+        
+        /////////for the fit
         Make/O/D P_coef={0,1,-4}                        //input
-//      Make/O/T Constr={"K2<0","K2 > -20"}
+        Make/O/T Constr={"K2<0","K2 > -8"}
         //(set background to zero and hold fixed)
-        CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D 
+        
+        // initial guess 
+        P_coef[1] = iw[num-1]/qw[num-1]^P_coef[2]
+                
+        CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /I=1 /C=constr
         extr_hqi=P_coef[0]+P_coef[1]*extr_hqq^P_coef[2]
         
@@ -756 +762 @@
 //      CurveFit Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D 
 //      extr_hqi=P_coef[0]+P_coef[1]*extr_hqq^P_coef[2]
+        
+//      if(checked && if(not already displayed))
+//              AppendToGraph extr_hqi vs extr_hqq
+//              ModifyGraph lsize(extr_hqi)=2
+//      endif
         
         
@@ -949 +960 @@
         endif
         
+        if(tab == 2)
+                //calculate the extrapolation when the tab is selected - this re-fits the data, what we want to avoid
+//              DSM_ExtrapolateButtonProc("")
+                
+                // OR
+                // use the coefficients from when it was loaded
+                SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+                WAVE P_coef = $(USANSFolder+":DSM:P_coef")
+                wave Qw = $(USANSFolder+":DSM:Q_exp")
+                
+                DSM_SetExtrWaves(Qw)
+                Wave extr_hqi=$(USANSFolder+":DSM:extr_hqi")
+                Wave extr_hqq=$(USANSFolder+":DSM:extr_hqq")
+                extr_hqi=P_coef[0]+P_coef[1]*extr_hqq^P_coef[2]
+
+                AppendExtrapolation()
+                
+        endif
+        
         return 0
 End
@@ -1092 +1122 @@
         String DFStr= CleanupName(fname,0)
         
-        Duplicate/O $("root:"+DFStr+":"+qStr) $(USANSFolder+":DSM:Q_exp ")              
+        Duplicate/O $("root:"+DFStr+":"+qStr) $(USANSFolder+":DSM:Q_exp")               
         Duplicate/O $("root:"+DFStr+":"+iStr) $(USANSFolder+":DSM:I_exp")               
-        Duplicate/O $("root:"+DFStr+":"+sStr) $(USANSFolder+":DSM:S_exp ")      
+        Duplicate/O $("root:"+DFStr+":"+sStr) $(USANSFolder+":DSM:S_exp")       
         wave Q_exp = $(USANSFolder+":DSM:Q_exp")
         Wave I_exp = $(USANSFolder+":DSM:I_exp")
         Wave S_exp = $(USANSFolder+":DSM:S_exp")
+        
+        // copy over the high q extrapolation information
+        Duplicate/O $("root:"+DFStr+":P_coef") $(USANSFolder+":DSM:P_coef")     
+        NVAR slope = $("root:"+DFStr+":USANS_m")
+        NVAR powerM = $(USANSFolder+":DSM:gPowerM")
+        powerM = slope
         
         // remove any negative q-values (and q=0 values!)(and report this)