Changeset 1576693 in sasview


Ignore:
Timestamp:
Oct 27, 2017 3:39:38 AM (7 years ago)
Author:
krzywon
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
b6b81a3
Parents:
3648cbf
Message:

Move state reset to end of file read to be more thread friendly.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sascalc/dataloader/file_reader_base_class.py

    r61f329f0 r1576693  
    5454        :param filepath: The full or relative path to a file to be loaded 
    5555        """ 
    56         self.reset_state() 
    5756        if os.path.isfile(filepath): 
    5857            basename, extension = os.path.splitext(os.path.basename(filepath)) 
    … …  
    8685 
    8786        # Return a list of parsed entries that data_loader can manage 
    88         return self.output 
     87        final_data = self.output 
     88        self.reset_state() 
     89        return final_data 
    8990 
    9091    def reset_state(self): 
Note: See TracChangeset for help on using the changeset viewer.