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

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

@@ -28 +28 @@
         make/o/t parameters_cypl = {"scale","radius (A)","length (A)","polydispersity of Length","SLD diff (A^-2)","incoh. bkg (cm^-1)"}
         Edit parameters_cypl,coef_cypl
-        ywave_cypl := Cyl_PolyLength(coef_cypl,xwave_cypl)
+        
+        Variable/G root:g_cypl
+        g_cypl := Cyl_PolyLength(coef_cypl,ywave_cypl,xwave_cypl)
         Display ywave_cypl vs xwave_cypl
         ModifyGraph log=1,marker=29,msize=2,mode=4
@@ -36 +38 @@
 End
 
-// plot the smeared version - quite slow - use only for final fit
-Proc PlotSmearedCyl_PolyLength()        
-        //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 PlotSmearedCyl_PolyLength(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
@@ -53 +57 @@
         // 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_cypl,smeared_qvals
+        Duplicate/O $(str+"_q") smeared_cypl,smeared_qvals
         SetScale d,0,0,"1/cm",smeared_cypl      
-
-        smeared_cypl := SmearedCyl_PolyLength(smear_coef_cypl,$gQvals)
+                                        
+        Variable/G gs_cypl=0
+        gs_cypl := fSmearedCyl_PolyLength(smear_coef_cypl,smeared_cypl,smeared_qvals)   //this wrapper fills the STRUCT
+        
         Display smeared_cypl vs smeared_qvals
         ModifyGraph log=1,marker=29,msize=2,mode=4
@@ -62 +68 @@
         Label left "Intensity (cm\\S-1\\M)"
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
+        
+        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 Cyl_PolyLength(cw,yw,xw) : FitFunc
+        Wave cw,yw,xw
+        
+#if exists("Cyl_PolyLengthX")
+        yw = Cyl_PolyLengthX(cw,xw)
+#else
+        yw = fCyl_PolyLength(cw,xw)
+#endif
+        return(0)
 End
 
@@ -67 +91 @@
 // both integrals are done using quadrature, although both may benefit from an
 // adaptive integration
-Function Cyl_PolyLength(w,x)  : FitFunc
+Function fCyl_PolyLength(w,x)  : FitFunc
         Wave w
         Variable x
@@ -182 +206 @@
         kp[4] = 0               //bkg fixed at 0
         
-        Pq = CylinderForm(kp,qw)
-        //Pq = CylinderFit(kp,qw)       //from the XOP
+#if exists("CylinderFormX")
+        Pq = CylinderFormX(kp,qw)
+#else
+        Pq = fCylinderForm(kp,qw)
+#endif
         
         // undo the normalization that CylinderForm does
@@ -208 +235 @@
 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 fSmearedCyl_PolyLength(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 = SmearedCyl_PolyLength(fs)
+        
+        return (0)
+End
+
 // this is all there is to the smeared calculation!
-Function SmearedCyl_PolyLength(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(Cyl_PolyLength,$sq,$qb,$sh,$gQ,w,x)
-
-        return(ans)
-End
+Function SmearedCyl_PolyLength(s) :FitFunc
+        Struct ResSmearAAOStruct &s
+
+//      the name of your unsmeared model (AAO) is the first argument
+        s.yW = Smear_Model_20(Cyl_PolyLength,s.coefW,s.xW,s.resW)
+
+        return(0)
+End
+