Ignore:
Timestamp:
Jul 24, 2007 3:23:44 PM (16 years ago)
Author:
srkline
Message:

LOTS of changes to the analysis ipf files:

-- see sphere.ipf for the simplest example of the changes --

  • #pragma Igor 6
  • #if directive to look for XOP
  • AAO unsmeared functions
  • STRUCT functions for smearing (also AAO)
  • new wrappers for dependencies to struct functions

(2006 models have NOT been completed yet, only the old models)

  • loading data files into data folders (PlotUtils?) + some streamlining of the loaders
  • Smear_Model_N is now AAO + some streamlining of the quadrature code

-- SHS and SW structure factor XOPs are crashing (need DP wave, I may have old XOP)
-- this breaks fitting of the smeared models until wrappers can be devised
-- all packages will be broken due to the new data folder structure
-- multiple instances of functions will now cause problems (MSA)
-- RPA model is a problem with its odd functional form (extra wave)

-- lots of other carnage to follow as the bugs and typos are shaken out

24 JUL 2007 SRK

File:
1 edited

Legend:

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

    r42 r127  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2#pragma IgorVersion = 6.0 
    23 
    34//////////////////////////////////////////////// 
     
    2122        make/o/t parameters_Hcyl = {"scale","core radius (A)","shell radius (A)","length (A)","contrast (A^-2)","incoh. bkg (cm^-1)"} 
    2223        Edit parameters_Hcyl,coef_Hcyl 
    23         ywave_Hcyl := HollowCylinderForm(coef_Hcyl,xwave_Hcyl) 
     24        Variable/G root:g_hcyl 
     25        g_Hcyl := HollowCylinder(coef_Hcyl,ywave_Hcyl,xwave_Hcyl) 
     26//      ywave_Hcyl := HollowCylinder(coef_Hcyl,xwave_Hcyl) 
    2427        Display ywave_Hcyl vs xwave_Hcyl 
    2528        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    2831        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2932End 
     33 
    3034/////////////////////////////////////////////////////////// 
    31  
    32 Proc PlotSmearedHollowCylinderForm()     
    33         //no input parameters necessary, it MUST use the experimental q-values 
    34         // from the experimental data read in from an AVE/QSIG data file 
    35          
    36         // if no gQvals wave, data must not have been loaded => abort 
    37         if(ResolutionWavesMissing()) 
     35// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
     36Proc PlotSmearedHollowCylinderForm(str)                                                          
     37        String str 
     38        Prompt str,"Pick the data folder conatining the resolution you want",popup,getAList(4) 
     39         
     40        // if any of the resolution waves are missing => abort 
     41        if(ResolutionWavesMissingDF(str))               //updated to NOT use global strings (in GaussUtils) 
    3842                Abort 
    3943        endif 
     44         
     45        SetDataFolder $("root:"+str) 
    4046         
    4147        // Setup parameter table for model function 
     
    4652        // output smeared intensity wave, dimensions are identical to experimental QSIG values 
    4753        // make extra copy of experimental q-values for easy plotting 
    48         Duplicate/O $gQvals smeared_Hcyl,smeared_qvals 
     54        Duplicate/O $(str+"_q") smeared_Hcyl,smeared_qvals 
    4955        SetScale d,0,0,"1/cm",smeared_Hcyl       
    50  
    51         smeared_Hcyl := SmearedHollowCylinderForm(smear_coef_Hcyl,$gQvals) 
     56                                         
     57        Variable/G gs_Hcyl=0 
     58        gs_Hcyl := fSmearedHollowCylinder(smear_coef_Hcyl,smeared_Hcyl,smeared_qvals)   //this wrapper fills the STRUCT 
     59         
    5260        Display smeared_Hcyl vs smeared_qvals 
    5361        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    5563        Label left "Intensity (cm\\S-1\\M)" 
    5664        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    57 End 
    58  
     65         
     66        SetDataFolder root: 
     67End 
     68 
     69 
     70//AAO version 
     71Function HollowCylinder(cw,yw,xw) : FitFunc 
     72        Wave cw,yw,xw 
     73 
     74#if exists("HollowCylinderX") 
     75        yw = HollowCylinderX(cw,xw) 
     76#else 
     77        yw = fHollowCylinder(cw,xw) 
     78#endif 
     79        return(0) 
     80End 
    5981/////////////////////////////////////////////////////////////// 
    6082// unsmeared model calculation 
    6183/////////////////////////// 
    62 Function HollowCylinderForm(w,x) : FitFunc 
     84Function fHollowCylinder(w,x) : FitFunc 
    6385        Wave w 
    6486        Variable x 
     
    186208 
    187209// this is all there is to the smeared calculation! 
    188 Function SmearedHollowCylinderForm(w,x) :FitFunc 
    189         Wave w 
    190         Variable x 
    191          
    192         Variable ans 
    193         SVAR sq = gSig_Q 
    194         SVAR qb = gQ_bar 
    195         SVAR sh = gShadow 
    196         SVAR gQ = gQVals 
    197          
    198         //the name of your unsmeared model is the first argument 
    199         ans = Smear_Model_20(HollowCylinderForm,$sq,$qb,$sh,$gQ,w,x) 
    200  
    201         return(ans) 
    202 End 
     210Function SmearedHollowCylinder(s) :FitFunc 
     211        Struct ResSmearAAOStruct &s 
     212 
     213////the name of your unsmeared model is the first argument 
     214        s.yW = Smear_Model_20(HollowCylinder,s.coefW,s.xW,s.resW) 
     215 
     216        return(0) 
     217End 
     218 
     219//wrapper to calculate the smeared model as an AAO-Struct 
     220// fills the struct and calls the ususal function with the STRUCT parameter 
     221// 
     222// used only for the dependency, not for fitting 
     223// 
     224Function fSmearedHollowCylinder(coefW,yW,xW) 
     225        Wave coefW,yW,xW 
     226         
     227        String str = getWavesDataFolder(yW,0) 
     228        String DF="root:"+str+":" 
     229         
     230        WAVE resW = $(DF+str+"_res") 
     231         
     232        STRUCT ResSmearAAOStruct fs 
     233        WAVE fs.coefW = coefW    
     234        WAVE fs.yW = yW 
     235        WAVE fs.xW = xW 
     236        WAVE fs.resW = resW 
     237         
     238        Variable err 
     239        err = SmearedHollowCylinder(fs) 
     240         
     241        return (0) 
     242End 
Note: See TracChangeset for help on using the changeset viewer.