Changeset 835 for sans/Dev/trunk/NCNR_Igor_Procedures/NCNR_Package_Loader.ipf

Timestamp:

Feb 6, 2012 12:19:28 PM (11 years ago)

Author:

srkline

Message:

moving the Polarization routines to a temporary "beta" menu location on the macros menu, numbering the panels.

Created a loader for the polarization routines that will load the SANS reduction if needed.

File:

• sans/Dev/trunk/NCNR_Igor_Procedures/NCNR_Package_Loader.ipf (modified) (7 diffs)

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 IgorVersion=6.2
 
 // load/unload courtesy of Jan Ilavsky
@@ -31 +31 @@
         // 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()"
+        "Load Polarization Reduction - Beta",PolarizationLoader()
+
+//      "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()"
         "-"
 
@@ -43 +43 @@
         String itemStr
                 
-        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.1)
-                Abort "Your version of Igor is lower than 6.1, these macros need version 6.1 or higher.... "
+        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.2)
+                Abort "Your version of Igor is lower than 6.2, these macros need version 6.2 or higher.... "
         endif
         
@@ -127 +127 @@
         String itemStr
         
-        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.1)
-                Abort "Your version of Igor is lower than 6.1, these macros need version 6.1 or higher.... "
+        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.2)
+                Abort "Your version of Igor is lower than 6.2, these macros need version 6.2 or higher.... "
         endif
         
@@ -198 +198 @@
         String itemStr
         
-        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.1)
-                Abort "Your version of Igor is lower than 6.1, these macros need version 6.1 or higher.... "
+        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.2)
+                Abort "Your version of Igor is lower than 6.2, these macros need version 6.2 or higher.... "
         endif
         
@@ -283 +283 @@
         String itemStr
         
-        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.1)
-                Abort "Your version of Igor is lower than 6.1, these macros need version 6.1 or higher.... "
+        if (str2num(stringByKey("IGORVERS",IgorInfo(0))) < 6.2)
+                Abort "Your version of Igor is lower than 6.2, these macros need version 6.2 or higher.... "
         endif
         
@@ -405 +405 @@
         SetIgorOption poundUnDefine=ILL_D22
 End
+
+Function PolarizationLoader()
+
+        // be sure that the SANS reduction is loaded and compiles
+        NCNR_SANSReductionLoader("Load NCNR SANS Reduction Macros")
+        
+        // then the polarization
+        Execute/P "INSERTINCLUDE \"Include_Polarization\"";Execute/P "COMPILEPROCEDURES "
+        BuildMenu "Macros"
+
+        return(0)
+End