Changeset 1158 for sans/Dev/nxcansas_writer/NCNR_User_Procedures

Timestamp:

Jun 4, 2019 3:17:26 PM (4 years ago)

Author:

krzywon

Message:

 

Location:

sans/Dev/nxcansas_writer

Files:

• . (copied) (copied from sans/Dev/trunk)
• NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf (modified) (2 diffs)

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

@@ -1473 +1473 @@
 End
 
+Function NXWritePref(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+        
+        NVAR gVal = root:Packages:NIST:gNXcanSAS_Write
+        gVal = checked
+End
+
 Function DoTransCorrPref(ctrlName,checked) : CheckBoxControl
         String ctrlName
@@ -1543 +1551 @@
         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:gXML_Write
+        CheckBox PrefCtrl_0a,pos={21,116},size={124,14},proc=NXWritePref,title="Use NXcanSAS HDF5 Output"
+        CheckBox PrefCtrl_0a,help={"Checking this will set the default output format to be NXcanSAS HDF5 rather than NIST 6 column"}
+        CheckBox PrefCtrl_0a,value= root:Packages:NIST:gNXcanSAS_Write
+
 
 //on tab(1) - SANS

sans/Dev/nxcansas_writer/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf

@@ -215 +215 @@
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         NVAR useXMLOutput = root:Packages:NIST:gXML_Write
+        NVAR useNXcanSASOutput = root:Packages:NIST:gNXcanSAS_Write
 
         
@@ -263 +264 @@
         if (useXMLOutput == 1)
                 WriteXMLUSANSWaves(type,"",ptA,ptB,1)
+        else if (useNXcanSASOutput == 1)
+                WriteUSANSNXCanSAS(type,"",ptA,ptB,1)
         else
                 WriteUSANSWaves(type,"",ptA,ptB,1)