Changeset 746

Timestamp:

Sep 22, 2010 9:25:37 PM (12 years ago)

Author:

srkline

Message:

Fixed bug #305. Linearized fit needed flag /I=0 since the weights are 1/err. This un-does a previous change where /I=1 was added.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/Packages/LinearizedFits/LinearizedFits_v40.ipf (modified) (1 diff)
• Reduction/SANS/MultScatter_MonteCarlo_2D.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf

@@ -518 +518 @@
         //try including residuals on the graph /R=residWave, explicitly place on new axis
         //if only /R used, residuals are automatically placed on graph
-        
-        CurveFit line yAxisWave(xcsr(A),xcsr(B)) /I=1 /X=xAxisWave /W=yWtWave /D  
+        // -- NOTE that A_Rescale_Data() calculates the weighting wave as 1/err (like the old days) so the flag is correctly
+        // /I=0, not /I=1
+        
+        CurveFit line yAxisWave(xcsr(A),xcsr(B)) /I=0 /X=xAxisWave /W=yWtWave /D  
         //CurveFit line yAxisWave(xcsr(A),xcsr(B)) /X=xAxisWave /W=yWtWave  /R /D  
         ModifyGraph rgb(fit_yAxisWave)=(0,0,0)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

@@ -1997 +1997 @@
         
         Wave samInten=$"root:Simulation:Simulation_i"           // this will exist and send the smeared calculation to the corect DF
-        Duplicate samInten, root:Simulation:Simulation_EC_i
+        Duplicate/O samInten, root:Simulation:Simulation_EC_i
         Wave inten_EC=$"root:Simulation:Simulation_EC_i"