# HG changeset patch # User rv43 # Date 1679405460 0 # Node ID 9c48ef48c604b68df30c59084e20d263c3304b08 # Parent 0f553c8d7b9850e5c9fe54aacb08374d4e6e4b12 planemo upload for repository https://github.com/rolfverberg/galaxytools commit f8c4bdb31c20c468045ad5e6eb255a293244bc6c diff -r 0f553c8d7b98 -r 9c48ef48c604 workflow/.run_tomo.py.swp Binary file workflow/.run_tomo.py.swp has changed diff -r 0f553c8d7b98 -r 9c48ef48c604 workflow/run_tomo.py --- a/workflow/run_tomo.py Mon Mar 20 19:30:19 2023 +0000 +++ b/workflow/run_tomo.py Tue Mar 21 13:31:00 2023 +0000 @@ -165,21 +165,34 @@ def read(self, filename): logger.info(f'looking for {filename}') - extension = os_path.splitext(filename)[1] - if extension == '.yml' or extension == '.yaml' or self.galaxy_flag and extension == '.dat': - with open(filename, 'r') as f: - config = safe_load(f) -# if len(config) > 1: -# raise ValueError(f'Multiple root entries in {filename} not yet implemented') -# if len(list(config.values())[0]) > 1: -# raise ValueError(f'Multiple sample maps in {filename} not yet implemented') - return(config) - elif extension == '.nxs': - with NXFile(filename, mode='r') as nxfile: - nxroot = nxfile.readfile() - return(nxroot) + if self.galaxy_flag: + try: + with open(filename, 'r') as f: + config = safe_load(f) + return(config) + except: + try: + with NXFile(filename, mode='r') as nxfile: + nxroot = nxfile.readfile() + return(nxroot) + except: + raise ValueError(f'Unable to open ({filename})') else: - raise ValueError(f'Invalid filename extension ({extension})') + extension = os_path.splitext(filename)[1] + if extension == '.yml' or extension == '.yaml': + with open(filename, 'r') as f: + config = safe_load(f) +# if len(config) > 1: +# raise ValueError(f'Multiple root entries in {filename} not yet implemented') +# if len(list(config.values())[0]) > 1: +# raise ValueError(f'Multiple sample maps in {filename} not yet implemented') + return(config) + elif extension == '.nxs': + with NXFile(filename, mode='r') as nxfile: + nxroot = nxfile.readfile() + return(nxroot) + else: + raise ValueError(f'Invalid filename extension ({extension})') def write(self, data, filename): extension = os_path.splitext(filename)[1]