Changeset 169

Timestamp:

Sep 27, 2007 1:45:22 PM (15 years ago)

Author:

srkline

Message:

Changed macros in models that plot distributions, Rg, I(0), etc. to look for the coef_ wave, and abort if it cannot be found. The user is advised to plot the unsmeared model to use with the extra macros. This is the easy way out. There may be a way to guess what other valid coefficient waves exist, but that would be cumbersome and possibly require user intervention as well.

Location:

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

Files:

• NewModels_2006/BimodalSchulzSpheres.ipf (modified) (2 diffs)
• NewModels_2006/BinaryHardSpheres.ipf (modified) (4 diffs)
• NewModels_2006/Fractal.ipf (modified) (1 diff)
• NewModels_2006/GaussSpheres.ipf (modified) (2 diffs)
• NewModels_2006/LogNormalSphere.ipf (modified) (2 diffs)
• NewModels_2006/SchulzSpheres.ipf (modified) (2 diffs)
• NewModels_2006/Vesicle_UL.ipf (modified) (1 diff)
• Packages/ModelPicker/SANSModelPicker.ipf (modified) (1 diff)

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

@@ -83 +83 @@
         Variable nden1,nden2,phi1,phi2,R1,R2,Ravg,p1,p2,Rg1,Rg2,I1_0,I2_0,I0,Sv1,Sv2,Sv,vpoly1,vpoly2
         Variable z1,z2,v2poly1,v2poly2
-        if(WaveExists(coef_bss)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        
+        if(Exists("coef_bss")!=1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         
@@ -143 +144 @@
         variable p1,p2,r1,r2,z1,z2,phi1,phi2,f1,f2,nden1,nden2,vpoly1,vpoly2,maxr
         
-        if(WaveExists(coef_bss)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        if(Exists("coef_bss")!=1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         phi1 = coef_bss[0]  // volume fraction, mode 1

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

@@ -492 +492 @@
 Macro Plot_BinaryHS_PSF()
 
-        if(WaveExists(coef_BinaryHS)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        if(Exists("coef_BinaryHS") != 1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         
         Make/O/D/n=(numpnts(xwave_BinaryHS)) psf11_BinaryHS,psf12_BinaryHS,psf22_BinaryHS,QD2_BinaryHS
 
-        psf11_BinaryHS := BinaryHS_psf11(coef_BinaryHS, xwave_BinaryHS)
-        psf12_BinaryHS := BinaryHS_psf12(coef_BinaryHS, xwave_BinaryHS)
-        psf22_BinaryHS := BinaryHS_psf22(coef_BinaryHS, xwave_BinaryHS)
+        Variable/G root:g_psf11,root:g_psf12,root:g_psf22,root:g_QD2
+        
+        g_psf11 := BinaryHS_psf11(coef_BinaryHS, psf11_BinaryHS, xwave_BinaryHS)
+        g_psf12 := BinaryHS_psf12(coef_BinaryHS, psf12_BinaryHS, xwave_BinaryHS)
+        g_psf22 := BinaryHS_psf22(coef_BinaryHS, psf22_BinaryHS, xwave_BinaryHS)
         QD2_BinaryHS := xwave_BinaryHS*coef_BinaryHS[0]*2
 //      Display psf11_BinaryHS vs xwave_BinaryHS
@@ -538 +540 @@
         Print "Radius (smaller) = ",r1
         
+        if(Exists("coef_BinaryHS") != 1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
+        Endif
+        
         coef_BinaryHS[2] = phi2
         coef_BinaryHS[3] = phi1
@@ -543 +549 @@
 End
 
+
 //calculates number fractions of each population based on the 
 //coef_BinaryHS parameters
@@ -548 +555 @@
 
         if(exists("coef_BinaryHS") != 1)
-                Abort "You must plot the BHS model first to create the coefficient wave"
+                Abort "You must plot the unsmeared BHS model first to create the coefficient wave"
         endif
         Variable r1,r2,phi1,phi2,aa     //same notation as paper - r2 is LARGER

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

@@ -77 +77 @@
         Variable nden,phi,r0,Df,corr,s0,vpoly,i0,rg
         
-        if(WaveExists(coef_fra)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        if(Exists("coef_fra")!=1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         

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

@@ -219 +219 @@
         Variable nden,vpoly,Ravg,p,Rg,I0,Sv,phi
         
-        if(WaveExists(coef_pgs)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        if(Exists("coef_pgs")!=1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         Ravg = coef_pgs[1]  // mean radius (A)
@@ -250 +250 @@
         variable pd,avg,zz,maxr
         
-        if(WaveExists(coef_pgs)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        if(Exists("coef_pgs")!=1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         pd=coef_pgs[2]

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

@@ -238 +238 @@
         Variable nden,r3,rg,sv,i0,ravg,rpk
         
-        if(Exists("coef_lns")==0)
+        if(Exists("coef_lns")!=1)
                 abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
@@ -269 +269 @@
         variable sig,mu,maxr
         
-        if(Exists("coef_lns")==0)
+        if(Exists("coef_lns")!=1)
                 abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif

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

@@ -230 +230 @@
         Variable nden,zz,zp1,zp2,zp3,zp4,zp5,zp6,zp7,zp8,vpoly,v2poly,rg,sv,i0
         
-        if(WaveExists(coef_sch)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        if(Exists("coef_sch")!=1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         
@@ -269 +269 @@
         variable pd,avg,zz,maxr
         
-        if(WaveExists(coef_sch)==0)
-                abort "You need to plot the model first to create the coefficient table"
+        if(Exists("coef_sch")!=1)
+                abort "You need to plot the unsmeared model first to create the coefficient table"
         Endif
         pd=coef_sch[2]

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

@@ -193 +193 @@
         Variable phi
         
-        if(WaveExists(coef_vesicle)==0)
-                abort "You need to plot the vesicle model first to create the coefficient table"
+        if(Exists("coef_vesicle")!=1)
+                abort "You need to plot the unsmeared vesicle model first to create the coefficient table"
         Endif
         totvol=4*pi/3*(coef_vesicle[1]+coef_vesicle[2])^3

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/ModelPicker/SANSModelPicker.ipf

@@ -593 +593 @@
 //      list += MacroList("LoadO*",sep,"KIND:1,NPARAMS:0")              //data loader
         list += "Load SANS or USANS Data;"              //use the wrapper above to get the right loader
-        list += "Reset Resolution Waves;"               // resets the resolution waves used for the calculations
-        list += "Freeze Model;"                                         // freeze a model to compare plots on the same graph
+//      list += "Reset Resolution Waves;"               // resets the resolution waves used for the calculations
+//      list += "Freeze Model;"                                         // freeze a model to compare plots on the same graph
         list += MacroList("WriteM*",sep,"KIND:1,NPARAMS:4")             //data writer
         list += "-"+sep