Changeset 905

Timestamp:

Apr 16, 2013 10:06:25 AM (9 years ago)

Author:

srkline

Message:

for the distribution to NGB (bug fix for the attenuator FP value from ICE) -- the simulation menu has been turned off, and some of the new items on the Macros menu. These will be re-instated later for a full release.

Location:

sans/Dev/trunk

Files:

• NCNR_Igor_Procedures/NCNR_Package_Loader.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Reduction/SANS/MC_SimulationScripting.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_Igor_Procedures/NCNR_Package_Loader.ipf

@@ -30 +30 @@
                 StrVarOrDefault("root:Packages:NCNRItemStr2c","Load ILL SANS Reduction Macros"), NCNR_SANSReductionLoader(StrVarOrDefault("root:Packages:NCNRItemStr2c","Load ILL SANS Reduction Macros"))
                 StrVarOrDefault("root:Packages:NCNRItemStr2d","Load HFIR SANS Reduction Macros"), NCNR_SANSReductionLoader(StrVarOrDefault("root:Packages:NCNRItemStr2d","Load HFIR SANS Reduction Macros"))
-                StrVarOrDefault("root:Packages:NCNRItemStr2e","Load HANARO SANS Reduction Macros"), NCNR_SANSReductionLoader(StrVarOrDefault("root:Packages:NCNRItemStr2e","Load HANARO SANS Reduction Macros"))
+//              StrVarOrDefault("root:Packages:NCNRItemStr2e","Load HANARO SANS Reduction Macros"), NCNR_SANSReductionLoader(StrVarOrDefault("root:Packages:NCNRItemStr2e","Load HANARO SANS Reduction Macros"))
 //              StrVarOrDefault("root:Packages:NCNRItemStr2b","-"), NCNR_SANSReductionLoader(StrVarOrDefault("root:Packages:NCNRItemStr2b","-"))        
         End
@@ -179 +179 @@
                         
                 case "Load QUOKKA SANS Reduction Macros":
-                Print "QUOKKA macros not in SVN yet - NCNR macros loaded instead"
+                        DoAlert 0, "QUOKKA macros not in SVN yet - NCNR macros loaded instead"
                         Execute/P "INSERTINCLUDE \"Includes_v520\""
 //                      Execute/P "INSERTINCLUDE \"QKK_Includes_ANSTO\""

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MC_SimulationScripting.ipf

@@ -105 +105 @@
 // -- scattering from an empty cell is NOT provided in 2D
 
-Menu "Macros"
+xMenu "Macros"
         Submenu "Simulation Scripting - Beta"
                 "Save Configuration",Sim_saveConfProc()