Changeset 127 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CylinderForm.ipf

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:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CylinderForm.ipf (modified) (7 diffs)

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

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
+#pragma IgorVersion = 6.0
 
 ////////////////////////////////////////////////
@@ -21 +22 @@
         make/o/t parameters_cyl = {"scale","radius (A)","length (A)","contrast (A^-2)","incoh. bkg (cm^-1)"}
         Edit parameters_cyl,coef_cyl
-        ywave_cyl := CylinderForm(coef_cyl,xwave_cyl)
+        Variable/G root:g_cyl
+        g_cyl := CylinderForm(coef_cyl,ywave_cyl,xwave_cyl)
+//      ywave_cyl := CylinderForm(coef_cyl,xwave_cyl)
         Display ywave_cyl vs xwave_cyl
         ModifyGraph log=1,marker=29,msize=2,mode=4
@@ -28 +31 @@
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
 End
+
 ///////////////////////////////////////////////////////////
-
-Proc PlotSmearedCylinderForm()  
-        //no input parameters necessary, it MUST use the experimental q-values
-        // from the experimental data read in from an AVE/QSIG data file
-        
-        // if no gQvals wave, data must not have been loaded => abort
-        if(ResolutionWavesMissing())
+// - sets up a dependency to a wrapper, not the actual SmearedModelFunction
+Proc PlotSmearedCylinderForm(str)                                                               
+        String str
+        Prompt str,"Pick the data folder conatining the resolution you want",popup,getAList(4)
+        
+        // if any of the resolution waves are missing => abort
+        if(ResolutionWavesMissingDF(str))               //updated to NOT use global strings (in GaussUtils)
                 Abort
         endif
+        
+        SetDataFolder $("root:"+str)
         
         // Setup parameter table for model function
@@ -46 +52 @@
         // output smeared intensity wave, dimensions are identical to experimental QSIG values
         // make extra copy of experimental q-values for easy plotting
-        Duplicate/O $gQvals smeared_cyl,smeared_qvals
+        Duplicate/O $(str+"_q") smeared_cyl,smeared_qvals
         SetScale d,0,0,"1/cm",smeared_cyl       
-
-        smeared_cyl := SmearedCylinderForm(smear_coef_cyl,$gQvals)
+                                        
+        Variable/G gs_cyl=0
+        gs_cyl := fSmearedCylinderForm(smear_coef_cyl,smeared_cyl,smeared_qvals)        //this wrapper fills the STRUCT
+        
         Display smeared_cyl vs smeared_qvals
         ModifyGraph log=1,marker=29,msize=2,mode=4
@@ -55 +63 @@
         Label left "Intensity (cm\\S-1\\M)"
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
+        
+        SetDataFolder root:
+End
+
+// AAO verison
+Function CylinderForm(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+
+#if exists("CylinderFormX")
+        yw = CylinderFormX(cw,xw)
+#else
+        yw = fCylinderForm(cw,xw)
+#endif
+        return(0)
 End
 
@@ -60 +82 @@
 // unsmeared model calculation
 ///////////////////////////
-Function CylinderForm(w,x) : FitFunc
+Function fCylinderForm(w,x) : FitFunc
         Wave w
         Variable x
-
-        String funcStr = SelectString(exists("CylinderFormX")==3,"", "CylinderFormX")
-        if(strlen(funcStr) > 0)
-                FUNCREF SANSModel_proto func=$funcStr
-                return func(w,x)
-        endif
         
 //The input variables are (and output)
@@ -190 +206 @@
 
 // this is all there is to the smeared calculation!
-Function SmearedCylinderForm(w,x) :FitFunc
-        Wave w
-        Variable x
-        
-        Variable ans
-        SVAR sq = gSig_Q
-        SVAR qb = gQ_bar
-        SVAR sh = gShadow
-        SVAR gQ = gQVals
-        
-        //the name of your unsmeared model is the first argument
-        if(exists("CylinderFormX") == 3)
-                ans = Smear_Model_20($"CylinderFormX",$sq,$qb,$sh,$gQ,w,x)
-        else
-        ans = Smear_Model_20(CylinderForm,$sq,$qb,$sh,$gQ,w,x)
-        endif
-
-        return(ans)
-End
-
+Function SmearedCylinderForm(s) :FitFunc
+        Struct ResSmearAAOStruct &s
+
+////the name of your unsmeared model is the first argument
+        s.yW = Smear_Model_20(CylinderForm,s.coefW,s.xW,s.resW)
+
+        return(0)
+End
+
+
+//wrapper to calculate the smeared model as an AAO-Struct
+// fills the struct and calls the ususal function with the STRUCT parameter
+//
+// used only for the dependency, not for fitting
+//
+Function fSmearedCylinderForm(coefW,yW,xW)
+        Wave coefW,yW,xW
+        
+        String str = getWavesDataFolder(yW,0)
+        String DF="root:"+str+":"
+        
+        WAVE resW = $(DF+str+"_res")
+        
+        STRUCT ResSmearAAOStruct fs
+        WAVE fs.coefW = coefW   
+        WAVE fs.yW = yW
+        WAVE fs.xW = xW
+        WAVE fs.resW = resW
+        
+        Variable err
+        err = SmearedCylinderForm(fs)
+        
+        return (0)
+End