Changeset 259 for sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/ProtocolAsPanel.ipf

Timestamp:

Feb 13, 2008 12:09:38 PM (15 years ago)

Author:

srkline

Message:

Ticket #105. Changed the ExecuteProtocol? function to always re-load the SAM, EMP, and BGD files during reduction. Previously, if the file was there (by checking the name in the dataFolder) then the file was not re-loaded. This is a remnant of the good-old-days when speed was an issue, especially when working over the network. Forcing a reload has tolerable speed, and is always correct, as long as the data on disk is correct.

File:

• sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/ProtocolAsPanel.ipf (modified) (3 diffs)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/ProtocolAsPanel.ipf

@@ -1509 +1509 @@
                 //if not "ask" AND not "none" then try to parse the filenames
                 If((cmpstr(samStr,"none") != 0) && (cmpstr(samStr,"ask") != 0))
-                        filesOK = AreFilesThere(activeType,samStr)              //return 1 if correct files are already there
+                        //filesOK = AreFilesThere(activeType,samStr)            //return 1 if correct files are already there
+                        filesOK = 0             // Feb 2008, always force a reload of files. Maybe slow, but always correct 
                         if(!filesOK)
                                 //add the correct file(s) to SAM
@@ -1564 +1565 @@
                 //if not "ask" AND not "none" then try to parse the filenames
                 If((cmpstr(prot[0],"none") != 0) && (cmpstr(prot[0],"ask") != 0))
-                        filesOK = AreFilesThere(activeType,prot[0])
+                        //filesOK = AreFilesThere(activeType,prot[0])
+                        filesOK = 0             // Feb 2008, always force a reload of files. Maybe slow, but always correct 
                         if(!filesOK)
                                 //add the correct file(s) to BGD
@@ -1617 +1619 @@
                 //if not "ask" AND not "none" then try to parse the filenames
                 If((cmpstr(prot[1],"none") != 0) && (cmpstr(prot[1],"ask") != 0))
-                        filesOK = AreFilesThere(activeType,prot[1])
+                        //filesOK = AreFilesThere(activeType,prot[1])
+                        filesOK = 0             // Feb 2008, always force a reload of files. Maybe slow, but always correct 
                         if(!filesOK)
                                 //add the correct file(s) to BGD