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

Timestamp:

Jul 22, 2019 10:30:38 AM (4 years ago)

Author:

krzywon

Message:

Add QxQy_NXcanSAS as a reduction option in protocol menu.

File:

• sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/V_Protocol_Reduction.ipf (modified) (4 diffs)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/V_Protocol_Reduction.ipf

@@ -1345 +1345 @@
 
 //      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;Narrow_Slit;Annular;Sector;QxQy_ASCII;"
+        Prompt av_typ, "Type of Average",popup,"Circular;Narrow_Slit;Annular;Sector;QxQy_ASCII;QxQy_NXcanSAS"
 
 // comment out above line in DEMO_MODIFIED version, and uncomment the line below (to disable PNG save)
@@ -1492 +1492 @@
         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_ASCII;QxQy_ASCII;QxQy_NXcanSAS;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"
@@ -3351 +3351 @@
 //                                      prot[9] = collimationStr
                                         if (useNXcanSASOutput == 1)
-                                                WriteNxCanSAS1D(activeType,fullPath,dialog)
+                                                V_WriteNXcanSAS1DData("root:Packages:NIST:VSANS:",activeType,newFileName+".h5")
                                         else
                                                 V_Write1DData("root:Packages:NIST:VSANS:",activeType,newFileName+"."+exten)             //don't pass the full path, just the name
@@ -3376 +3376 @@
                                 V_QxQy_Export(activeType,fullPath,newFileName,dialog)
                                 break
-                        case "2D_NXcanSAS":
+                        case "QxQy_NXcanSAS":
                                 fullPath = S_Path + newFileName+".h5"
                                 V_WriteNXcanSAS2DData(activeType,fullPath,newFileName,dialog)