Changeset 595 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/CSParallelepiped_v40.ipf

Timestamp:

Nov 4, 2009 2:21:47 PM (13 years ago)

Author:

srkline

Message:

XOPs added for CSParallelepiped, not for fractal_polysphere

Removed garbage from function popup list in SumSANSModels (changing the common filter function in PlotUtilsMacro?)

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/CSParallelepiped_v40.ipf (modified) (11 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/CSParallelepiped_v40.ipf

@@ -30 +30 @@
 //needed to calculate the model function.
 //
-Proc PlotCSParallpiped(num,qmin,qmax)
+Proc PlotCSParallelepiped(num,qmin,qmax)
         Variable num=100, qmin=.001, qmax=.7
         Prompt num "Enter number of data points for model: "
@@ -36 +36 @@
         Prompt qmax "Enter maximum q-value (A^1) for model: "
         //
-        Make/O/D/n=(num) xwave_CSParallpiped, ywave_CSParallpiped
-        xwave_CSParallpiped =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))
-        Make/O/D coef_CSParallpiped = {1,35,75,400,10,10,10,2e-6,4e-6,2e-6,-1e-6,6e-6,0.06}                     //CH#2
-        make/o/t parameters_CSParallpiped = {"Scale Factor","Shortest Edge A (A)","B (A)","Longest Edge C (A)","Rim A ()", "Rim B ()","Rim C ()", "SLD A(A^-2)", "SLD B(A^-2)", "SLD C(A^-2)", "SLD P(A^-2)", "SLD Solv(A^-2)", "Incoherent Bgd (cm-1)"}        //CH#3
-        Edit parameters_CSParallpiped, coef_CSParallpiped
-        
-        Variable/G root:g_CSParallpiped
-        g_CSParallpiped := CSParallpiped(coef_CSParallpiped,ywave_CSParallpiped, xwave_CSParallpiped)
-        Display ywave_CSParallpiped vs xwave_CSParallpiped
+        Make/O/D/n=(num) xwave_CSPP, ywave_CSPP
+        xwave_CSPP =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))
+        Make/O/D coef_CSPP = {1,35,75,400,10,10,10,2e-6,4e-6,2e-6,1e-6,6e-6,0.06}                       //CH#2
+        make/o/t parameters_CSPP = {"Scale Factor","Shortest Edge A (A)","B (A)","Longest Edge C (A)","Rim A ()", "Rim B ()","Rim C ()", "SLD A(A^-2)", "SLD B(A^-2)", "SLD C(A^-2)", "SLD P(A^-2)", "SLD Solv(A^-2)", "Incoherent Bgd (cm-1)"} //CH#3
+        Edit parameters_CSPP, coef_CSPP
+        
+        Variable/G root:g_CSPP
+        g_CSPP := CSParallelepiped(coef_CSPP,ywave_CSPP, xwave_CSPP)
+        Display ywave_CSPP vs xwave_CSPP
         ModifyGraph marker=29, msize=2, mode=4
         ModifyGraph log=1
@@ -51 +51 @@
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
         
-        AddModelToStrings("CSParallpiped","coef_CSParallpiped","parameters_CSParallpiped","CSParallpiped")
+        AddModelToStrings("CSParallelepiped","coef_CSPP","parameters_CSPP","CSPP")
 //
 End
@@ -62 +62 @@
 // from the experimental data read in from an AVE/QSIG data file
 ////////////////////////////////////////////////////
-Proc PlotSmearedCSParallpiped(str)
+Proc PlotSmearedCSParallelepiped(str)
         String str
         Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4)
@@ -74 +74 @@
         
         // Setup parameter table for model function
-        Make/O/D smear_coef_CSParallpiped = {1,35,75,400,10,10,10,2e-6,4e-6,2e-6,-1e-6,6e-6,0.06}               //CH#4
-        make/o/t smear_parameters_CSParallpiped = {"Scale Factor","Shortest Edge A (A)","B (A)","Longest Edge C (A)","Rim A ()", "Rim B ()","Rim C ()", "SLD A(A^-2)", "SLD B(A^-2)", "SLD C(A^-2)", "SLD P(A^-2)", "SLD Solv(A^-2)", "Incoherent Bgd (cm-1)"}
-        Edit smear_parameters_CSParallpiped,smear_coef_CSParallpiped                                    //display parameters in a table
+        Make/O/D smear_coef_CSPP = {1,35,75,400,10,10,10,2e-6,4e-6,2e-6,1e-6,6e-6,0.06}         //CH#4
+        make/o/t smear_parameters_CSPP = {"Scale Factor","Shortest Edge A (A)","B (A)","Longest Edge C (A)","Rim A ()", "Rim B ()","Rim C ()", "SLD A(A^-2)", "SLD B(A^-2)", "SLD C(A^-2)", "SLD P(A^-2)", "SLD Solv(A^-2)", "Incoherent Bgd (cm-1)"}
+        Edit smear_parameters_CSPP,smear_coef_CSPP                                      //display parameters in a table
         
         // output smeared intensity wave, dimensions are identical to experimental QSIG values
         // make extra copy of experimental q-values for easy plotting
-        Duplicate/O $(str+"_q") smeared_CSParallpiped,smeared_qvals                             //
-        SetScale d,0,0,"1/cm",smeared_CSParallpiped                                                     //
-
-        Variable/G gs_CSParallpiped=0
-        gs_CSParallpiped := fSmearedCSParallpiped(smear_coef_CSParallpiped,smeared_CSParallpiped,smeared_qvals) //this wrapper fills the STRUCT
-        
-        Display smeared_CSParallpiped vs smeared_qvals                                                                  //
+        Duplicate/O $(str+"_q") smeared_CSPP,smeared_qvals                              //
+        SetScale d,0,0,"1/cm",smeared_CSPP                                                      //
+
+        Variable/G gs_CSPP=0
+        gs_CSPP := fSmearedCSParallelepiped(smear_coef_CSPP,smeared_CSPP,smeared_qvals) //this wrapper fills the STRUCT
+        
+        Display smeared_CSPP vs smeared_qvals                                                                   //
         ModifyGraph log=1,marker=29,msize=2,mode=4
         Label bottom "q (A\\S-1\\M)"
@@ -93 +93 @@
 
         SetDataFolder root:
-        AddModelToStrings("SmearedCSParallpiped","smear_coef_CSParallpiped","smear_parameters_CSParallpiped","CSParallpiped")
-End
-
-Function CSParallpiped(cw,yw,xw) : FitFunc
+        AddModelToStrings("SmearedCSParallelepiped","smear_coef_CSPP","smear_parameters_CSPP","CSPP")
+End
+
+Function CSParallelepiped(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
         
-#if exists("CSParallpipedX")
-        yw = CSParallpipedX(cw,xw)
+#if exists("CSParallelepipedX")
+        yw = CSParallelepipedX(cw,xw)
 #else
-        yw = fCSParallpiped(cw,xw)
+        yw = fCSParallelepiped(cw,xw)
 #endif
         return(0)
@@ -111 +111 @@
 // - a double integral - choose points wisely
 //
-Function fCSParallpiped(w,x) : FitFunc
+Function fCSParallelepiped(w,x) : FitFunc
         Wave w
         Variable x
@@ -141 +141 @@
         rhoC=w[9]    //rim C SLD
         rhoP = w[10]   //Parallelpiped core SLD
-       rhosolv=w[11]  // Solvent SLD
-         bkg = w[12]
+   rhosolv=w[11]  // Solvent SLD
+   bkg = w[12]
         
 //      mu = bb*x               //scale in terms of B
@@ -268 +268 @@
         retval =( dr0*t1*t2*Vin + drA*(t3-t1)*t2*V1+ drB*t1*(t4-t2)*V2 )*( dr0*t1*t2*Vin + drA*(t3-t1)*t2*V1+ drB*t1*(t4-t2)*V2 )   //  correct FF : square of sum of phase factors
 //      retval =t1*t2* dr0*dr0*Vin*Vin    //*( dr0*t1*t2*Vin )   //test case of original PP with no rims
-        return(retVal); 
+        return(retVal) 
 End
 
 
 // this is all there is to the smeared calculation!
-Function fSmearedCSParallpiped(coefW,yW,xW)
+Function fSmearedCSParallelepiped(coefW,yW,xW)
         Wave coefW,yW,xW
         
@@ -288 +288 @@
         
         Variable err
-        err = SmearedCSParallpiped(fs)
+        err = SmearedCSParallelepiped(fs)
         
         return (0)
@@ -294 +294 @@
 
 // this is all there is to the smeared calculation!
-Function SmearedCSParallpiped(s) :FitFunc
+Function SmearedCSParallelepiped(s) :FitFunc
         Struct ResSmearAAOStruct &s
 
 //      the name of your unsmeared model (AAO) is the first argument
-        Smear_Model_20(CSParallpiped,s.coefW,s.xW,s.yW,s.resW)
+        Smear_Model_20(CSParallelepiped,s.coefW,s.xW,s.yW,s.resW)
 
         return(0)