Changeset 704 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

May 4, 2010 10:47:11 AM (13 years ago)

Author:

srkline

Message:

Added flag /MAT on GenCurveFit? to actially generate the W_sigma error estimates and passed the values of the "V_" variables back to the wrapper for display and reports.

Changed how the USANS simulator calculates the number of points from the range and increment to match what is actually done on USANS.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/Packages/GeneticOptimization/NCNR_GenFitUtils.ipf (modified) (5 diffs)
• Analysis/Packages/Wrapper_v40.ipf (modified) (3 diffs)
• Reduction/USANS/U_CALC.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GeneticOptimization/NCNR_GenFitUtils.ipf

@@ -180 +180 @@
         WAVE/Z bar.ffsWaves[0] = fs.resW                //will not exist for 3-column data sets
         
+
         //need to parse limits, or make up some defaults
         // limits is (n,2)
@@ -243 +244 @@
 
         Variable t0 = stopMStimer(-2)
-        Variable/G root:num_evals=0
-        Variable/G root:V_chisq,root:V_npnts
-        NVAR chi = root:V_chisq
-        NVAR pt = root:V_npnts
-        NVAR num=root:num_evals
-        
+
+
+        
+        Variable/G root:num_evals               //for my own tracking
+        NVAR num = root:num_evals
         num=0
 
@@ -278 +278 @@
                         
                 if(useRes && useCursors)
-                        GenCurveFit /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=trimS /D=fitYw GeneticFit_SmearedModel,bar.y,bar.w,holdStr,limits
+                        GenCurveFit/MAT /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=trimS /D=fitYw GeneticFit_SmearedModel,bar.y,bar.w,holdStr,limits
                         break
                 endif
                 if(useRes)
-                        GenCurveFit /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=sw /D=fitYw GeneticFit_SmearedModel,bar.y,bar.w,holdStr,limits
+                        GenCurveFit/MAT /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=sw /D=fitYw GeneticFit_SmearedModel,bar.y,bar.w,holdStr,limits
                         break
                 endif
@@ -288 +288 @@
                 //no resolution
                 if(!useRes && useCursors)
-                        GenCurveFit /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=trimS /D=fitYw GeneticFit_UnSmearedModel,bar.y,bar.w,holdStr,limits
+                        GenCurveFit/MAT /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=trimS /D=fitYw GeneticFit_UnSmearedModel,bar.y,bar.w,holdStr,limits
                         break
                 endif
                 if(!useRes)
-                        GenCurveFit /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=sw /D=fitYw GeneticFit_UnSmearedModel,bar.y,bar.w,holdStr,limits
+                        GenCurveFit/MAT /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=sw /D=fitYw GeneticFit_UnSmearedModel,bar.y,bar.w,holdStr,limits
                         break
                 endif
@@ -299 +299 @@
 #endif
         
+//      NVAR V_chisq = V_chisq
+//      NVAR V_npnts = V_npnts
+//      NVAR V_fitIters = V_fitIters
+        WAVE/Z W_sigma = W_sigma
+        
+        val = V_npnts           //return this as a parameter
         
         t0 = (stopMSTimer(-2) - t0)*1e-6
         Printf  "fit time = %g seconds\r\r",t0
-                        
+        Print W_sigma   
+        Print "number of iterations = ",V_fitIters
         Print "number of function evaluations = ",num
-
-        return(chi)
+        Print "Chi-squared = ",V_chisq
+        
+        return(V_chisq)
 end

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

@@ -868 +868 @@
 
         do
-//              Variable t0 = stopMStimer(-2)           // corresponding print is at the end of the do-while loop (outside)
+                Variable t0 = stopMStimer(-2)           // corresponding print is at the end of the do-while loop (outside)
 
 
@@ -988 +988 @@
         while(0)
         
-//      t0 = (stopMSTimer(-2) - t0)*1e-6
-//      Printf  "fit time = %g seconds\r\r",t0
+        t0 = (stopMSTimer(-2) - t0)*1e-6
+        Printf  "fit time = %g seconds\r\r",t0
         
         // append the fit
@@ -1049 +1049 @@
                 DoUpdate                //force an update of the graph before making a copy of it for the report
 
+                //if GenCurveFit used, V_startRow and V_endRow may not exist - so read the cursors? but the cursors may not be used, so 
+                // there won't be anything on the graph...
+                //
                 W_GenerateReport(funcStr,folderStr,$parStr,cw,yesSave,V_chisq,W_sigma,V_npnts,V_FitError,V_FitQuitReason,V_startRow,V_endRow,topGraph)
         endif

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

@@ -529 +529 @@
                         NVAR Incr = $("root:Packages:NIST:USANS:Globals:U_Sim:"+"gIncr"+ns)
                         
-                        NumPts = trunc( (thetaMax - ThetaMin) / incr )
+                        NumPts = trunc( (thetaMax - ThetaMin) / incr ) + 1                      //+1 to count both ends of the interval
                 
                         CalcTotalCountTime()
@@ -580 +580 @@
 
 // new way - to spread the points out over the specified angle range
-                        incr = (thetaMax - thetaMin) / numpts
+                        incr = (thetaMax - thetaMin) /( numpts -1 )                     //-1 since end points are both counted
                         
                         CalcTotalCountTime()