Changeset 138 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00

Timestamp:

Jul 26, 2007 5:54:19 PM (16 years ago)

Author:

ajj

Message:

Adding matrix method of calculating slit smearing for USANS Data.

• Code is in USANS_SlitSmearing.ipf
• Added hook in PlotUtilsMacro?.ipf

-- Notes --

• Calculating the matrix takes about .5 to 1 second on my Macbook Pro (faster than I remember!)
• Choice of extrapolation slope as a bigger effect than I remember.

• Nothing done with Smearing functions to make them use this.

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00

Files:

• PlotUtilsMacro.ipf (modified) (2 diffs)
• Sphere.ipf (modified) (1 diff)
• USANS_SlitSmearing.ipf (added)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PlotUtilsMacro.ipf

@@ -144 +144 @@
                 Duplicate/O $("root:"+n5), $w5
 
-                // make a resolution matrix
-                Variable np=numpnts($w0)
-                Make/O/N=(np,4) $(baseStr+"_res")
                 // need to switch based on SANS/USANS
-                if (isSANSResolution($w3[0]))           //checks to see if the first point of the wave is <0
+                if (isSANSResolution($w3[0]))           //checks to see if the first point of the wave is <0]
+                        // make a resolution matrix for SANS data
+                        Variable np=numpnts($w0)
+                        Make/O/N=(np,4) $(baseStr+"_res")
+                        
                         $(baseStr+"_res")[][0] = $w3[p]         //sigQ
                         $(baseStr+"_res")[][1] = $w4[p]         //qBar
@@ -156 +157 @@
                         //the data is USANS data
                         // marix calculation here, but for now, just copy the waves
-                        $(baseStr+"_res")[][0] = $w3[p]         //sigQ
-                        $(baseStr+"_res")[][1] = $w4[p]         //qBar
-                        $(baseStr+"_res")[][2] = $w5[p]         //fShad
-                        $(baseStr+"_res")[][3] = $w0[p]         //Qvalues
+                        //$(baseStr+"_res")[][0] = $w3[p]               //sigQ
+                        //$(baseStr+"_res")[][1] = $w4[p]               //qBar
+                        //$(baseStr+"_res")[][2] = $w5[p]               //fShad
+                        //$(baseStr+"_res")[][3] = $w0[p]               //Qvalues
+                        
+                        USANS_CalcWeights(baseStr,-$w3[0])
+                        
                 endif
                 Killwaves/Z $w3,$w4,$w5                 //get rid of the resolution waves that are in the matrix

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Sphere.ipf

@@ -24 +24 @@
         Edit parameters_sf,coef_sf      
         Variable/G root:g_sf=0                  
-        g_sf := SphereForm(coef_sf,ywave_sf,xwave_sf)   // AAO calculation, "fake" dependency
+        root:g_sf := SphereForm(coef_sf,ywave_sf,xwave_sf)      // AAO calculation, "fake" dependency
 //      ywave_sf := SphereForm(coef_sf,xwave_sf)                //point calculation
         Display ywave_sf vs xwave_sf