Changeset 836 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Cylinder_Fills.ipf

Timestamp:

Feb 17, 2012 12:04:13 PM (11 years ago)

Author:

srkline

Message:

changes to FFT routines to clean things up for a beta release at the next startup. No functionality changes, just cleaning up the operation, interface, and menu items.

Some important changes to the polarization routines. New equations for calculating the coefficient matrix. Now appears to be correct. Also, proper proportions are used when adding multiple files together to the matrix.

Change to the Model Docs is an updated reference.

WorkFileUtils? was broken when I changed to use linear_data exclusively. This has now been fixed and it operates as expected.

PackageLoader? now has menu items (under Macros) for the Polarization routines. These may later be moved to the SANS menu.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Cylinder_Fills.ipf (modified) (2 diffs)

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

@@ -5 +5 @@
 // most is still being worked out and verified in 2D
 //
+/// search for "crude core-shell cylinder" for an example of how this can be done
+// -- maybe the same filling, but no mat=0 (ask)
 
 
@@ -11 +13 @@
 //process of calculating a series of configurations.
 
-
-
-Proc ConnectDots3D(maxNumConn)
-        Variable maxNumConn=1
+        
+Proc ConnectDots3D(w,np,maxNumConn,sobol)
+        String w="mat"
+        Variable np=100,maxNumConn=2,sobol=1
+        Prompt w,"matrix"
+        Prompt np,"number of points"
+        prompt maxNumConn,"number of connections per point"
+        Prompt sobol,"1=Sobol, 0=random"
+        
+        $w=0
+
+        if(sobol)
+                SobolFill3DMat($w,np)
+        else
+                RandomFill3DMat($w,np)
+        endif
+        
+        ParseMatrix3DToXYZ(w)
         
         Variable num=numpnts(x3d)