Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/ProtocolAsPanel.ipf

    r247 r259  
    15091509                //if not "ask" AND not "none" then try to parse the filenames 
    15101510                If((cmpstr(samStr,"none") != 0) && (cmpstr(samStr,"ask") != 0)) 
    1511                         filesOK = AreFilesThere(activeType,samStr)              //return 1 if correct files are already there 
     1511                        //filesOK = AreFilesThere(activeType,samStr)            //return 1 if correct files are already there 
     1512                        filesOK = 0             // Feb 2008, always force a reload of files. Maybe slow, but always correct  
    15121513                        if(!filesOK) 
    15131514                                //add the correct file(s) to SAM 
     
    15641565                //if not "ask" AND not "none" then try to parse the filenames 
    15651566                If((cmpstr(prot[0],"none") != 0) && (cmpstr(prot[0],"ask") != 0)) 
    1566                         filesOK = AreFilesThere(activeType,prot[0]) 
     1567                        //filesOK = AreFilesThere(activeType,prot[0]) 
     1568                        filesOK = 0             // Feb 2008, always force a reload of files. Maybe slow, but always correct  
    15671569                        if(!filesOK) 
    15681570                                //add the correct file(s) to BGD 
     
    16171619                //if not "ask" AND not "none" then try to parse the filenames 
    16181620                If((cmpstr(prot[1],"none") != 0) && (cmpstr(prot[1],"ask") != 0)) 
    1619                         filesOK = AreFilesThere(activeType,prot[1]) 
     1621                        //filesOK = AreFilesThere(activeType,prot[1]) 
     1622                        filesOK = 0             // Feb 2008, always force a reload of files. Maybe slow, but always correct  
    16201623                        if(!filesOK) 
    16211624                                //add the correct file(s) to BGD 
Note: See TracChangeset for help on using the changeset viewer.