Changeset 1165 for sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures

Timestamp:

Jun 5, 2019 4:48:14 PM (4 years ago)

Author:

krzywon

Message:

Change the data output from a checkbox to a radio button. Tie the writer into base 'Reduce a File' method. Tested and working.

Location:

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures

Files:

• Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (4 diffs)
• Reduction/SANS/AvgGraphics.ipf (modified) (1 diff)
• Reduction/SANS/NCNR_Includes_v520.ipf (modified) (1 diff)
• Reduction/SANS/ProtocolAsPanel.ipf (modified) (3 diffs)

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

@@ -1381 +1381 @@
         if(V_flag==0)
                 // only re-initialize if the variables don't exist, so you don't overwrite what users have changed
-                if( exists("root:Packages:NIST:gXML_Write") != 2 )              //if the global variable does not exist, initialize
+                if( exists("root:Packages:NIST:gASCII_Write") != 2 || exists("root:Packages:NIST:gXML_Write") != 2 || exists("root:Packages:NIST:gNXcanSAS_Write") != 2)                //if the global variable does not exist, initialize
                         Initialize_Preferences()
                 endif
@@ -1433 +1433 @@
         
         /// items for everyone
+        val = NumVarOrDefault("root:Packages:NIST:gASCII_Write", 1 )
+        if (val == 1)
+                WritePref("PrefCtrl_0",1)
+        endif
+        Variable/G root:Packages:NIST:gASCII_Write = val
         val = NumVarOrDefault("root:Packages:NIST:gXML_Write", 0 )
+        if (val == 1)
+                WritePref("PrefCtrl_0a",1)
+        endif
         Variable/G root:Packages:NIST:gXML_Write = val
-        
+        val = NumVarOrDefault("root:Packages:NIST:gNXcanSAS_Write", 0 )
+        if (val == 1)
+                WritePref("PrefCtrl_0b",1)
+        endif
+        Variable/G root:Packages:NIST:gNXcanSAS_Write = val
         
 end
@@ -1465 +1477 @@
 End
 
-Function XMLWritePref(ctrlName,checked) : CheckBoxControl
+Function WritePref(ctrlName,checked) : CheckBoxControl
         String ctrlName
         Variable checked
         
-        NVAR gVal = root:Packages:NIST:gXML_Write
-        gVal = checked
-End
-
-Function NXWritePref(ctrlName,checked) : CheckBoxControl
-        String ctrlName
-        Variable checked
-        
-        NVAR gVal = root:Packages:NIST:gNXcanSAS_Write
-        gVal = checked
+        NVAR asciiVal = root:Packages:NIST:gASCII_Write
+        NVAR xmlVal = root:Packages:NIST:gXML_Write
+        NVAR nxVal = root:Packages:NIST:gNXcanSAS_Write
+        
+        strswitch (ctrlName)
+                case "PrefCtrl_0":
+                        CheckBox PrefCtrl_0,value=1
+                        asciiVal = checked
+                        CheckBox PrefCtrl_0a,value=0
+                        xmlVal = 0
+                        CheckBox PrefCtrl_0b,value=0
+                        nxVal = 0
+                        break
+                case "PrefCtrl_0a":
+                        CheckBox PrefCtrl_0,value=0
+                        asciiVal = 0
+                        CheckBox PrefCtrl_0a,value=1
+                        xmlVal = checked
+                        CheckBox PrefCtrl_0b,value=0
+                        nxVal = 0
+                        break
+                case "PrefCtrl_0b":
+                        CheckBox PrefCtrl_0,value=0
+                        asciiVal = 0
+                        CheckBox PrefCtrl_0a,value=0
+                        xmlVal = 0
+                        CheckBox PrefCtrl_0b,value=1
+                        nxVal = checked
+        endswitch
 End
 
@@ -1548 +1579 @@
         
 //on tab(0) - General - initially visible
-        CheckBox PrefCtrl_0a,pos={21,96},size={124,14},proc=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_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_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
-
+        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) - SANS

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf

@@ -160 +160 @@
                                 if (useXMLOutput == 1)
                                         WriteXMLWaves_W_Protocol(type,"",1)
-                                else if (useNXcanSASOutput == 1)
+                                elseif (useNXcanSASOutput == 1)
                                         WriteNxCanSAS1D(type,"",1)
                                 else
                                         WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
                                 endif
+                endswitch
         EndIf
         

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/SANS/NCNR_Includes_v520.ipf

@@ -98 +98 @@
 //#include "MC_Script_Panels"
 
+// JRK JUN 2019 -- import NXcanSAS writer
+#include "WriteHDF5"
+
 // a simple list of items to add to the Beta menu
 // to allow testing of these features

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf

@@ -1477 +1477 @@
         
         NVAR useXMLOutput = root:Packages:NIST:gXML_Write
+        NVAR useNXcanSASOutput = root:Packages:NIST:gNXcanSAS_Write
         
         //Parse the instructions in the prot wave
@@ -1915 +1916 @@
                         if(useXMLOutput == 1)
                                 exten += "x"
+                        elseif(useNXcanSASOutput == 1)
+                                exten = "h5"
                         endif
                 endif
@@ -1954 +1957 @@
                                 if (useXMLOutput == 1)
                                         WriteXMLWaves_W_Protocol(activeType,fullPath,dialog)
+                                elseif (useNXcanSASOutput == 1)
+                                        WriteNxCanSAS1D(activeType,fullPath,dialog)
                                 else
                                         WriteWaves_W_Protocol(activeType,fullpath,dialog)