Changeset 1175 for sans

Timestamp:

Jun 28, 2019 3:30:37 PM (4 years ago)

Author:

krzywon

Message:

Lay ground work for writing VSANS reduced data in the NXcanSAS format.

Location:

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS

Files:

• VSANS_Includes.ipf (modified) (2 diffs)
• V_VSANS_Preferences.ipf (modified) (2 diffs)
• V_Write_VSANS_NXcanSAS.ipf (added)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/VSANS_Includes.ipf

@@ -17 +17 @@
 #include "GaussUtils_v40"
 #include "NIST_XML_v40"
+#include "NIST_NXcanSAS_v709"
 #include "USANS_SlitSmearing_v40"
 
@@ -62 +63 @@
 #include "V_HDF5_Write"
 #include "V_HDF5_RW_Utils"
+#include "V_Write_VSANS_NXcanSAS"
 
 // start of VSANS reduction procedures

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/V_VSANS_Preferences.ipf

@@ -46 +46 @@
         val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gXML_Write", 0 )
         Variable/G root:Packages:NIST:VSANS:Globals:gXML_Write = val
-        
+        val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gNXcanSAS_Write", 0 )
+        Variable/G root:Packages:NIST:VSANS:Globals:gNXcanSAS_Write = val
         
         // VSANS tab
@@ -263 +264 @@
         
 //on tab(0) - General
-        CheckBox PrefCtrl_0a,pos={21,96},size={124,14},proc=V_XMLWritePref,title="Use canSAS XML Output"
-        CheckBox PrefCtrl_0a,help={"Checking this will set the default output format to be canSAS XML rather than NIST 6 column"}
-        CheckBox PrefCtrl_0a,value= root:Packages:NIST:VSANS:Globals:gXML_Write
-
-        CheckBox PrefCtrl_0a,disable=1
-
+        CheckBox PrefCtrl_0,pos={21,100},size={124,14},proc=WritePref,title="Use ASCII 6-column Output (default)",mode=1
+        CheckBox PrefCtrl_0,help={"Checking this will set the default output to the NIST 6 column format"}
+        CheckBox PrefCtrl_0,value= root:Packages:NIST:gASCII_Write
+        CheckBox PrefCtrl_0a,pos={21,120},size={124,14},proc=WritePref,title="Use canSAS XML Output",mode=1
+        CheckBox PrefCtrl_0a,help={"Checking this will set the default output to be canSAS XML format"}
+        CheckBox PrefCtrl_0a,value= root:Packages:NIST:gXML_Write
+        CheckBox PrefCtrl_0b,pos={21,140},size={124,14},proc=WritePref,title="Use NXcanSAS HDF5 Output",mode=1
+        CheckBox PrefCtrl_0b,help={"Checking this will set the default output to be NXcanSAS HDF5 format"}
+        CheckBox PrefCtrl_0b,value= root:Packages:NIST:gNXcanSAS_Write
 
 //on tab(1) - VSANS - initially visible