Changeset 138


Ignore:
Timestamp:
Jul 26, 2007 5:54:19 PM (15 years ago)
Author:
ajj
Message:

Adding matrix method of calculating slit smearing for USANS Data.

-- 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
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PlotUtilsMacro.ipf

    r127 r138  
    144144                Duplicate/O $("root:"+n5), $w5 
    145145 
    146                 // make a resolution matrix 
    147                 Variable np=numpnts($w0) 
    148                 Make/O/N=(np,4) $(baseStr+"_res") 
    149146                // need to switch based on SANS/USANS 
    150                 if (isSANSResolution($w3[0]))           //checks to see if the first point of the wave is <0 
     147                if (isSANSResolution($w3[0]))           //checks to see if the first point of the wave is <0] 
     148                        // make a resolution matrix for SANS data 
     149                        Variable np=numpnts($w0) 
     150                        Make/O/N=(np,4) $(baseStr+"_res") 
     151                         
    151152                        $(baseStr+"_res")[][0] = $w3[p]         //sigQ 
    152153                        $(baseStr+"_res")[][1] = $w4[p]         //qBar 
     
    156157                        //the data is USANS data 
    157158                        // marix calculation here, but for now, just copy the waves 
    158                         $(baseStr+"_res")[][0] = $w3[p]         //sigQ 
    159                         $(baseStr+"_res")[][1] = $w4[p]         //qBar 
    160                         $(baseStr+"_res")[][2] = $w5[p]         //fShad 
    161                         $(baseStr+"_res")[][3] = $w0[p]         //Qvalues 
     159                        //$(baseStr+"_res")[][0] = $w3[p]               //sigQ 
     160                        //$(baseStr+"_res")[][1] = $w4[p]               //qBar 
     161                        //$(baseStr+"_res")[][2] = $w5[p]               //fShad 
     162                        //$(baseStr+"_res")[][3] = $w0[p]               //Qvalues 
     163                         
     164                        USANS_CalcWeights(baseStr,-$w3[0]) 
     165                         
    162166                endif 
    163167                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

    r131 r138  
    2424        Edit parameters_sf,coef_sf       
    2525        Variable/G root:g_sf=0                   
    26         g_sf := SphereForm(coef_sf,ywave_sf,xwave_sf)   // AAO calculation, "fake" dependency 
     26        root:g_sf := SphereForm(coef_sf,ywave_sf,xwave_sf)      // AAO calculation, "fake" dependency 
    2727//      ywave_sf := SphereForm(coef_sf,xwave_sf)                //point calculation 
    2828        Display ywave_sf vs xwave_sf                                                     
Note: See TracChangeset for help on using the changeset viewer.