Changeset 828

Timestamp:

Aug 16, 2011 1:20:14 PM (11 years ago)

Author:

srkline

Message:

adding some loaders to the macros menu - strictly for testing so that some of the newest procedures can be easily tested.

Location:

sans/Dev/trunk

Files:

• NCNR_Igor_Procedures/NCNR_Package_Loader.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Analysis/Alpha/Auto_Fit.ipf (modified) (1 diff)
• NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Cubes_Includes.ipf (modified) (1 diff)
• NCNR_User_Procedures/Common/GaussUtils_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_Igor_Procedures/NCNR_Package_Loader.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion=6.1
-//#pragma IndependentModule=NCNRLoader          //can't seem to get this to work properly...
 
 // load/unload courtesy of Jan Ilavsky
@@ -29 +28 @@
         StrVarOrDefault("root:Packages:NCNRItemStr4a","Load NCNR SANS Live Data"), NCNR_SANSLiveLoader(StrVarOrDefault("root:Packages:NCNRItemStr4a","Load NCNR SANS Live Data"))
         StrVarOrDefault("root:Packages:NCNRItemStr4b","-"), NCNR_SANSLiveLoader(StrVarOrDefault("root:Packages:NCNRItemStr4b","-"))
+
+        // for testing ONLY
+        "-"
+        "Load Polarization Reduction",Execute/P "INSERTINCLUDE \"Include_Polarization\"";Execute/P "COMPILEPROCEDURES "
+
+        "Load Batch Fitting",Execute/P "INSERTINCLUDE \"Auto_Fit\"";Execute/P "COMPILEPROCEDURES ";Execute/P "InitializeAutoFitPanel()"
+
+        "Load Real Space Modeling",Execute/P "INSERTINCLUDE \"FFT_Cubes_Includes\"";Execute/P "INSERTINCLUDE \"FFT_Fit_Includes\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Init_FFT()"
+        "-"
+
 end
 

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Auto_Fit.ipf

@@ -1397 +1397 @@
 // List utilities
 //*********************
-Function List2TextWave(list,sep,waveStr)
+//
+// List2TextWave is also in SANS_Utilities.ipf, but to keep from having big lists of dependencies,
+// have definitions here that are local and Static
+
+//
+Static Function List2TextWave(list,sep,waveStr)
         String list,sep,waveStr
         

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

@@ -33 +33 @@
                 "ParseMatrix 3D to XYZ"
                 "Plot XYZ"
-                "AnimatedS Slices"
+                "Animated Slices"
                 "Show Full Matrix"
         end

sans/Dev/trunk/NCNR_User_Procedures/Common/GaussUtils_v40.ipf

@@ -774 +774 @@
 //       to an integral of 1. This "truncated" gaussian was a somewhat better approximation
 //       to the triangular resolution function. Here, I integrate to +/- 3 sigma and
-//       do not renormalize the integral to 1. Hence the smeared calculation is 0.27% low.
-//       This is easily seen by smearing a constant value.
+//       now correctly renormalize the integral to 1. Hence the smeared calculation in the past was 0.27% low.
+//       Confimation of the integral is easily seen by smearing a constant value.
 //
 // Using 5 quadrature points is not recommended, as it doesn't normalize properly using .9973