Changeset 1078 for sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

Timestamp:

Jan 5, 2018 10:32:55 AM (5 years ago)

Author:

srkline

Message:

more utilities and bug fixes to handle:
(1) generation of DIV files
(2) generation and loading of slit-smeared VSANS data sets

Loading of VSANS data sets and generating the resolution smearing matrix required adding a conditional compile statement to the PlotUtilsMacro? file, to distinguish VSANS data - crudely done now by checking to see that VSANS is defined (which will NOT be the case for a "normal" Analysis experiment. This will need to be revisited in the future.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -360 +360 @@
                                 //$(baseStr+"_res")[][3] = $w0[p]               //Qvalues
                                 dQv = -$w3[0]
+
+//TODO: be sure that this works correctly and can be included in either
+// a VSANS reduction experiment, or a standalone analysis package
+#if (exists("NCNR_VSANS")==6)                   //defined in the main #includes file.
+                                DoAlert 0,"**Treating data as VSANS data**"
+                                Duplicate/O $w3,$(baseStr+"_dQv")                       //save a copy for VSANS
+                                $(baseStr+"_dQv") = -$(baseStr+"_dQv")
+                                V_USANS_CalcWeights(baseStr,dQv)
+#else
+                                DoAlert 0,"Treating data as USANS (normal slit-smeared data)"
+                                USANS_CalcWeights(baseStr,dQv)
+#endif                          
+
                                 
-                                USANS_CalcWeights(baseStr,dQv)
                                 
                         endif