Changeset 516 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models

Timestamp:

Jun 29, 2009 1:51:03 PM (14 years ago)

Author:

srkline

Message:

Fixed bugs introduced in r515 concerning the back-compatibility of the kw=val strings for the
model functions. Now should work correctly when no models are loaded.

Changed integration limits on paracrystal models

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008

Files:

• FCC_ParaCrystal_v40.ipf (modified) (3 diffs)
• SC_ParaCrystal_v40.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf

@@ -33 +33 @@
         Make/O/D/n=(num) xwave_FCC_ParaCrystal, ywave_FCC_ParaCrystal
         xwave_FCC_ParaCrystal =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))
-        Make/O/D coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,6.3e-6,0.0}
+        Make/O/D coef_FCC_ParaCrystal = {1,220,0.05,40,3e-6,6.3e-6,0.0}
         make/o/t parameters_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD sphere (A-2)","SLD solvent (A-2)", "Background (cm-1)"}  
         Edit parameters_FCC_ParaCrystal, coef_FCC_ParaCrystal
@@ -73 +73 @@
         
         // Setup parameter table for model function
-        Make/O/D smear_coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,6.3e-6,0.0}
+        Make/O/D smear_coef_FCC_ParaCrystal = {1,220,0.05,40,3e-6,6.3e-6,0.0}
         make/o/t smear_param_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD sphere (A-2)","SLD solvent (A-2)", "Background (cm-1)"}
         Edit smear_param_FCC_ParaCrystal,smear_coef_FCC_ParaCrystal                                     //display parameters in a table
@@ -108 +108 @@
 #if exists("FCC_ParaCrystalX")
         yw = FCC_ParaCrystalX(cw,xw)
+
+//// to return just Z(q), undo the form factor calculation
+//      Variable latticeScale
+//      latticeScale = 4*(4/3)*pi*(cw[3]^3)/((cw[1]*(2^0.5))^3) 
+//      
+//      yw /= SphereForm_FCC(cw[3],cw[4]-cw[5],xw)*latticeScale
+////    
 #else
         yw = fFCC_ParaCrystal(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/SC_ParaCrystal_v40.ipf

@@ -126 +126 @@
         Variable integral,loLim,upLim
         loLim = 0
-        upLim = 2*Pi
+        upLim = Pi/2
         
         Variable/G root:gDumY=0         //root:gDumX=0
@@ -169 +169 @@
         //
         loLim = 0
-        upLim = Pi
+        upLim = Pi/2
 
         NVAR/Z nord=root:gNordSC
@@ -213 +213 @@
         
         retVal = temp2*SCeval(xx,yy,temp3,temp4,temp5)
-        retVal /=4*Pi
+        retVal *= 2/pi
         
         return(retVal)