Changeset 1161 for sans/Dev/trunk

Timestamp:

Jun 4, 2019 4:37:36 PM (4 years ago)

Author:

krzywon

Message:

Tie the NXcanSAS writers into the GUI for 1D SANS and USANS reduction (untested).

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (2 diffs)
• Reduction/SANS/AvgGraphics.ipf (modified) (3 diffs)
• Reduction/USANS/COR_Graph.ipf (modified) (2 diffs)

sans/Dev/trunk/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/trunk/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf

@@ -70 +70 @@
         SVAR type=root:myGlobals:gDataDisplayType
         NVAR useXMLOutput = root:Packages:NIST:gXML_Write
+        NVAR useNXcanSASOutput = root:Packages:NIST:GNXcanSAS_Write
 
         //Check for logscale data in "type" folder
@@ -126 +127 @@
                 case "Rectangular":             
                         RectangularAverageTo1D(type)
-                        If(doSave)                                      //save the file, acting on the currently displayed file
-                                if (useXMLOutput == 1)
-                                        WriteXMLWaves_W_Protocol(type,"",1)
-                                else
-                                        WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
-                                endif
-                        Endif
                         break                                   
                 case "Annular":         
                         AnnularAverageTo1D(type)
-                        If(doSave)              // XML here yet
-                                //save the file, acting on the currently displayed file
-                                WritePhiave_W_Protocol(type,"",1)               //"" is an empty path, 1 will force a dialog
-                        Endif
                         break
                 case "Circular":
@@ -145 +135 @@
                         //circular or sector
                         CircularAverageTo1D(type)               //graph is drawn here
-                        If(doSave)
+                        break
+                case "2D ASCII":
+                        Fast2dExport(type,"",1)
+                        break
+                case "QxQy ASCII":
+                        QxQy_Export(type,"",1)
+                        break
+                case "Sector_PlusMinus":
+                        Sector_PlusMinus1D(type)
+                        break
+                default:                                                
+                        Abort "no case match in average dispatch"
+        endswitch
+        
+        if(doSave)
+                strswitch(choice)
+                        case "Annular":
+                                WritePhiave_W_Protocol(type,"",1)
+                                break
+                        case "2D ASCII":
+                        case "QxQy ASCII":
+                                break
+                        default:
                                 if (useXMLOutput == 1)
                                         WriteXMLWaves_W_Protocol(type,"",1)
+                                else if (useNXcanSASOutput == 1)
+                                        WriteNxCanSAS1D(type,"",1)
                                 else
                                         WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
                                 endif
-                        Endif
-                        break
-                case "2D ASCII":
-                        Fast2dExport(type,"",1)
-                        break
-                case "QxQy ASCII":
-                        QxQy_Export(type,"",1)
-                        break
-                case "Sector_PlusMinus":
-                        Sector_PlusMinus1D(type)
-                        If(doSave)
-                                if (useXMLOutput == 1)
-                                        WriteXMLWaves_W_Protocol(type,"",1)
-                                else
-                                        WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
-                                endif
-                        Endif
-                        break
-                default:                                                
-                        Abort "no case match in average dispatch"
-        endswitch
+        EndIf
         
         //convert back to log scaling if I changed it...

sans/Dev/trunk/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)