Changeset 764 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages

Timestamp:

Nov 24, 2010 4:23:13 PM (12 years ago)

Author:

srkline

Message:

• fixed a few bugs with GenCurveFit?, and how the reports are generated

• the DEFAULT.MASK file is automatically loaded when the path is set, if it can be found. this only happens from the main (yellow) panel. Nothing happens if that exact file is not found.

• a "Sector_PlusMinus" averaging option is added. This defines the LEFT sector as being "negative" q-values. Everything else behaves as a normal sector average. This is from Lionel, a very old ticket #31

• if sectors or annular regions are drawn on RAW data files, the drawn lines are re-drawn correctly as the data is scrolled using the < and > buttons.

• a super secret option for a "histogram pair" has been added. May be useful for alignment, may ditch if Jeff and Cedric don't like it. To do this, put cursor A on the 2D image at the center of where you want the vertical and horizontal swath to be. +-5 pixels is hard-wired. draw any marquee(size, location is ignored) and select SANS Histogram, and you get the pair. If cursor A is not on the graph, you get the normal histogram as defined by the marquee.

• arrow buttons on RAW 2D data display now search +- 10 data files for "next", in case there are missing file numbers.

• Incorporated Lionel's changes to ILL_* files for his generation of a "DIV" file for D22

• Added the offset traces checkbox back to the SASCALC panel. previously it was hidden on the simulation panels.

• loosened the tolerance for SDD matching onn the MRED panel to 0.1 m

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages

Files:

• GeneticOptimization/NCNR_GenFitUtils.ipf (modified) (3 diffs)
• Wrapper_v40.ipf (modified) (1 diff)

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

@@ -29 +29 @@
 // X add the XOP to the distribution, or instructions (better to NOT bundle...)
 // X odd bug where first "fit" fails on AppendToGraph as GenCurveFit is started. May need to disable /D flag
-//
-// -- need to pass back the chi-squared and number of points. "V_" globals don't appear
+// X- need to pass back the chi-squared and number of points. "V_" globals don't appear
+// -- add the flags to calculate the residuals (/R), and then manually append the residual wave to the graph.
+//
 //
 // for the speed test. try writing my own wrapper for an unsmeared calculation, and see if it's still dog-slow.
@@ -258 +259 @@
         // other useful flags:  /N /DUMP /TOL /D=fitYw
         //  /OPT=1 seems to make no difference whether it's used or not
+        // /N does not speed anything up at all, and you get no feedback
+        // /R does work, generating "res_" wave, but the append must be "manual"
         
         // append the fit
@@ -285 +288 @@
                 endif
                 if(useRes)
-                        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
+                        GenCurveFit/MAT /STRC=bar /X=bar.x[0] /I=1 /TOL=(kGenOp_tol) /W=sw /D=fitYw /R GeneticFit_SmearedModel,bar.y,bar.w,holdStr,limits
                         break
                 endif

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

@@ -1060 +1060 @@
 
                 //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...
+                // there won't be anything on the graph... but pt1 and pt2 are set and passed!. The V_ variables are more foolproof
+                // so keep these for the "normal" report
                 //
-                W_GenerateReport(funcStr,folderStr,$parStr,cw,yesSave,V_chisq,W_sigma,V_npnts,V_FitError,V_FitQuitReason,V_startRow,V_endRow,topGraph)
+                if(useGenCurveFit)      
+                        W_GenerateReport(funcStr,folderStr,$parStr,cw,yesSave,V_chisq,W_sigma,V_npnts,V_FitError,V_FitQuitReason,pt1,pt2,topGraph)
+                else
+                        W_GenerateReport(funcStr,folderStr,$parStr,cw,yesSave,V_chisq,W_sigma,V_npnts,V_FitError,V_FitQuitReason,V_startRow,V_endRow,topGraph)
+                endif
         endif