Changeset 843 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha

Timestamp:

Mar 2, 2012 10:56:30 AM (11 years ago)

Author:

srkline

Message:

Corrected the FFT fit functions to use the 10^{-7 multiplier for the SLD. Included the MixedDumbbell? model to the included model list. Tested all of the functions.}

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker

Files:

• FFT_Fit_Cylinder.ipf (modified) (2 diffs)
• FFT_Fit_Includes.ipf (modified) (1 diff)
• FFT_Fit_MixedDumbbell.ipf (modified) (2 diffs)
• FFT_Fit_Sphere.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_Cylinder.ipf

@@ -97 +97 @@
         NVAR FFT_N = root:FFT_N
         NVAR FFT_SolventSLD = root:FFT_SolventSLD
+        NVAR FFT_delRho = root:FFT_delRho               //the SLD multiplier, should have been initialized to 1e-7
         
-        FFT_SolventSLD = trunc(sldSolv*1e6)             //spits back an integer, maybe not correct
+        FFT_SolventSLD = trunc(sldSolv/FFT_delRho)              //spits back an integer, maybe not correct
 
 // generate the matrix and erase it
@@ -110 +111 @@
 // with the input parameters, build the structure
         ctr = trunc(FFT_N/2)
-        fill = trunc(sldCyl*1e6)
+        fill = trunc(sldCyl/FFT_delRho)
         
         FillXCylinder(m,FFT_T,radius,ctr,ctr,ctr,length,fill)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_Includes.ipf

@@ -5 +5 @@
 #include "FFT_Fit_Sphere"
 #include "FFT_Fit_Cylinder"
+#include "FFT_Fit_MixedDumbbell"
 
 //K. Rubinson

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_MixedDumbbell.ipf

@@ -97 +97 @@
         NVAR FFT_N = root:FFT_N
         NVAR FFT_SolventSLD = root:FFT_SolventSLD
-        
-        FFT_SolventSLD = trunc(rhos*1e6)                //spits back an integer, maybe not correct
+        NVAR FFT_delRho = root:FFT_delRho               //the SLD multiplier, should have been initialized to 1e-7
+
+        
+        FFT_SolventSLD = trunc(rhos/FFT_delRho)         //spits back an integer, maybe not correct
 
 // generate the matrix and erase it
@@ -110 +112 @@
 // with the input parameters, build the structure
         ctr = trunc(FFT_N/2)
-        fill1 = trunc(rho1*1e6)
-        fill2 = trunc(rho2*1e6)
+        fill1 = trunc(rho1/FFT_delRho)
+        fill2 = trunc(rho2/FFT_delRho)
         
         FillSphereRadius(m,FFT_T,radius1,ctr,ctr,ctr,fill1)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_Sphere.ipf

@@ -96 +96 @@
         NVAR FFT_N = root:FFT_N
         NVAR FFT_SolventSLD = root:FFT_SolventSLD
+        NVAR FFT_delRho = root:FFT_delRho               //the SLD multiplier, should have been initialized to 1e-7
         
-        FFT_SolventSLD = trunc(sldSolv*1e6)             //spits back an integer, maybe not correct
+        FFT_SolventSLD = trunc(sldSolv/FFT_delRho)              //spits back an integer, maybe not correct
 
 // generate the matrix and erase it
@@ -109 +110 @@
 // with the input parameters, build the structure
         ctr = trunc(FFT_N/2)
-        fill = trunc(sldSph*1e6)
+        fill = trunc(sldSph/FFT_delRho)
         
         err = FillSphereRadiusNoOverlap(m,grid,radius,ctr,ctr,ctr,fill)