Changeset 797


Ignore:
Timestamp:
Apr 8, 2011 12:58:26 PM (11 years ago)
Author:
srkline
Message:

Removed Smear_Model_N_AAO() and reverted back to the non-AAO version. The AAO version is not cursor-aware, and then smeares incorrectly when using cursors. The AAO version can be corrected in the future if necessary. Using the Debye Sphere functions as fit functions need AAO smearing to be useable at all.

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/GaussUtils_v40.ipf

    r794 r797  
    810810                if (va<0) 
    811811                        va=0            //to avoid numerical error when  va<0 (-ve q-value) 
    812                         Print "truncated Gaussian at nominal q = ",x 
     812//                      Print "truncated Gaussian at nominal q = ",x 
    813813                endif 
    814814                vb = 3*i_sigq + i_qbar 
     
    906906                endif 
    907907         
    908 //              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
    909                 Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
     908                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
     909//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
    910910                 
    911911                Return (0) 
     
    956956                endif 
    957957         
    958 //              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
    959                 Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
     958                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
     959//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
    960960 
    961961                Return (0) 
     
    10121012                endif 
    10131013         
    1014 //              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
    1015                 Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
     1014                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
     1015//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
    10161016 
    10171017                Return (0) 
     
    10601060                endif 
    10611061         
    1062 //              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
    1063                 Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
     1062                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord) 
     1063//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer) 
    10641064 
    10651065                Return (0) 
     
    16121612// provides some speedup. 
    16131613// 
    1614 // 
    1615 // 
    1616 // "backwards" wrapped to reduce redundant code 
    1617 // there are only 4 choices of N (5,10,20,76) for smearing 
     1614//// APRIL 2011 *** this function is NOT YET CURSOR-AWARE. This needs to be addressed before it can be used 
    16181615// 
    16191616// 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteQIS.ipf

    r794 r797  
    817817//********************* 
    818818 
    819 //      // generate my own error wave for I(qx,qy) 
     819        // generate my own error wave for I(qx,qy) 
     820        //      //      sw = 0.05*sw            // uniform 5% error? tends to favor the low intensity too strongly 
     821        // after teh SQRT(),  get rid of the "bad" errors by replacing the NaN, Inf, and zero with V_avg 
     822        // THIS IS EXTREMEMLY IMPORTANT - if this is not done, there are some "bad" values in the  
     823        // error wave (things that are not numbers) - and this wrecks the smeared model fitting. 
     824        // It appears to have no effect on fitting with the unsmeared model. 
    820825//      Duplicate/O z_val sw 
    821 //      sw = sqrt(z_val)                //assumes Poisson statistics for each cell (counter) 
    822 //      //      sw = 0.05*sw            // uniform 5% error? tends to favor the low intensity too strongly 
    823 //      // get rid of the "bad" errorsby replacing the NaN, Inf, and zero with V_avg 
    824 //      // THIS IS EXTREMEMLY IMPORTANT - if this is not done, there are some "bad" values in the  
    825 //      // error wave (things that are not numbers) - and this wrecks the smeared model fitting. 
    826 //      // It appears to have no effect on the unsmeared model. 
     826//      sw = sqrt(z_val)                //assumes Poisson statistics for each cell (counter) - which is wrong, since this is corrected data 
     827// 
    827828//      WaveStats/Q sw 
    828829//      sw = numtype(sw[p]) == 0 ? sw[p] : V_avg 
    829830//      sw = sw[p] != 0 ? sw[p] : V_avg 
    830          
    831         // now use the properly propagated 2D error 
     831 
     832 
     833//      // April 2011 -- now use the properly propagated 2D error 
    832834        Duplicate/O data_err sw 
    833835        Redimension/N=(pixelsX*pixelsY) sw 
Note: See TracChangeset for help on using the changeset viewer.