Changeset 128 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarFF_HG.ipf

Timestamp:

Jul 25, 2007 3:07:20 PM (16 years ago)

Author:

srkline

Message:

Second round of changes to ipf files to (hopefully) complete the changes to bring all of the model functions to be:

• this set of changes is for the "2006" set of models
• AAO
• new dependencies
• smearing using structures
• #if conditional compile for XOPS

-this needs to be FULLY tested for correctness and bugs
-packages are certainly still broken (data folders)

SRK 25 JUL 07

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarFF_HG.ipf (modified) (6 diffs)

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

@@ -35 +35 @@
         Edit parameters_LamellarFF_HG, coef_LamellarFF_HG
         ModifyTable width(parameters_LamellarFF_HG)=160
-        ywave_LamellarFF_HG  := LamellarFF_HG(coef_LamellarFF_HG, xwave_LamellarFF_HG)
+        
+        Variable/G root:g_LamellarFF_HG
+        g_LamellarFF_HG := LamellarFF_HG(coef_LamellarFF_HG, ywave_LamellarFF_HG, xwave_LamellarFF_HG)
         Display ywave_LamellarFF_HG vs xwave_LamellarFF_HG
         ModifyGraph marker=29, msize=2, mode=4
@@ -45 +47 @@
 End
 
-//
-//this macro sets up all the necessary parameters and waves that are
-//needed to calculate the  smeared model function.
-//
-//no input parameters are necessary, it MUST use the experimental q-values
-// from the experimental data read in from an AVE/QSIG data file
-////////////////////////////////////////////////////
-Proc PlotSmeared_LamellarFF_HG()                                                                //Lamellar
+// - sets up a dependency to a wrapper, not the actual SmearedModelFunction
+Proc PlotSmeared_LamellarFF_HG(str)                                                             
+        String str
+        Prompt str,"Pick the data folder conatining the resolution you want",popup,getAList(4)
         
-        // if no gQvals wave, data must not have been loaded => abort
-        If(ResolutionWavesMissing())            //part of GaussUtils
+        // 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
@@ -66 +66 @@
         // 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_LamellarFF_HG,smeared_qvals                         //
+        Duplicate/O $(str+"_q") smeared_LamellarFF_HG,smeared_qvals                             //
         SetScale d,0,0,"1/cm",smeared_LamellarFF_HG                                                     //
-
-        smeared_LamellarFF_HG := LamellarFF_HG_Smeared(smear_coef_LamellarFF_HG,$gQvals)                // SMEARED function name
+                                        
+        Variable/G gs_LamellarFF_HG=0
+        gs_LamellarFF_HG := fLamellarFF_HG_Smeared(smear_coef_LamellarFF_HG,smeared_LamellarFF_HG,smeared_qvals)        //this wrapper fills the STRUCT
+        
         Display smeared_LamellarFF_HG vs smeared_qvals                                                                  //
         ModifyGraph log=1,marker=29,msize=2,mode=4
@@ -75 +77 @@
         Label left "I(q) (cm\\S-1\\M)"
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
-End     // end macro 
+        
+        SetDataFolder root:
+End
+
+
+
+//AAO version, uses XOP if available
+// simply calls the original single point calculation with
+// a wave assignment (this will behave nicely if given point ranges)
+Function LamellarFF_HG(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+        
+#if exists("LamellarFF_HGX")
+        yw = LamellarFF_HGX(cw,xw)
+#else
+        yw = fLamellarFF_HG(cw,xw)
+#endif
+        return(0)
+End
 
 //CH#1
@@ -82 +102 @@
 // based on the wave (array) of parameters that you send it (w)
 //
-Function LamellarFF_HG(w,x) : FitFunc
+Function fLamellarFF_HG(w,x) : FitFunc
         Wave w
         Variable x
@@ -124 +144 @@
 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 fLamellarFF_HG_Smeared(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 = LamellarFF_HG_Smeared(fs)
+        
+        return (0)
+End
+
 //the smeared model calculation
-Function LamellarFF_HG_Smeared(w,x) :FitFunc
-        Wave w
-        Variable x
-        
-        Variable ans
-        SVAR sq = gSig_Q
-        SVAR qb = gQ_bar
-        SVAR sh = gShadow
-        SVAR gQ = gQVals
-        
-        ans = Smear_Model_20(LamellarFF_HG,$sq,$qb,$sh,$gQ,w,x) 
+Function LamellarFF_HG_Smeared(s) :FitFunc
+        Struct ResSmearAAOStruct &s
 
-        return(ans)
+//      the name of your unsmeared model (AAO) is the first argument
+        s.yW = Smear_Model_20(LamellarFF_HG,s.coefW,s.xW,s.resW)
+
+        return(0)
 End