Changeset 800 for sans/Dev/trunk/NCNR_User_Procedures/Common/GaussUtils_v40.ipf

Timestamp:

May 4, 2011 9:47:33 AM (12 years ago)

Author:

srkline

Message:

Changed the 2D resolution calculation to include gravity. This seems to work, but will still require some testing. It requires no modifications to the smearing calculation, still using parallel and perpendicular directions.

Added a Fake Update feature to the RealTime? update. There are specific, separate instructions for how to set this up. Usef (possibly) for summer schools or demos.

Adjusted the 2D MonteCarlo? simulation to a corrected beam center. The Gauss Peak was not symmetric around the old beam center.

Corrected the AAO resolution smearing functions to work with cursors.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/GaussUtils_v40.ipf (modified) (14 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/GaussUtils_v40.ipf

@@ -419 +419 @@
         Variable nord                   //number of quadrature points to used
 
+
+// special case of integral limits that are identical
+        if(upLim == loLim)
+                return( fcn(w,x, loLim))
+        endif
+        
 // local variables
         Variable ii,va,vb,summ,yyy,zi
@@ -445 +451 @@
         // Using 5 Gauss points             
         // remember to index from 0,size-1
-
+        
         summ = 0.0              // initialize integral
         ii=0                    // loop counter
@@ -472 +478 @@
         Variable x      //x-value (q) for the calculation
 
+
+// special case of integral limits that are identical
+        if(upLim == loLim)
+                return( fcn(w,x, loLim))
+        endif
+        
 // local variables
         Variable nord,ii,va,vb,summ,yyy,zi
@@ -525 +537 @@
         Variable x      //x-value (q) for the calculation
 
+// special case of integral limits that are identical
+        if(upLim == loLim)
+                return( fcn(w,x, loLim))
+        endif
+        
 // local variables
         Variable nord,ii,va,vb,summ,yyy,zi
@@ -578 +595 @@
         Variable x      //x-value (q) for the calculation
 
+// special case of integral limits that are identical
+        if(upLim == loLim)
+                return( fcn(w,x, loLim))
+        endif
+        
 // local variables
         Variable nord,ii,va,vb,summ,yyy,zi
@@ -631 +653 @@
 
 //**** The coefficient wave is passed into this function and straight through to the unsmeared model function
-
+// special case of integral limits that are identical
+        if(upLim == loLim)
+                return( fcn(w,x, loLim))
+        endif
+        
 // local variables
         Variable nord,ii,va,vb,summ,yyy,zi
@@ -906 +932 @@
                 endif
         
-                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
-//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
+//              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
+                Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
                 
                 Return (0)
@@ -956 +982 @@
                 endif
         
-                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
-//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
+//              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
+                Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
 
                 Return (0)
@@ -982 +1008 @@
         String weightStr,zStr
         Variable nord=20
+
         
         if (dimsize(resW,1) > 4 && useTrap != 1)
@@ -1012 +1039 @@
                 endif
         
-                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
-//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
+//              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
+                Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
 
                 Return (0)
@@ -1060 +1087 @@
                 endif
         
-                answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
-//              Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
+//              answer = Smear_Model_N(fcn,w,x,resW,weightW,abscissW,nord)
+                Smear_Model_N_AAO(fcn,w,x,resW,weightW,abscissW,nord,answer)
 
                 Return (0)
@@ -1612 +1639 @@
 // provides some speedup.
 //
-//// APRIL 2011 *** this function is NOT YET CURSOR-AWARE. This needs to be addressed before it can be used
+//// APRIL 2011 *** this function is now cursor aware. The whole input x-wave is interpolated
 //
 //
@@ -1653 +1680 @@
         // returned from the interpolation (as expected)
 
-        Make/O/D/N=(DimSize(resW, 0)) sigQ,qbar,shad,qvals,va,vb
-        sigq = resW[p][0]               //std dev of resolution fn
-        qbar = resW[p][1]               //mean q-value
-        shad = resW[p][2]               //beamstop shadow factor
-        qvals = resW[p][3]      //q-values where R(q) is known
-
-        //SKIP the interpolation, points passed in ARE (MUST) be the experimental q-values
-        
+        Make/O/D/N=(numpnts(x)) sigQ,qbar,shad,qvals,va,vb
+        Make/O/D/N=(DimSize(resW, 0)) tmpsigQ,tmpqbar,tmpshad,tmpqvals
+        tmpsigq = resW[p][0]            //std dev of resolution fn
+        tmpqbar = resW[p][1]            //mean q-value
+        tmpshad = resW[p][2]            //beamstop shadow factor
+        tmpqvals = resW[p][3]   //q-values where R(q) is known
+
+        //interpolate the whole input x-wave to make sure that the resolution and input x are in sync if cursors are used
+        shad = interp(x,tmpqvals,tmpshad)
+        qbar = interp(x,tmpqvals,tmpqbar)
+        sigq = interp(x,tmpqvals,tmpsigq)
         
         // if USANS data, handle separately
@@ -1755 +1785 @@
         sm_ans /= normalize
         
+        KillWaves/Z tmpsigQ,tmpqbar,tmpshad,tmpqvals
+        
         return(0)