Changeset 1164 for sans

Timestamp:

Jun 5, 2019 10:08:15 AM (4 years ago)

Author:

krzywon

Message:

Revert changes meant for NXcanSAS branch.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (2 diffs)
• Reduction/SANS/AvgGraphics.ipf (modified) (4 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
@@ -1551 +1543 @@
         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
@@ -127 +126 @@
                 case "Rectangular":             
                         RectangularAverageTo1D(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                                   
                 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":
@@ -135 +145 @@
                         //circular or sector
                         CircularAverageTo1D(type)               //graph is drawn here
+                        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
                 case "2D ASCII":
@@ -148 +165 @@
                         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
         
         //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
 
         
@@ -264 +263 @@
         if (useXMLOutput == 1)
                 WriteXMLUSANSWaves(type,"",ptA,ptB,1)
-        else if (useNXcanSASOutput == 1)
-                WriteUSANSNXCanSAS(type,"",ptA,ptB,1)
         else
                 WriteUSANSWaves(type,"",ptA,ptB,1)