Changeset 836 for sans/Dev/trunk/NCNR_Igor_Procedures

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_Igor_Procedures/NCNR_Package_Loader.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_Igor_Procedures/NCNR_Package_Loader.ipf

@@ -35 +35 @@
 //      "Load Batch Fitting",Execute/P "INSERTINCLUDE \"Auto_Fit\"";Execute/P "COMPILEPROCEDURES ";Execute/P "InitializeAutoFitPanel()"
 
-        "Load Real Space Modeling - Beta",Execute/P "INSERTINCLUDE \"FFT_Cubes_Includes\"";Execute/P "INSERTINCLUDE \"FFT_Fit_Includes\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Init_FFT()"
+        "Load Real Space Modeling - Beta",RealSpaceLoader()
         "-"
 
@@ -417 +417 @@
         return(0)
 End
+
+// loads all of the FFT procedures and the fit functions too
+Function RealSpaceLoader()
+
+        // be sure that the SANS Analysis is loaded and compiles
+        NCNR_AnalysisLoader("Load NCNR Analysis Macros")
+        
+        // then the FFT files
+        Execute/P "INSERTINCLUDE \"FFT_Cubes_Includes\""
+        Execute/P "INSERTINCLUDE \"FFT_Fit_Includes\""
+        Execute/P "COMPILEPROCEDURES "
+        Execute/P "Init_FFT()"
+        
+        BuildMenu "Macros"
+
+        return(0)
+End