Changeset 128 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarPS.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/LamellarPS.ipf (modified) (4 diffs)

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

@@ -63 +63 @@
         Edit parameters_LamellarPS, coef_LamellarPS
         ModifyTable width(parameters_LamellarPS)=160
-        ywave_LamellarPS  := LamellarPS(coef_LamellarPS, xwave_LamellarPS)
+        
+        Variable/G root:g_LamellarPS
+        g_LamellarPS := LamellarPS(coef_LamellarPS, ywave_LamellarPS, xwave_LamellarPS)
         Display ywave_LamellarPS vs xwave_LamellarPS
         ModifyGraph marker=29, msize=2, mode=4
@@ -77 +79 @@
 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
-//////////////////////////////////////////////////////
-//Macro PlotSmeared_LamellarPS()                                                                //Lamellar
-//      
-//      
-//      // if no gQvals wave, data must not have been loaded => abort
-//      If(ResolutionWavesMissing())            //part of GaussUtils
+// - sets up a dependency to a wrapper, not the actual SmearedModelFunction
+//Proc PlotSmeared_LamellarPS(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)
 //      
 //      // constants
@@ -102 +101 @@
 //      // 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_LamellarPS,smeared_qvals                            //
+//      Duplicate/O $(str+"_q") smeared_LamellarPS,smeared_qvals                                //
 //      SetScale d,0,0,"1/cm",smeared_LamellarPS                                                        //
-//
-//      smeared_LamellarPS := LamellarPS_Smeared(smear_coef_LamellarPS,$gQvals)         // SMEARED function name
-//      Display smeared_LamellarPS vs $gQvals                                                                   //
+//                                      
+//      Variable/G gs_LamellarPS=0
+//      gs_LamellarPS := fLamellarPS_Smeared(smear_coef_LamellarPS,smeared_LamellarPS,smeared_qvals)    //this wrapper fills the STRUCT
+//      
+//      Display smeared_LamellarPS vs smeared_qvals                                                                     //
 //      ModifyGraph log=1,marker=29,msize=2,mode=4
 //      Label bottom "q (\\S-1\\M)"
 //      Label left "I(q) (cm\\S-1\\M)"
-//
-//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 LamellarPS(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+        
+#if exists("LamellarPSX")
+        yw = LamellarPSX(cw,xw)
+#else
+        yw = fLamellarPS(cw,xw)
+#endif
+        return(0)
+End
 
 // instrument resolution IS included here in S(Q)
-Function LamellarPS(w,x) : FitFunc
+Function fLamellarPS(w,x) : FitFunc
         Wave w
         Variable x
@@ -191 +211 @@
         Return (inten+bkg)
 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 fLamellarPS_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 = LamellarPS_Smeared(fs)
+//      
+//      return (0)
+//End
+
 //the smeared model calculation
-//Function LamellarPS_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(LamellarPS,$sq,$qb,$sh,$gQ,w,x)    
-//
-//      return(ans)
+//Function LamellarPS_Smeared(s) :FitFunc
+//      Struct ResSmearAAOStruct &s
+//
+////    the name of your unsmeared model (AAO) is the first argument
+//      s.yW = Smear_Model_20(LamellarPS,s.coefW,s.xW,s.resW)
+//
+//      return(0)
 //End
-//
+////