Changeset 1100 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MultipleReduce.ipf

Timestamp:

May 18, 2018 10:32:22 AM (5 years ago)

Author:

srkline

Message:

Significant restructuring of V_ExecuteProtocol to make the logic of the flow more tractable and adaptable in the future.

Added major change to VSANS event mode reduction panel to allow F and M binned events to be saved to a copy of the correspondng data file. A new data reduction panel for multiple slice reduction is now presented for Event data. This allows reduction of a single slice (all 8 F,M panels, back ignored), or all of the slices.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MultipleReduce.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MultipleReduce.ipf

@@ -162 +162 @@
         //input filenames must be full path:file;ext, so they can be found on disk
         
-        String cmdTemplate = "V_ExecuteProtocol(\"" + gMredProtoStr + "\",\"%s\")"
+//      String cmdTemplate = "V_ExecuteProtocol(\"" + gMredProtoStr + "\",\"%s\")"
         String theItem
         Variable index=0
@@ -170 +170 @@
                 theItem = StringFromList(index,list,",")        //COMMA separated list
                 if(strlen(theItem)!=0)
-                        sprintf cmd,cmdTemplate,theItem         //null string items will be skipped
+                        //sprintf cmd,cmdTemplate,theItem               //null string items will be skipped
                         //Print "cmd = ",cmd
-                        Execute cmd
+                        //Execute cmd
+                        V_ExecuteProtocol(gMredProtoStr,theItem)
                 endif
                 index +=1
@@ -265 +266 @@
 Function/S V_GetValidMRedPopupList()
 
-//      String semiList = V_GetSAMList()
 
         String commaList="",semiList="",fname="",purpose=""
         SVAR numList=root:Packages:NIST:VSANS:Globals:MRED:gFileNumList
+        
+        // if a "*" is entered, return all of the SAMPLE+SCATTERING files
+        if(cmpstr(numList,"*") == 0)
+                semiList = V_GetSAMList()
+                return(semiList)
+        endif
         
         commaList = V_ParseRunNumberList(numList)