Changeset 844 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_MixedDumbbell.ipf

Timestamp:

Mar 6, 2012 5:40:08 PM (11 years ago)

Author:

srkline

Message:

fixed model wave listings to allow save/freeze of the FFT-generated waves.

updated Real-space help file

load/save of FFT matrix buttons on main panel

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_MixedDumbbell.ipf (modified) (11 diffs)

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

@@ -176 +176 @@
 End
 
+
+
+//
 //Function MixTest()
 //
@@ -182 +185 @@
 //      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
 //      
 //      Variable rho1,rho2,rhos,radius1,radius2,ctr,separation,fill1,fill2
@@ -193 +197 @@
 //      separation = radius1 + radius2
 //      
-//      FFT_SolventSLD = trunc(rhos*1e6)                //spits back an integer, maybe not correct
+//      FFT_SolventSLD = trunc(rhos/FFT_delRho)         //spits back an integer, maybe not correct
 //
 //// generate the matrix and erase it
@@ -205 +209 @@
 //// 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)
@@ -212 +216 @@
 //      
 //End
+//
 //
 //Function CoreShellTest()
@@ -219 +224 @@
 //      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
 //      
 //      Variable rho1,rho2,rhos,radius1,radius2,ctr,separation,fill1,fill2
@@ -233 +239 @@
 //      ctr=50
 //      
-//      FFT_SolventSLD = trunc(rhos*1e6)                //spits back an integer, maybe not correct
+//      FFT_SolventSLD = trunc(rhos/FFT_delRho)         //spits back an integer, maybe not correct
 //
 //// generate the matrix and erase it
@@ -245 +251 @@
 //// 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,radius2,ctr,ctr,ctr,fill2)
@@ -259 +265 @@
 //      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
 //      
 //      Variable rcore,rhocore,thick1,rhoshel1,thick2,rhoshel2,thick3,rhoshel3,rhos,fill1,fill2,fill3,fillc,ctr
@@ -277 +284 @@
 ////    rhos += 3e-6
 //              
-//      FFT_SolventSLD = trunc(rhos*1e6)                //spits back an integer, maybe not correct
+//      FFT_SolventSLD = trunc(rhos/FFT_delRho)         //spits back an integer, maybe not correct
 //
 //// generate the matrix and erase it
@@ -289 +296 @@
 //// with the input parameters, build the structure
 //      ctr = trunc(FFT_N/2)
-//      fillc = trunc(rhocore*1e6)
-//      fill1 = trunc(rhoshel1*1e6)
-//      fill2 = trunc(rhoshel2*1e6)
-//      fill3 = trunc(rhoshel3*1e6)
+//      fillc = trunc(rhocore/FFT_delRho)
+//      fill1 = trunc(rhoshel1/FFT_delRho)
+//      fill2 = trunc(rhoshel2/FFT_delRho)
+//      fill3 = trunc(rhoshel3/FFT_delRho)
 //      
 //      FillSphereRadius(m,FFT_T,rcore+thick1+thick2+thick3,ctr,ctr,ctr,fill3)          //outer size (shell 3)