Skip to content

Remove support for Omicron txt output #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duncanmmacleod wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove support for Omicron txt output #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/utilities/merge.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 0 additions & 12 deletions omicron/cli/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions omicron/parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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',
}
Expand Down