Changeset 891 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Jan 28, 2013 5:23:14 PM (10 years ago)

Author:

srkline

Message:

Changes so that the simulation in SASCALC will work well together - it makes sure that the analysis package is loaded if the simulation checkbox is selected.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf (modified) (3 diffs)

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

@@ -166 +166 @@
         
         PlotEC_Empirical(100,0.001,0.7)         // plot an empirical empty cell, only used for the simulation, not needed for SASCALC
-        KillTopGraphAndTable(1)                                 // then kill the graph and table that the macro generates
+//      KillTopGraphAndTable(1)                                 // then kill the graph and table that the macro generates (but the function is in Wrapper, which is often not loaded
+        String topGraph= WinName(0,1)   //this is the topmost graph     
+        String topTable= WinName(0,2)   //this is the topmost table
+        KillWindow $topGraph
+        KillWindow $topTable
+        
         
         //tick labels for SDD slider
@@ -1023 +1028 @@
 //
 // depending on the state of the 2D flag, open the 1d or 2d control panel
+// AND - if doing simulation, check first that the Analysis package is loaded - otheriwse lots of errors
 Function SimCheckProc(CB_Struct) : CheckBoxControl
         STRUCT WMCheckboxAction &CB_Struct
@@ -1028 +1034 @@
 
         if(CB_Struct.checked)
+                if(exists("SANS_ANA_VERSION")!=2)               //if the analysis package is not loaded
+                        // be sure that the SANS Analysis is loaded and compiles
+                        NCNR_AnalysisLoader("Load NCNR Analysis Macros")
+                endif
+                
                 NVAR do2D = root:Packages:NIST:SAS:gDoMonteCarlo