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

Timestamp:

Jun 14, 2019 1:46:39 PM (4 years ago)

Author:

krzywon

Message:

Add 2D NXcanSAS output as SANS reduction option.

Location:

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures

Files:

• Common/NIST_NXcanSAS_v709.ipf (modified) (1 diff)
• Reduction/SANS/ProtocolAsPanel.ipf (modified) (5 diffs)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Common/NIST_NXcanSAS_v709.ipf

@@ -268 +268 @@
         
         // Run Name and title
-        NewDataFolder/O/S $(base + parentBase)
-        Make/O/T/N=1 $(base + parentBase + ":title") = {textw[6]}
-        CreateStrNxCansas(fileID,parentBase,"","title",$(base + parentBase + ":title"),empty,empty)
-        Make/O/T/N=1 $(base + parentBase + ":run") = {textw[0]}
-        CreateStrNxCansas(fileID,nxcansasBase,"","run",$(base + parentBase + ":run"),empty,empty)
+        NewDataFolder/O/S $(parentBase)
+        Make/O/T/N=1 $(parentBase + ":title") = {textw[6]}
+        CreateStrNxCansas(fileID,nxcansasBase,"","title",$(parentBase + ":title"),empty,empty)
+        Make/O/T/N=1 $(parentBase + ":run") = {textw[0]}
+        CreateStrNxCansas(fileID,nxcansasBase,"","run",$(parentBase + ":run"),empty,empty)
         
         // SASData
         String dataParent = nxcansasBase + "sasdata/"
         // Create SASdata entry
-        String dataBase = base + parentBase + ":sasdata"
+        String dataBase = parentBase + ":sasdata"
         NewDataFolder/O/S $(dataBase)
         Make/O/T/N=5 $(dataBase + ":attr") = {"canSAS_class","signal","I_axes","NX_class","Q_indices", "timestamp"}

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

@@ -969 +969 @@
         String av_typ,autoSave,AutoName,autoPlot,side
         Variable phi=0,dphi=10,width=10,Qctr = 0.01,qDelta=10
-        Prompt av_typ, "Type of Average",popup,"Circular;Sector;Rectangular;Annular;2D_ASCII;QxQy_ASCII;PNG_Graphic;Sector_PlusMinus;"
+        Prompt av_typ, "Type of Average",popup,"Circular;Sector;Rectangular;Annular;2D_NXcanSAS;2D_ASCII;QxQy_ASCII;PNG_Graphic;Sector_PlusMinus;"
 // comment out above line in DEMO_MODIFIED version, and uncomment the line below (to disable PNG save)
 //      Prompt av_typ, "Type of Average",popup,"Circular;Sector;Rectangular;Annular;2D_ASCII;QxQy_ASCII"
@@ -1839 +1839 @@
         
         strswitch(av_type)      //dispatch to the proper routine to average to 1D data
-                case "none":            
-                        //still do nothing
-                        break                   
-                case "2D_ASCII":        
-                        //do nothing
-                        break
-                case "QxQy_ASCII":
-                        //do nothing
-                        break
-                case "PNG_Graphic":
-                        //do nothing
-                        break
                 case "Rectangular":
                         RectangularAverageTo1D(activeType)
@@ -1866 +1854 @@
                         Sector_PlusMinus1D(activeType)
                         break
+                case "none":            
+                        //do nothing
+                case "2D_ASCII":        
+                        //do nothing
+                case "QxQy_ASCII":
+                        //do nothing
+                case "2D_NXcanSAS":
+                        //do nothing
+                case "PNG_Graphic":
+                        //do nothing
                 default:        
                         //do nothing
@@ -1909 +1907 @@
                 if(cmpstr(av_type,"QxQy_ASCII") == 0)
                         exten = "DAT"
+                endif
+                if(cmpstr(av_type,"2D_NXcanSAS") == 0)
+                        exten = "h5"
                 endif
                 
@@ -1947 +1948 @@
                         case "2D_ASCII":
                                 Fast2DExport(activeType,fullPath,dialog)
+                                break
+                        case "2D_NXcanSAS":
+                                WriteNxCanSAS2D(activeType,fullPath,dialog)
                                 break
                         case "QxQy_ASCII":