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/UniformEllipsoid.ipf

    r42 r127  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2#pragma IgorVersion = 6.0 
    23 
    34//////////////////////////////////////////////// 
     
    2122        make/o/t parameters_eor = {"scale","R a (rotation axis) (A)","R b (A)","Contrast (A^-2)","incoh. bkg (cm^-1)"} 
    2223        Edit parameters_eor,coef_eor 
    23         ywave_eor := EllipsoidForm(coef_eor,xwave_eor) 
     24        Variable/G root:g_eor 
     25        g_eor := EllipsoidForm(coef_eor,ywave_eor,xwave_eor) 
     26//      ywave_eor := EllipsoidForm(coef_eor,xwave_eor) 
    2427        Display ywave_eor vs xwave_eor 
    2528        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    3033/////////////////////////////////////////////////////////// 
    3134 
    32 Proc PlotSmearedEllipsoidForm()  
    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// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
     36Proc PlotSmearedEllipsoidForm(str)       
     37        String str 
     38        Prompt str,"Pick the data folder conatining the resolution you want",popup,getAList(4) 
    3539         
    3640        // if no gQvals wave, data must not have been loaded => abort 
    37         if(ResolutionWavesMissing()) 
     41        if(ResolutionWavesMissingDF(str)) 
    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_eor,smeared_qvals 
     54        Duplicate/O $(str+"_q") smeared_eor,smeared_qvals 
    4955        SetScale d,0,0,"1/cm",smeared_eor        
    5056 
    51         smeared_eor := SmearedEllipsoidForm(smear_coef_eor,$gQvals) 
     57        Variable/G root:gs_eor=0 
     58        gs_eor := fSmearedEllipsoidForm(smear_coef_eor,smeared_eor,smeared_qvals) 
     59         
    5260        Display smeared_eor 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) 
     65         
     66        SetDataFolder root: 
     67End 
     68 
     69//AAO version 
     70Function EllipsoidForm(cw,yw,xw) : FitFunc 
     71        Wave cw,yw,xw 
     72         
     73#if exists("EllipsoidFormX") 
     74        yw = EllipsoidFormX(cw,yw) 
     75#else 
     76        yw = fEllipsoidForm(cw,xw) 
     77#endif 
     78        return(0) 
    5779End 
    5880 
     
    6082// unsmeared model calculation 
    6183/////////////////////////// 
    62 Function EllipsoidForm(w,x) : FitFunc 
     84Function fEllipsoidForm(w,x) : FitFunc 
    6385        Wave w 
    6486        Variable x 
     
    174196 
    175197// this is all there is to the smeared calculation! 
    176 Function SmearedEllipsoidForm(w,x) :FitFunc 
    177         Wave w 
    178         Variable x 
    179          
    180         Variable ans 
    181         SVAR sq = gSig_Q 
    182         SVAR qb = gQ_bar 
    183         SVAR sh = gShadow 
    184         SVAR gQ = gQVals 
     198Function SmearedEllipsoidForm(s) :FitFunc 
     199        Struct ResSmearAAOStruct &s 
    185200         
    186201        //the name of your unsmeared model is the first argument 
    187         ans = Smear_Model_20(EllipsoidForm,$sq,$qb,$sh,$gQ,w,x) 
    188  
    189         return(ans) 
    190 End 
     202        s.yW = Smear_Model_20(EllipsoidForm,s.coefW,s.xW,s.resW) 
     203 
     204        return(0) 
     205End 
     206 
     207//wrapper to calculate the smeared model as an AAO-Struct 
     208// fills the struct and calls the ususal function with the STRUCT parameter 
     209// 
     210// used only for the dependency, not for fitting 
     211// 
     212Function fSmearedEllipsoidForm(coefW,yW,xW) 
     213        Wave coefW,yW,xW 
     214         
     215        String str = getWavesDataFolder(yW,0) 
     216        String DF="root:"+str+":" 
     217         
     218        WAVE resW = $(DF+str+"_res") 
     219         
     220        STRUCT ResSmearAAOStruct fs 
     221        WAVE fs.coefW = coefW    
     222        WAVE fs.yW = yW 
     223        WAVE fs.xW = xW 
     224        WAVE fs.resW = resW 
     225         
     226        Variable err 
     227        err = SmearedEllipsoidForm(fs) 
     228         
     229        return (0) 
     230End 
Note: See TracChangeset for help on using the changeset viewer.