Changeset 405

Timestamp:

Sep 12, 2008 9:42:06 PM (14 years ago)

Author:

ajj

Message:

Updating USANS reduction to use PlotUtilsMacro_v40 from Analysis.

Eventually retire PlotUtils_USANS when this is tested

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• SANS/Analysis/Models/PlotUtilsMacro_v40.ipf (modified) (1 diff)
• USANS/USANS_Includes.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PlotUtilsMacro_v40.ipf

@@ -69 +69 @@
         String w3,w4,w5,n3,n4,n5                        //3 extra waves to load
         SetDataFolder root:             //build sub-folders for each data set under root
-        Variable dQv = root:Packages:NIST:USANS_dQv
+        
+        if (exists("root:Packages:NIST:USANS:Globals:MainPanel:gDQv"))
+                //Running from USANS reduction
+                Variable dQv = root:Packages:NIST:USANS:Globals:MainPanel:gDQv
+        endif
+        if(exists("root:Packages:NIST:USANS_gDQv"))
+                //Running from SANS Analysis
+                Variable dQv = root:Packages:NIST:USANS_gDQv
+        endif
                 
         if (cmpStr(fileStr,"") == 0)

sans/Dev/trunk/NCNR_User_Procedures/USANS/USANS_Includes.ipf

@@ -12 +12 @@
 #include "COR_Graph",version >= 2.20                    
 #include "Main_USANS",version >= 2.20   
-#include "PlotUtilsMacro_v40",version >= 2.20   
+#include "PlotUtilsMacro_v40",version >= 2.20
+#include "NIST_XML_v40"
+#include "USANS_SlitSmearing_v40"       
 #include "WriteUSANSData",version >= 2.20       
 #include "LakeDesmearing_JB",version >= 2.20