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

    r42 r127  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2#pragma IgorVersion = 6.0 
    23 
    34//////////////////////////////////////////////// 
     
    2122        make/o/t parameters_pef = {"scale","major core radius (A)","minor core radius (A)","major shell radius (A)","minor shell radius (A)","Contrast (core-shell) (A-2)","Constrast (shell-solvent) (A-2)","bkg (cm-1)"} 
    2223        Edit parameters_pef,coef_pef 
    23         ywave_pef := ProlateForm(coef_pef,xwave_pef) 
     24        Variable/G root:g_pef 
     25        g_pef := ProlateForm(coef_pef,ywave_pef,xwave_pef) 
     26//      ywave_pef := ProlateForm(coef_pef,xwave_pef) 
    2427        Display ywave_pef vs xwave_pef 
    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 PlotSmearedProlateForm()                                                           //**** name of your function 
    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 PlotSmearedProlateForm(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_pef,smeared_qvals                           //**** mod 
    49         SetScale d,0,0,"1/cm",smeared_pef                                                       //**** mod 
    50  
    51         smeared_pef := SmearedProlateForm(smear_coef_pef,$gQvals) 
     54        Duplicate/O $(str+"_q") smeared_pef,smeared_qvals                               //**** mod 
     55        SetScale d,0,0,"1/cm",smeared_pef                                                
     56                 
     57        Variable/G gs_pef=0 
     58        gs_pef := fSmearedProlateForm(smear_coef_pef,smeared_pef,smeared_qvals) //this wrapper fills the STRUCT 
     59 
    5260        Display smeared_pef vs smeared_qvals 
    5361        ModifyGraph log=1,marker=29,msize=2,mode=4 
    5462        Label bottom "q (\\S-1\\M)" 
    5563        Label left "Intensity (cm\\S-1\\M)" 
    56         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     64        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
     65         
     66        SetDataFolder root: 
     67End 
     68 
     69//AAO version 
     70Function ProlateForm(cw,yw,xw) : FitFunc 
     71        Wave cw,yw,xw 
     72 
     73#if exists("ProlateFormX") 
     74        yw = ProlateFormX(cw,xw) 
     75#else 
     76        yw = fProlateForm(cw,xw) 
     77#endif 
     78        return(0) 
    5779End 
    5880 
     
    6082// unsmeared model calculation 
    6183/////////////////////////// 
    62 Function ProlateForm(w,x) : FitFunc 
     84Function fProlateForm(w,x) : FitFunc 
    6385        Wave w 
    6486        Variable x 
     
    205227 
    206228// this is all there is to the smeared calculation! 
    207 Function SmearedProlateForm(w,x) :FitFunc 
    208         Wave w 
    209         Variable x 
    210          
    211         Variable ans 
    212         SVAR sq = gSig_Q 
    213         SVAR qb = gQ_bar 
    214         SVAR sh = gShadow 
    215         SVAR gQ = gQVals 
    216          
    217         //the name of your unsmeared model is the first argument 
    218         ans = Smear_Model_20(ProlateForm,$sq,$qb,$sh,$gQ,w,x) 
    219  
    220         return(ans) 
    221 End 
     229Function SmearedProlateForm(s) :FitFunc 
     230        Struct ResSmearAAOStruct &s 
     231 
     232////the name of your unsmeared model is the first argument 
     233        s.yW = Smear_Model_20(ProlateForm,s.coefW,s.xW,s.resW) 
     234 
     235        return(0) 
     236End 
     237 
     238//wrapper to calculate the smeared model as an AAO-Struct 
     239// fills the struct and calls the ususal function with the STRUCT parameter 
     240// 
     241// used only for the dependency, not for fitting 
     242// 
     243Function fSmearedProlateForm(coefW,yW,xW) 
     244        Wave coefW,yW,xW 
     245         
     246        String str = getWavesDataFolder(yW,0) 
     247        String DF="root:"+str+":" 
     248         
     249        WAVE resW = $(DF+str+"_res") 
     250         
     251        STRUCT ResSmearAAOStruct fs 
     252        WAVE fs.coefW = coefW    
     253        WAVE fs.yW = yW 
     254        WAVE fs.xW = xW 
     255        WAVE fs.resW = resW 
     256         
     257        Variable err 
     258        err = SmearedProlateForm(fs) 
     259         
     260        return (0) 
     261End 
Note: See TracChangeset for help on using the changeset viewer.