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

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

@@ -58 +58 @@
         ModifyTable width(coef_BinaryHS)=90
         
-        ywave_BinaryHS  := BinaryHS(coef_BinaryHS, xwave_BinaryHS)
+        Variable/G root:g_BinaryHS
+        g_BinaryHS := BinaryHS(coef_BinaryHS, ywave_BinaryHS,xwave_BinaryHS)
         Display ywave_BinaryHS vs xwave_BinaryHS
         ModifyGraph marker=29, msize=2, mode=4
@@ -67 +68 @@
 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_BinaryHS()                                                             //BinaryHS
-        
-        // 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 PlotSmeared_BinaryHS(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
@@ -89 +88 @@
         // 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_BinaryHS,smeared_qvals                              //
+        Duplicate/O $(str+"_q") smeared_BinaryHS,smeared_qvals                          //
         SetScale d,0,0,"1/cm",smeared_BinaryHS                                                  //
-
-        smeared_BinaryHS := BinaryHS_Smeared(smear_coef_BinaryHS,$gQvals)               // SMEARED function name
+                                        
+        Variable/G gs_BinaryHS=0
+        gs_BinaryHS := fBinaryHS_Smeared(smear_coef_BinaryHS,smeared_BinaryHS,smeared_qvals)    //this wrapper fills the STRUCT
+        
         Display smeared_BinaryHS vs smeared_qvals                                                                       //
         ModifyGraph log=1,marker=29,msize=2,mode=4
@@ -98 +99 @@
         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 BinaryHS(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+        
+#if exists("BinaryHSX")
+        yw = BinaryHSX(cw,xw)
+#else
+        yw = fBinaryHS(cw,xw)
+#endif
+        return(0)
+End
+
 
 //CH#1
@@ -105 +125 @@
 // based on the wave (array) of parameters that you send it (w)
 //
-Function BinaryHS(w,x) : FitFunc
+Function fBinaryHS(w,x) : FitFunc
         Wave w
         Variable x
@@ -168 +188 @@
 End
 
-Function BinaryHS_PSF11(w,x) : FitFunc
+//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 BinaryHS_PSF11(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+        
+#if exists("BinaryHS_PSF11X")
+        yw = BinaryHS_PSF11X(cw,xw)
+#else
+        yw = fBinaryHS_PSF11(cw,xw)
+#endif
+        return(0)
+End
+
+Function fBinaryHS_PSF11(w,x) : FitFunc
         Wave w
         Variable x
@@ -210 +244 @@
 End
 
-Function BinaryHS_PSF12(w,x) : FitFunc
+//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 BinaryHS_PSF12(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+        
+#if exists("BinaryHS_PSF12X")
+        yw = BinaryHS_PSF12X(cw,xw)
+#else
+        yw = fBinaryHS_PSF12(cw,xw)
+#endif
+        return(0)
+End
+
+Function fBinaryHS_PSF12(w,x) : FitFunc
         Wave w
         Variable x
@@ -252 +300 @@
 End
 
-Function BinaryHS_PSF22(w,x) : FitFunc
+//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 BinaryHS_PSF22(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+        
+#if exists("BinaryHS_PSF22X")
+        yw = BinaryHS_PSF22X(cw,xw)
+#else
+        yw = fBinaryHS_PSF22(cw,xw)
+#endif
+        return(0)
+End
+
+Function fBinaryHS_PSF22(w,x) : FitFunc
         Wave w
         Variable x
@@ -387 +449 @@
 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 fBinaryHS_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 = BinaryHS_Smeared(fs)
+        
+        return (0)
+End
+
 // this is all there is to the smeared calculation!
-Function BinaryHS_Smeared(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
-        ans = Smear_Model_20(BinaryHS,$sq,$qb,$sh,$gQ,w,x)      //CH#4
-
-        return(ans)
-End
+Function BinaryHS_Smeared(s) :FitFunc
+        Struct ResSmearAAOStruct &s
+
+//      the name of your unsmeared model (AAO) is the first argument
+        s.yW = Smear_Model_20(BinaryHS,s.coefW,s.xW,s.resW)
+
+        return(0)
+End
+