From 9de52a62f51e4f08bfbfcc280d8df29ac6c149c0 Mon Sep 17 00:00:00 2001 From: Duncan Macleod Date: Fri, 25 Aug 2023 04:00:14 -0700 Subject: [PATCH] remove support for Omicron txt output closes #169 --- docs/utilities/merge.rst | 2 -- omicron/cli/process.py | 12 ------------ omicron/parameters.py | 3 +-- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/docs/utilities/merge.rst b/docs/utilities/merge.rst index e95fa98..05480d7 100644 --- a/docs/utilities/merge.rst +++ b/docs/utilities/merge.rst @@ -22,8 +22,6 @@ merge te contiguous trigger files: +------------+-----------+-------------------------------------------------+ | ligolw | ``.xml `` | ``ligolw_add`` and ``gzip`` | +------------+-----------+-------------------------------------------------+ -| Text | ``.txt `` | ``?`` | -+------------+-----------+-------------------------------------------------+ The ``omicron-root-merge`` executable is a thin wrapper on top of the :meth:`omicron.io.merge_root_files` method: diff --git a/omicron/cli/process.py b/omicron/cli/process.py index 0ca1735..5e2ef82 100644 --- a/omicron/cli/process.py +++ b/omicron/cli/process.py @@ -1189,18 +1189,6 @@ def main(args=None): rmfiles.append(xmlfiles) - # add ASCII operations - if 'txt' in fileformats: - txtfiles = ' '.join(omicronfiles[c]['txt']) - for f in omicronfiles[c]['txt']: - ppnode.add_input_file(f) - if args.archive: - try: - archivefiles[target].append(txtfiles) - except KeyError: - archivefiles[target] = [txtfiles] - rmfiles.append(txtfiles) - ppnode.set_category('postprocessing') ppnode.set_retry(str(args.condor_retry)) if not args.skip_omicron: diff --git a/omicron/parameters.py b/omicron/parameters.py index b36671f..ce2b730 100644 --- a/omicron/parameters.py +++ b/omicron/parameters.py @@ -403,7 +403,7 @@ def distribute_segment(self, start, end, nperjob=1): return out def output_formats(self): - return [fmt for fmt in ('root', 'txt', 'xml', 'hdf5') if + return [fmt for fmt in ('root', 'xml', 'hdf5') if fmt in self.get('OUTPUT', 'FORMAT')] def output_files(self, start, end, flatten=False): @@ -431,7 +431,6 @@ def output_files(self, start, end, flatten=False): fileformats = self.output_formats() extension = { 'root': 'root', - 'txt': 'txt', 'xml': 'xml', 'hdf5': 'h5', }