diff --git a/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py b/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py
index 70be9ea9b6bf14a9291235ee2667542beed34fa4..b6bc74b811b13d57fdf39be6f05f0190c2fd0c3d 100644
--- a/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py
+++ b/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py
@@ -40,6 +40,86 @@ class LIGOLWContentHandler(ligolw.LIGOLWContentHandler):
pass
lsctables.use_in(LIGOLWContentHandler)
+def pre_cmd(identifier):
+ """
+ Returns a string with a script for job setup and and geolocaiton which runs
+ as a PreCmd. Output is dumped to a file called <identifier>_cehostname.txt
+
+ >>> pre_cmd("trigtime_123", "BayesWave")
+
+ Creates a file: BayesWave_cehostname.txt
+ """
+
+ script="""#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2018-2019 James Clark <james.clark@ligo.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+\"\"\"Compute element hostname.
+
+Creates the output directory for a BayesWave job and prints the name of the
+GLIDEIN gatekeeper for OSG jobs. Prints the name of the local host if not a
+GLIDEIN.
+
+The hostname identification comes from:
+ https://opensciencegrid.org/user-school-2017/#materials/day2/part1-ex3-submit-osg/
+
+Note that we could use many more env variables for similar purposes if needed.
+\"\"\"
+
+import re
+import os,sys
+import socket
+
+#
+# Preliminary setup
+#
+outputDir=sys.argv[1]
+if not os.path.exists(outputDir): os.makedirs(outputDir)
+geolocation=open("{0}/{1}_cehostname.txt".format(outputDir), "w")
+
+#
+# Geolocation
+#
+machine_ad_file_name = os.getenv('_CONDOR_MACHINE_AD')
+try:
+ machine_ad_file = open(machine_ad_file_name, 'r')
+ machine_ad = machine_ad_file.read()
+ machine_ad_file.close()
+except TypeError:
+ host = socket.getfqdn()+"\\n"
+ geolocation.writelines(host)
+ geolocation.close()
+ exit(0)
+
+try:
+ host = re.search(r'GLIDEIN_Gatekeeper = "(.*):\d*/jobmanager-\w*"', machine_ad, re.MULTILINE).group(1)
+except AttributeError:
+ try:
+ host = re.search(r'GLIDEIN_Gatekeeper = "(\S+) \S+:9619"', machine_ad, re.MULTILINE).group(1)
+ except AttributeError:
+ host = socket.getfqdn()
+geolocation.writelines(host+"\\n")
+geolocation.close()
+exit(0)
+
+""".format("{}",identifier)
+
+ return script
+
+
+
#
# Convenience Defs
#
@@ -629,20 +709,27 @@ def condor_job_config(job_type,condor_job,config_parser):
"""
valid_job_types=['bayeswave','bayeswave_post','bayeswave_fpeak','megasky','megaplot']
- requires=[]
+ try:
+ job_index = valid_job_types.index(job_type)
+ except ValueError:
+ print >> sys.stderr, "unrecognized job type"
- #
- # Set executable and choose singularity image
- #
+ # --- Set executable and choose singularity image
executable=config_parser.get('engine',job_type)
universe=config_parser.get('condor','universe')
+ pipeline.CondorDAGJob.__init__(condor_job,universe,executable)
+ pipeline.AnalysisJob.__init__(condor_job,config_parser,dax=False)
- # Force singularity if OSG deployment
- if config_parser.getboolean('condor', 'osg-jobs'):
- config_parser.set('engine','use-singularity',str(True))
+ requires=[]
+
+ #
+ # Container / environment Configuration
+ #
if config_parser.getboolean('engine','use-singularity'):
+ requires.append("(HAS_SINGULARITY=?=TRUE)")
+
print "Running with singularity(image={})".format(
config_parser.get('engine','singularity'))
@@ -653,90 +740,77 @@ def condor_job_config(job_type,condor_job,config_parser):
specify an image in the [engine] section of the config file"""
sys.exit(-1)
- # --- Generate a wrapper script
- wrapper_string="""
-# Geolocation:
-curl ipinfo.io
-
-# Analysis execution:
-{executable} "$@"
+ pipeline.CondorDAGJob.__init__(condor_job,universe,executable)
+ condor_job.add_condor_cmd("transfer_executable", False)
-""".format(executable=executable)
+ singularityImage = config_parser.get('engine','singularity')
+ # Force quotes if absent
+ if singularityImage[0]!='"': singularityImage = '"'+singularityImage
+ if singularityImage[-1]!='"': singularityImage += '"'
+ condor_job.add_condor_cmd('+SingularityImage', singularityImage)
+ condor_job.add_condor_cmd('+SingularityBindCVMFS', True)
- wrapper = "run_"+job_type.replace('.py','')+'.sh'
- f=open(wrapper,'w')
- f.writelines("#!/bin/bash\n")
- f.writelines(wrapper_string)
- f.close()
- os.chmod(wrapper,0755)
+ # --- Perform file transfers
+ print >> sys.stdout, "Configuring file transfers (singularity requirement)"
+ condor_job.add_condor_cmd('should_transfer_files', 'YES')
+ condor_job.add_condor_cmd('when_to_transfer_output', 'ON_EXIT_OR_EVICT')
- pipeline.CondorDAGJob.__init__(condor_job,universe,wrapper)
+ # --- Enable stdout / stderr streaming
+ # XXX: keep an eye on this to avoid excessive network usage
+ condor_job.add_condor_cmd('stream_output', True)
+ condor_job.add_condor_cmd('stream_error', True)
- condor_job.add_condor_cmd('+SingularityImage',config_parser.get('engine','singularity'))
- condor_job.add_condor_cmd('+SingularityBindCVMFS', True)
+ #
+ # OSG configuration
+ #
+ if config_parser.getboolean('condor', 'osg-jobs'):
+ # --- Make sure we run on the OSG
+ condor_job.add_condor_cmd('+OpenScienceGrid', True)
+ if config_parser.has_option('condor','desired-sites'):
+ condor_job.add_condor_cmd('+DESIRED_Sites',config_parser.get('condor','desired-sites'))
+
+ # --- Ensure LIGO data is present unless simulating and make sure we can
+ # access it!
+ if not config_parser.getboolean('datafind','sim-data'):
+ requires.append("(HAS_LIGO_FRAMES=?=TRUE)")
+ condor_job.add_condor_cmd('use_x509userproxy', True)
else:
-
- pipeline.CondorDAGJob.__init__(condor_job,universe,executable)
+ # If not using containers, use current environment setup
condor_job.add_condor_cmd('getenv',True)
- if config_parser.has_option('condor','arch'):
- self.add_condor_cmd('+arch',config_parser.get('condor','arch'))
-
-
- if config_parser.has_option('condor', 'notify-user'):
- condor_job.set_notification('always')
- condor_job.add_condor_cmd('notify_user', config_parser.get('condor',
- 'notify-user'))
-
#
# Common configurations
#
- try:
- job_index = valid_job_types.index(job_type)
- except ValueError:
- print >> sys.stderr, "unrecognized job type"
-
- pipeline.AnalysisJob.__init__(condor_job,config_parser,dax=False)
-
- if config_parser.has_option('condor', 'accounting-group'):
- condor_job.add_condor_cmd('accounting_group', config_parser.get('condor', 'accounting-group'))
-
- if config_parser.has_option('condor','desired-sites'):
- condor_job.add_condor_cmd('+DESIRED_Sites',config_parser.get('condor','desired-sites'))
+ if config_parser.has_option('condor', 'accounting-group') or config_parser.has_option('condor', 'accounting_group'):
+ try:
+ condor_job.add_condor_cmd('accounting_group', config_parser.get('condor', 'accounting-group'))
+ except:
+ condor_job.add_condor_cmd('accounting_group', config_parser.get('condor', 'accounting_group'))
+ if config_parser.has_option('condor', 'notify-user'):
+ condor_job.add_condor_cmd('notify_user',
+ config_parser.get('condor', 'notify-user'))
+ try:
+ condor_job.set_notification(config_parser.get('condor',
+ 'notification'))
+ except:
+ condor_job.set_notification('Error')
#
- # Identify osg vs ldg site
+ # Additional specifications for OSG
#
if config_parser.getboolean('condor', 'osg-jobs'):
-
# --- Make sure we run on the OSG
condor_job.add_condor_cmd('+OpenScienceGrid', True)
- if config_parser.getboolean('condor', 'glide-in'):
- requires.append("(IS_GLIDEIN=?=True)")
-
- # --- Ensure LIGO data is present unless simulating and make sure we can
- # access it!
- if not config_parser.getboolean('datafind','sim-data'):
- requires.append("(HAS_LIGO_FRAMES==TRUE)")
- condor_job.add_condor_cmd('use_x509userproxy', True)
-
- # --- Only run at sites with singularity higher than version 2.2
- requires.append("(HAS_SINGULARITY==TRUE)")
- requires.append('(!regexp("2.2.*",OSG_SINGULARITY_VERSION))')
-
-
- print >> sys.stdout, "Configuring file transfers for OSG deployment"
-
- # --- Perform file transfers
- condor_job.add_condor_cmd('should_transfer_files', 'YES')
- condor_job.add_condor_cmd('when_to_transfer_output', 'ON_EXIT_OR_EVICT')
+ if config_parser.getboolean('condor', 'glide-in'):
+ requires.append("(IS_GLIDEIN=?=True)")
- # Finally add in all the requirements we've accumulated
+ # Finally tie requirements together into a condor-friendly string
if len(requires)>0:
condor_job.add_condor_cmd("requirements", " && ".join(requires))
+
return
@@ -749,23 +823,9 @@ class bayeswaveJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
#
condor_job_config('bayeswave',self,cp)
- # --- OSG-specifics unique to this job
- # Files to include in transfer
- if cp.getboolean('condor', 'osg-jobs'):
- transferstring='datafind,$(macrooutputDir)'
- if cp.getboolean('condor','copy-frames'): transferstring+=',$(macroframes)'
- if injfile is not None: transferstring+=','+injfile
- if nrdata is not None: transferstring+=','+nrdata
- if cp.has_option('condor','transfer-files'):
- # allow specification of additional files to transfer
- transferstring+=',%s'%cp.get('condor','transfer-files')
- self.add_condor_cmd('transfer_input_files', transferstring)
- self.add_condor_cmd('transfer_output_files', '$(macrooutputDir)')
-
-
- self.set_stdout_file('$(macrooutputDir)/bayeswave_$(cluster)-$(process)-$(node).out')
- self.set_stderr_file('$(macrooutputDir)/bayeswave_$(cluster)-$(process)-$(node).err')
- self.set_log_file('$(macrooutputDir)/bayeswave_$(cluster)-$(process)-$(node).log')
+ self.set_stdout_file('logs/bayeswave_$(macrooutputDir)-$(cluster)-$(process).out')
+ self.set_stderr_file('logs/bayeswave_$(macrooutputDir)-$(cluster)-$(process).err')
+ self.set_log_file('logs/bayeswave_$(macrooutputDir)-$(cluster)-$(process).log')
if cp.has_option('condor','arch'):
self.add_condor_cmd('+arch',cp.get('condor','arch'))
@@ -779,10 +839,37 @@ class bayeswaveJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
self.add_condor_cmd('+BayesWaveCgroup', 'True')
self.add_condor_cmd('Rank', '(TARGET.BayesWaveCgroup =?= True)')
- # self-checkpointing
+ # --- Self-checkpointing
if cp.has_option('condor', 'checkpoint'):
self.add_opt('checkpoint', cp.get('condor', 'checkpoint'))
+ #
+ # Singularity configurations
+ #
+ if cp.getboolean('engine','use-singularity'):
+
+ # --- Generate a script for PreCmd
+ pre_string=pre_cmd('bayeswave')
+ pre = "pre_bayeswave"
+ f=open(pre,'w')
+ f.writelines(pre_string)
+ f.close()
+ os.chmod(pre,0755)
+
+ self.add_condor_cmd("+PreCmd", '"'+pre+'"')
+ self.add_condor_cmd("+PreArgs", '"'+"$(macrooutputDir)"+'"')
+ # --- End PRE script
+
+ transferstring='pre_bayeswave,datafind'
+ if cp.getboolean('condor','copy-frames'): transferstring+=',$(macroframes)'
+ if injfile is not None: transferstring+=','+injfile
+ if nrdata is not None: transferstring+=','+nrdata
+ if cp.has_option('condor','transfer-files'):
+ # allow specification of additional files to transfer
+ transferstring+=',%s'%cp.get('condor','transfer-files')
+ self.add_condor_cmd('transfer_input_files', transferstring)
+ self.add_condor_cmd('transfer_output_files', '$(macrooutputDir)')
+
#
# [input], [datafind]: Data configuration
#
@@ -864,7 +951,6 @@ class bayeswaveNode(pipeline.CondorDAGNode, pipeline.AnalysisNode):
pipeline.CondorDAGNode.__init__(self,bayeswave_job)
pipeline.AnalysisNode.__init__(self)
- #self.set_retry(3)
def set_trigtime(self, trigtime):
self.add_var_opt('trigtime', '%.9f'%trigtime)
@@ -949,18 +1035,8 @@ class bayeswave_postJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
#
condor_job_config('bayeswave_post',self,cp)
- # --- OSG-specifics unique to this job
- # Files to include in transfer
- if cp.getboolean('condor', 'osg-jobs'):
- transferstring='$(macrooutputDir)'
- if injfile is not None: transferstring+=','+injfile
- if nrdata is not None: transferstring+=','+nrdata
- if cp.has_option('condor','transfer-files'):
- # allow specification of additional files to transfer
- transferstring+=',%s'%cp.get('condor','transfer-files')
- self.add_condor_cmd('transfer_input_files', transferstring)
- self.add_condor_cmd('transfer_output_files', '$(macrooutputDir)')
-
+ if cp.has_option('condor', 'accounting-group'):
+ self.add_condor_cmd('accounting_group', cp.get('condor', 'accounting-group'))
if cp.has_option('condor', 'bayeswave_post-request-memory'):
self.add_condor_cmd('request_memory',
@@ -970,15 +1046,46 @@ class bayeswave_postJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
self.add_condor_cmd('request_disk',
cp.get('condor', 'bayeswave_post-request-disk'))
- self.set_stdout_file('$(macrooutputDir)/bayeswave_post_$(cluster)-$(process)-$(node).out')
- self.set_stderr_file('$(macrooutputDir)/bayeswave_post_$(cluster)-$(process)-$(node).err')
- self.set_log_file('$(macrooutputDir)/bayeswave_post_$(cluster)-$(process)-$(node).log')
+ self.set_stdout_file('logs/bayeswave_post_$(macrooutputDir)-$(cluster)-$(process).out')
+ self.set_stderr_file('logs/bayeswave_post_$(macrooutputDir)-$(cluster)-$(process).err')
+ self.set_log_file('logs/bayeswave_post_$(macrooutputDir)-$(cluster)-$(process).log')
+ if cp.has_option('condor','arch'):
+ self.add_condor_cmd('+arch',cp.get('condor','arch'))
if cp.has_option('condor', 'bayeswave_post-cit-nodes'):
self.add_condor_cmd('+BayesWaveCgroup', 'True')
self.add_condor_cmd('Rank', '(TARGET.BayesWaveCgroup =?= True)')
+
+ #
+ # Singularity configurations
+ #
+ if cp.getboolean('engine','use-singularity'):
+
+ # --- Generate a script for PreCmd
+ pre_string=pre_cmd('bayeswave_post')
+ pre = "pre_bayeswave_post"
+ f=open(pre,'w')
+ f.writelines(pre_string)
+ f.close()
+ os.chmod(pre,0755)
+
+ self.add_condor_cmd("+PreCmd", '"'+pre+'"')
+ self.add_condor_cmd("+PreArgs", '"'+"$(macrooutputDir)"+'"')
+ # --- End PRE script
+
+ transferstring='pre_bayeswave_post,datafind,$(macrooutputDir)'
+ if cp.getboolean('condor','copy-frames'): transferstring+=',$(macroframes)'
+ if injfile is not None: transferstring+=','+injfile
+ if nrdata is not None: transferstring+=','+nrdata
+ if cp.has_option('condor','transfer-files'):
+ # allow specification of additional files to transfer
+ transferstring+=',%s'%cp.get('condor','transfer-files')
+ self.add_condor_cmd('transfer_input_files', transferstring)
+ self.add_condor_cmd('transfer_output_files', '$(macrooutputDir)')
+
+
#
# [input], [datafind]: Data configuration
#
@@ -1237,20 +1344,32 @@ class megaskyJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
if inj is not None:
self.add_opt('inj', inj)
- # --- OSG-specifics unique to this job
- # Files to include in transfer
- if cp.getboolean('condor', 'osg-jobs'):
- transferstring='$(macroargument0)'
- if cp.has_option('condor','transfer-files'):
- # allow specification of additional files to transfer
- transferstring+=',%s'%cp.get('condor','transfer-files')
+ self.set_stdout_file('logs/megasky_$(macroargument0)-$(cluster)-$(process).out')
+ self.set_stderr_file('logs/megasky_$(macroargument0)-$(cluster)-$(process).err')
+ self.set_log_file('logs/megasky_$(macroargument0)-$(cluster)-$(process).log')
+ self.set_sub_file('megasky.sub')
+
+ #
+ # Singularity configurations
+ #
+ if cp.getboolean('engine','use-singularity'):
+
+ # --- Generate a script for PreCmd
+ pre_string=pre_cmd('megasky')
+ pre = "pre_megasky"
+ f=open(pre,'w')
+ f.writelines(pre_string)
+ f.close()
+ os.chmod(pre,0755)
+
+ self.add_condor_cmd("+PreCmd", '"'+pre+'"')
+ self.add_condor_cmd("+PreArgs", '"'+"$(macrooutputDir)"+'"')
+ # --- End PRE script
+
+ transferstring='pre_megasky,$(macroargument0)'
self.add_condor_cmd('transfer_input_files', transferstring)
self.add_condor_cmd('transfer_output_files', '$(macroargument0)')
- self.set_stdout_file('$(macroargument0)/megasky_$(cluster)-$(process)-$(node).out')
- self.set_stderr_file('$(macroargument0)/megasky_$(cluster)-$(process)-$(node).err')
- self.set_log_file('$(macroargument0)/megasky_$(cluster)-$(process)-$(node).log')
- self.set_sub_file('megasky.sub')
class megaskyNode(pipeline.CondorDAGNode, pipeline.AnalysisNode):
@@ -1280,21 +1399,32 @@ class megaplotJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
# --- Common workflow configuration
condor_job_config('megaplot',self,cp)
- # --- OSG-specifics unique to this job
- # Files to include in transfer
- if cp.getboolean('condor', 'osg-jobs'):
- transferstring='$(macroargument0)'
- if cp.has_option('condor','transfer-files'):
- # allow specification of additional files to transfer
- transferstring+=',%s'%cp.get('condor','transfer-files')
+ self.set_stdout_file('logs/megaplot_$(macroargument0)-$(cluster)-$(process).out')
+ self.set_stderr_file('logs/megaplot_$(macroargument0)-$(cluster)-$(process).err')
+ self.set_log_file('logs/megaplot_$(macroargument0)-$(cluster)-$(process).log')
+ self.set_sub_file('megaplot.sub')
+
+ #
+ # Singularity configurations
+ #
+ if cp.getboolean('engine','use-singularity'):
+
+ # --- Generate a script for PreCmd
+ pre_string=pre_cmd('megaplot')
+ pre = "pre_megaplot"
+ f=open(pre,'w')
+ f.writelines(pre_string)
+ f.close()
+ os.chmod(pre,0755)
+
+ self.add_condor_cmd("+PreCmd", '"'+pre+'"')
+ self.add_condor_cmd("+PreArgs", '"'+"$(macrooutputDir)"+'"')
+ # --- End PRE script
+
+ transferstring='pre_megaplot,$(macroargument0)'
self.add_condor_cmd('transfer_input_files', transferstring)
self.add_condor_cmd('transfer_output_files', '$(macroargument0)')
- self.set_stdout_file('$(macroargument0)/megaplot_$(cluster)-$(process)-$(node).out')
- self.set_stderr_file('$(macroargument0)/megaplot_$(cluster)-$(process)-$(node).err')
- self.set_log_file('$(macroargument0)/megaplot_$(cluster)-$(process)-$(node).log')
- self.set_sub_file('megaplot.sub')
-
class megaplotNode(pipeline.CondorDAGNode, pipeline.AnalysisNode):
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914-singularity/LDG-GW150914-singularity.ini b/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914-singularity/LDG-GW150914-singularity.ini
deleted file mode 100644
index 818ca97dc8bab35fb338fab2f28bd1a1c0f636a6..0000000000000000000000000000000000000000
--- a/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914-singularity/LDG-GW150914-singularity.ini
+++ /dev/null
@@ -1,72 +0,0 @@
-[input]
-dataseed=1234
-seglen=2.0
-window=1.0
-flow=32
-srate=512
-
-;PSDstart=1187008818.4457
-;PSDlength=128.0
-;padding=0.0
-
-ifo-list=['H1','L1']
-
-[engine]
-; Paths to bayeswave executables at run time. These should generally be
-; prefixed with e.g., /home/jclark/opt/bayewave for personal
-; installations or /opt/bayeswave/bin for containerized applications
-bayeswave=/opt/bayeswave/bin/BayesWave
-bayeswave_post=/opt/bayeswave/bin/BayesWavePost
-megaplot=/opt/bayeswave/postprocess/megaplot.py
-megasky=/opt/bayeswave/postprocess/skymap/megasky.py
-; Locations of postprocess and utils dirs used to set PYTHONPATH
-postprocess=/opt/bayeswave/postprocess
-utils=/opt/bayeswave/utils
-use-singularity=
-singularity="/cvmfs/ligo-containers.opensciencegrid.org/lscsoft/bayeswave:master"
-
-[datafind]
-channel-list={'H1':'H1:DCS-CALIB_STRAIN_C02','L1':'L1:DCS-CALIB_STRAIN_C02'}
-frtype-list={'H1':'H1_HOFT_C02','L1':'L1_HOFT_C02'}
-url-type=file
-veto-categories=[1]
-
-[bayeswave_options]
-; command line options for BayesWave. See BayesWave --help
-bayesLine=
-updateGeocenterPSD=
-waveletPrior=
-Dmax=100
-signalOnly=
-Niter=500
-NCmin=2
-NCmax=2
-
-[bayeswave_post_options]
-; command line options for BayesWavePost. See BayesWavePost --help
-0noise=
-
-[condor]
-; see e.g., https://ldas-gridmon.ligo.caltech.edu/ldg_accounting/user
-;accounting-group = ligo.prod.o1.burst.paramest.bayeswave
-universe=vanilla
-checkpoint=
-bayeswave-request-memory=4000
-bayeswave_post-request-memory=4000
-datafind=/usr/bin/gw_data_find
-ligolw_print=/usr/bin/ligolw_print
-segfind=/usr/bin/ligolw_segment_query_dqsegdb
-accounting-group = ligo.dev.o3.burst.paramest.bayeswave
-;notify-user=james.clark@ligo.org
-
-[segfind]
-; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
-segment-url=https://segments.ligo.org
-
-[segments]
-; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
-; https://wiki.ligo.org/viewauth/LSC/JRPComm/ObsRun1#Resource_information_40Data_44_segments_44_etc._41
-l1-analyze = L1:DMT-ANALYSIS_READY:1
-h1-analyze = H1:DMT-ANALYSIS_READY:1
-;v1-analyze = V1:ITF_SCIENCEMODE
-
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914-singularity/makework-LDG-GW150914-singularity.sh b/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914-singularity/makework-LDG-GW150914-singularity.sh
deleted file mode 100755
index 80b1dab9234990fe99e30399d2f55de567e4acd7..0000000000000000000000000000000000000000
--- a/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914-singularity/makework-LDG-GW150914-singularity.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-bayeswave_pipe LDG-GW150914-singularity.ini \
- --trigger-time 1126259462.420000076 \
- --workdir LDG-GW150914-singularity2
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914/LDG-GW150914.ini b/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914/LDG-GW150914.ini
index 60d399f37f8c4227d0897bf9b84f21ccee34aee6..536d7fb7eebd6a47217c4e0da46a42c06779250a 100644
--- a/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914/LDG-GW150914.ini
+++ b/BayesWaveUtils/bayeswave_pipe_examples/LDG-GW150914/LDG-GW150914.ini
@@ -5,10 +5,6 @@ window=1.0
flow=32
srate=512
-;PSDstart=1187008818.4457
-;PSDlength=128.0
-;padding=0.0
-
ifo-list=['H1','L1']
[engine]
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/makework-OSG-GW150914-singularity.sh b/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/makework-OSG-GW150914-singularity.sh
deleted file mode 100755
index e874aedd610d8609472f100b34df507016ae002d..0000000000000000000000000000000000000000
--- a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/makework-OSG-GW150914-singularity.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-bayeswave_pipe OSG-GW150914-singularity.ini \
- --osg-jobs \
- --trigger-list times.txt \
- --workdir OSG-GW150914-singularity
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/status.sh b/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/status.sh
deleted file mode 100755
index e7819a1e9c33b0062a40059eeea1eeeb34c508ae..0000000000000000000000000000000000000000
--- a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/status.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-condor_status -const '(regexp("2.4.*",OSG_SINGULARITY_VERSION)) && (IS_GLIDEIN=?=True) && (HAS_LIGO_FRAMES==TRUE)' -pool osg-ligo-1.t2.ucsd.edu
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/times.txt b/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/times.txt
deleted file mode 100644
index d64b1cf89dedc855a9c8101f522868fca5542353..0000000000000000000000000000000000000000
--- a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/times.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-1126259362.42
-1126259364.44
-1126259366.46
-1126259368.48
-1126259370.5
-1126259372.52
-1126259374.54
-1126259376.56
-1126259378.58
-1126259380.6
-1126259382.62
-1126259384.64
-1126259386.66
-1126259388.68
-1126259390.7
-1126259392.72
-1126259394.74
-1126259396.76
-1126259398.78
-1126259400.8
-1126259402.82
-1126259404.84
-1126259406.86
-1126259408.88
-1126259410.9
-1126259412.93
-1126259414.95
-1126259416.97
-1126259418.99
-1126259421.01
-1126259423.03
-1126259425.05
-1126259427.07
-1126259429.09
-1126259431.11
-1126259433.13
-1126259435.15
-1126259437.17
-1126259439.19
-1126259441.21
-1126259443.23
-1126259445.25
-1126259447.27
-1126259449.29
-1126259451.31
-1126259453.33
-1126259455.35
-1126259457.37
-1126259459.39
-1126259461.41
-1126259463.43
-1126259465.45
-1126259467.47
-1126259469.49
-1126259471.51
-1126259473.53
-1126259475.55
-1126259477.57
-1126259479.59
-1126259481.61
-1126259483.63
-1126259485.65
-1126259487.67
-1126259489.69
-1126259491.71
-1126259493.73
-1126259495.75
-1126259497.77
-1126259499.79
-1126259501.81
-1126259503.83
-1126259505.85
-1126259507.87
-1126259509.89
-1126259511.91
-1126259513.94
-1126259515.96
-1126259517.98
-1126259520.0
-1126259522.02
-1126259524.04
-1126259526.06
-1126259528.08
-1126259530.1
-1126259532.12
-1126259534.14
-1126259536.16
-1126259538.18
-1126259540.2
-1126259542.22
-1126259544.24
-1126259546.26
-1126259548.28
-1126259550.3
-1126259552.32
-1126259554.34
-1126259556.36
-1126259558.38
-1126259560.4
-1126259562.42
-
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/100_cwb_triggers.dat b/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/100_cwb_triggers.dat
new file mode 100644
index 0000000000000000000000000000000000000000..2527043f72241eec1ef3a63c29deac600fc1952f
--- /dev/null
+++ b/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/100_cwb_triggers.dat
@@ -0,0 +1,100 @@
++ - 45.6992 0.903 0.937 0.813 53.54 163.000 25 6.6e+03 1.373 0.048 337 153 0.035 1717 0 6843 1185682091.7144 1185775528.7145 3.2e+03 3.5e+03 3.9e-22 4.4e-22 174.11 148.92 332.82
++ - 35.8468 0.842 0.845 0.751 49.38 4.000 48 6.9e+03 1.897 0.124 171 83 0.043 1512 0 14017 1185847050.5283 1185616646.5264 4.6e+03 2.3e+03 4.7e-22 4.3e-22 58.01 77.98 267.51
++ - 28.7834 0.816 0.859 0.659 38.97 471.000 65 4.2e+03 1.833 0.143 204 96 0.038 1181 0 18678 1185469582.0820 1185267511.0817 2.5e+03 1.7e+03 3.0e-22 2.9e-22 48.16 79.19 224.85
++ - 27.5553 0.836 0.851 0.788 34.30 89.000 121 3.5e+03 1.549 0.107 156 68 0.040 927 0 34902 1185352000.1022 1185522311.1046 2.3e+03 1.2e+03 3.4e-22 3.2e-22 240.82 102.02 174.68
++ - 10.9372 0.897 0.849 0.838 11.66 513.000 28 4.4e+02 1.138 0.025 75 26 0.018 103 0 7836 1185700696.6165 1185848983.6071 3.3e+02 1.0e+02 1.3e-22 1.1e-22 117.77 57.91 23.05
++ - 9.2579 0.854 0.819 0.806 10.34 149.000 122 2.7e+02 1.247 0.059 151 68 0.011 70 0 35274 1185277407.8908 1185474058.8816 1.9e+02 8.4e+01 7.9e-23 5.8e-23 116.02 65.05 23.96
++ - 9.2101 0.847 0.909 0.780 10.99 437.000 31 2.8e+02 1.423 0.084 129 53 0.012 74 0 8795 1185601683.0780 1185850846.0826 1.4e+02 1.4e+02 7.4e-23 8.6e-23 41.79 143.57 23.38
++ - 9.1320 0.863 0.815 0.866 9.71 416.000 84 3.1e+02 1.130 0.035 40 14 0.038 80 0 24605 1185519126.2339 1185837910.2393 2.3e+02 8.0e+01 4.2e-22 7.2e-22 32.29 148.54 23.19
++ - 9.1228 0.827 0.807 0.738 10.90 355.000 73 3.5e+02 1.428 0.100 76 31 0.021 94 0 21026 1185614665.6212 1185302310.6194 2.5e+02 9.7e+01 1.2e-22 1.3e-22 85.78 122.44 24.10
++ - 9.0714 0.915 0.877 0.881 9.07 566.000 95 2.0e+02 0.957 -0.009 222 87 0.008 33 0 26574 1185711201.4572 1185475435.4499 5.4e+01 1.4e+02 4.0e-23 6.8e-23 190.51 39.91 17.70
++ - 8.4271 0.864 0.805 0.839 9.45 442.000 9 2.5e+02 1.258 0.058 43 11 0.027 74 0 2385 1185433372.0370 1185790530.0313 1.9e+02 6.3e+01 1.4e-22 2.1e-22 209.12 31.46 16.83
++ - 8.3382 0.932 0.895 0.909 8.34 233.000 71 1.9e+02 0.906 -0.017 39 10 0.028 59 0 20763 1185614643.1158 1185872410.1221 1.5e+02 4.7e+01 1.5e-22 2.5e-22 20.30 149.68 13.48
++ - 8.2119 0.841 0.866 0.824 9.25 285.000 119 2.0e+02 1.268 0.077 155 84 0.010 47 0 34334 1185780849.3302 1185278964.3240 8.5e+01 1.2e+02 5.1e-23 7.5e-23 202.50 55.41 18.98
++ - 8.0044 0.865 0.883 0.806 8.44 86.000 87 2.0e+02 1.111 0.028 238 125 0.006 31 0 25000 1185921361.4422 1185386075.4453 1.3e+02 6.9e+01 6.7e-23 4.8e-23 278.79 57.91 18.74
++ - 7.9458 0.811 0.891 0.722 8.73 211.000 122 2.1e+02 1.207 0.078 144 81 0.024 45 0 35275 1185278846.4516 1185475435.4486 1.1e+02 9.4e+01 6.9e-23 8.1e-23 234.08 44.61 22.55
++ - 7.9184 0.912 0.877 0.859 8.42 589.000 67 1.6e+02 1.130 0.021 39 10 0.025 47 0 19745 1185676636.9765 1185565647.9838 1.1e+02 4.9e+01 1.3e-22 2.3e-22 11.35 136.96 10.76
++ - 7.8680 0.906 0.907 0.848 7.87 546.000 119 1.4e+02 0.989 -0.002 161 51 0.008 32 0 34314 1185756660.9431 1185254514.9489 5.1e+01 9.3e+01 3.7e-23 5.5e-23 27.44 133.80 14.13
++ - 7.8341 0.850 0.814 0.829 8.44 246.000 97 1.6e+02 1.160 0.059 91 4 0.265 29 0 27152 1185669073.5031 1185374827.5060 1.2e+02 4.2e+01 5.7e-23 4.5e-23 273.52 61.03 17.18
++ - 7.7969 0.831 0.828 0.797 8.50 265.000 17 2.6e+02 1.189 0.074 499 1 0.596 54 0 4627 1185707886.4190 1185921221.4108 1.9e+02 6.8e+01 1.3e-22 6.3e-23 127.27 94.48 18.17
++ - 7.7196 0.927 0.931 0.779 7.72 328.000 123 1.1e+02 0.896 -0.013 334 3 0.398 19 0 35897 1185531104.2859 1185878776.2808 7.0e+01 4.2e+01 5.1e-23 3.8e-23 102.30 107.58 11.13
++ - 7.7095 0.870 0.834 0.855 7.71 166.000 106 2.6e+02 0.943 -0.007 500 2 0.202 70 0 29595 1185458033.3383 1185433867.3456 2.0e+02 5.5e+01 1.5e-22 7.6e-23 311.13 74.91 17.82
++ - 7.6864 0.819 0.801 0.776 8.56 33.000 113 2.4e+02 1.239 0.082 136 54 0.010 49 0 32682 1185361250.1074 1185889217.1017 1.7e+02 6.6e+01 7.9e-23 5.6e-23 116.37 112.67 19.23
++ - 7.6549 0.889 0.861 0.858 7.65 243.000 102 1.8e+02 0.949 -0.002 47 13 0.021 58 0 28388 1185614643.1156 1185555600.1104 1.3e+02 4.5e+01 1.3e-22 1.7e-22 215.65 28.43 13.94
++ - 7.6514 0.849 0.882 0.707 8.78 299.000 117 1.7e+02 1.317 0.070 252 104 0.007 29 0 33617 1185607573.9863 1185522074.9850 7.1e+01 9.9e+01 4.5e-23 5.6e-23 248.04 46.99 16.69
++ - 7.6412 0.936 0.927 0.798 7.64 223.000 117 8.9e+01 0.973 -0.004 415 3 0.212 16 0 33613 1185602754.9385 1185517331.9336 3.4e+01 5.5e+01 3.4e-23 4.9e-23 217.14 38.36 9.45
++ - 7.6397 0.859 0.887 0.837 8.18 516.000 76 1.4e+02 1.146 0.039 473 8 0.094 46 0 22299 1185301305.9502 1185813189.9502 7.8e+01 6.2e+01 5.7e-23 5.2e-23 76.29 129.45 16.44
++ - 7.6224 0.885 0.869 0.865 7.62 429.000 37 2.4e+02 0.933 -0.008 500 1 0.485 42 0 10444 1185707886.5261 1185299457.5337 1.8e+02 6.0e+01 1.3e-22 6.6e-23 312.89 77.67 15.51
++ - 7.6167 0.929 0.903 0.770 7.62 450.000 124 1.2e+02 0.894 -0.021 140 73 0.007 22 0 36159 1185501821.9633 1185791771.9582 8.6e+01 3.8e+01 5.2e-23 4.3e-23 101.25 107.27 12.33
++ - 7.5961 0.816 0.806 0.800 8.64 400.000 97 2.2e+02 1.293 0.084 235 145 0.006 33 0 27362 1185921361.4420 1185626961.4365 1.5e+02 7.2e+01 7.2e-23 5.5e-23 111.45 112.02 21.28
++ - 7.5873 0.909 0.865 0.840 7.59 269.000 98 1.4e+02 0.931 -0.013 266 3 0.311 23 0 27423 1185697576.1331 1185301307.1417 3.2e+01 1.1e+02 2.8e-23 5.5e-23 349.77 138.92 13.19
++ - 7.5660 0.943 0.897 0.921 7.57 124.000 80 4.2e+02 0.835 -0.019 54 21 0.012 16 0 23343 1185353046.8942 1185388922.9011 3.8e+02 3.8e+01 1.6e-22 8.7e-23 310.08 72.10 9.24
++ - 7.5643 0.876 0.812 0.828 8.13 217.000 8 2.5e+02 1.154 0.034 71 32 0.013 51 0 2087 1185329090.0757 1185766873.0789 2.0e+02 4.9e+01 1.1e-22 9.3e-23 274.22 62.38 14.87
++ - 7.5507 0.886 0.814 0.871 8.27 295.000 12 7.5e+02 1.200 0.041 49 21 0.012 36 0 3268 1185474451.1743 1185675756.1809 7.0e+02 5.6e+01 2.4e-22 1.3e-22 323.79 67.98 12.39
++ - 7.5320 0.920 0.904 0.834 7.53 68.000 84 1.2e+02 1.000 -0.000 545 4 0.089 16 0 24424 1185301838.8359 1185620970.8413 4.7e+01 6.9e+01 4.8e-23 6.1e-23 33.32 141.26 10.92
++ - 7.5306 0.921 0.883 0.885 7.53 593.000 117 2.6e+02 0.821 -0.048 63 24 0.018 49 0 33623 1185614665.6268 1185530072.6242 2.2e+02 4.7e+01 1.2e-22 9.7e-23 90.70 119.66 16.10
++ - 7.5202 0.924 0.945 0.876 7.56 361.000 124 1.0e+02 1.009 0.002 97 2 0.234 15 0 36158 1185500653.8060 1185790692.8104 5.3e+01 4.8e+01 3.6e-23 4.5e-23 42.61 137.75 10.19
++ - 7.5178 0.933 0.939 0.881 7.52 83.000 42 1.1e+02 0.911 -0.016 72 1 0.592 18 0 11645 1185464104.2076 1185344021.2021 6.4e+01 4.3e+01 5.2e-23 7.6e-23 210.82 34.13 10.94
++ - 7.5104 0.916 0.911 0.913 7.51 151.000 123 1.6e+02 0.908 -0.005 500 1 0.168 39 0 35835 1185456584.7020 1185805099.6946 1.1e+02 4.9e+01 1.3e-22 7.3e-23 124.80 102.02 10.86
++ - 7.4994 0.898 0.866 0.858 7.50 470.000 75 1.2e+02 0.982 -0.004 278 130 0.006 20 0 21931 1185551849.2179 1185373779.2242 8.6e+01 3.8e+01 5.3e-23 3.5e-23 284.06 81.31 14.32
++ - 7.4932 0.975 0.979 0.954 7.49 87.000 102 9.3e+01 0.662 -0.053 710 5 0.221 17 0 28654 1185934168.3149 1185875281.3144 5.4e+01 3.9e+01 6.2e-23 6.4e-23 253.12 48.59 9.81
++ - 7.4895 0.924 0.934 0.842 7.49 16.000 35 1.0e+02 0.964 -0.006 69 1 0.684 17 0 10069 1185331201.2640 1185872385.2595 5.7e+01 4.7e+01 5.1e-23 6.8e-23 220.50 41.08 10.96
++ - 7.4766 0.878 0.847 0.882 7.53 474.000 120 1.5e+02 1.015 0.004 123 43 0.020 33 0 34683 1185780143.6252 1185507269.6163 5.0e+01 9.8e+01 4.0e-23 7.0e-23 160.77 41.08 15.67
++ - 7.4751 0.911 0.846 0.886 7.52 35.000 106 1.6e+02 1.012 0.004 43 13 0.020 45 0 29727 1185616568.6726 1185592533.6694 1.2e+02 3.3e+01 1.2e-22 1.5e-22 234.25 39.91 11.05
++ - 7.4706 0.880 0.813 0.803 8.10 11.000 102 7.2e+02 1.175 0.038 34 10 0.024 57 0 28316 1185528972.3452 1185470161.3471 6.6e+02 6.1e+01 4.2e-22 3.8e-22 239.41 98.39 13.51
++ - 7.4684 0.959 0.971 0.941 7.47 388.000 66 1.1e+02 0.845 -0.019 500 0 0.526 14 0 19078 1185457333.3316 1185257745.3295 5.2e+01 5.5e+01 1.1e-22 9.2e-23 87.89 121.74 7.95
++ - 7.4674 0.933 0.935 0.910 7.47 6.000 108 1.0e+02 0.886 -0.021 116 3 0.194 16 0 30849 1185762300.4906 1185692694.4905 5.6e+01 4.6e+01 4.2e-23 4.0e-23 77.34 129.07 11.46
++ - 7.4664 0.939 0.934 0.913 7.47 208.000 52 1.3e+02 0.996 -0.001 94 27 0.009 24 0 15126 1185582791.6151 1185848983.6074 4.4e+01 8.8e+01 3.8e-23 7.5e-23 187.03 55.41 8.12
++ - 7.4634 0.897 0.904 0.849 7.59 371.000 49 1.2e+02 1.035 0.008 430 4 0.286 19 0 14295 1185488569.0576 1185929798.0553 6.2e+01 5.3e+01 5.0e-23 4.7e-23 88.95 120.69 13.33
++ - 7.4584 0.822 0.829 0.767 8.64 359.000 92 1.9e+02 1.343 0.089 260 66 0.011 44 0 25860 1185681670.5435 1185550511.5386 6.4e+01 1.2e+02 4.3e-23 6.0e-23 216.65 46.59 19.30
++ - 7.4513 0.873 0.887 0.781 8.12 133.000 65 1.6e+02 1.186 0.039 215 85 0.007 26 0 18852 1185678368.4554 1185475435.4499 6.0e+01 1.0e+02 4.2e-23 5.7e-23 209.64 47.39 14.96
++ - 7.4501 0.909 0.936 0.740 8.09 496.000 54 1.2e+02 1.180 0.026 94 1 0.485 28 0 15812 1185623731.5503 1185508035.5582 5.1e+01 6.9e+01 3.8e-23 8.3e-23 4.92 126.80 10.23
++ - 7.4473 0.838 0.858 0.783 8.25 562.000 28 2.0e+02 1.227 0.073 152 86 0.007 30 0 7484 1185277407.8907 1185426845.8878 1.3e+02 6.7e+01 7.0e-23 5.8e-23 97.03 121.74 15.93
++ - 7.4308 0.914 0.898 0.856 7.43 148.000 66 1.3e+02 0.946 -0.011 65 17 0.024 39 0 19155 1185550005.1848 1185349457.1895 8.6e+01 4.3e+01 7.0e-23 8.3e-23 276.68 73.04 12.60
++ - 7.4242 0.912 0.896 0.888 7.42 408.000 44 1.6e+02 0.888 -0.015 501 2 0.193 46 0 12593 1185417445.6211 1185475837.6292 1.2e+02 4.4e+01 1.0e-22 5.2e-23 301.29 87.61 12.94
++ - 7.4211 0.962 0.937 0.863 7.42 227.000 34 8.4e+01 0.825 -0.021 355 5 0.159 16 0 9609 1185471092.3254 1185467265.3202 6.4e+01 2.0e+01 4.5e-23 2.4e-23 102.30 107.58 7.69
++ - 7.4199 0.872 0.867 0.776 7.95 371.000 55 1.5e+02 1.149 0.034 333 5 0.413 34 0 16193 1185789108.6705 1185387937.6736 5.8e+01 9.6e+01 4.3e-23 5.4e-23 54.24 138.14 15.35
++ - 7.4113 0.876 0.818 0.844 7.41 119.000 94 2.3e+02 0.974 -0.001 57 19 0.018 64 0 26310 1185390206.9418 1185850887.9431 1.9e+02 4.3e+01 1.1e-22 1.1e-22 265.08 53.95 15.74
++ - 7.4079 0.909 0.849 0.849 7.41 71.000 82 1.2e+02 0.993 -0.001 364 4 0.208 18 0 24316 1185351036.0005 1185931765.0078 8.5e+01 3.2e+01 5.5e-23 3.3e-23 292.15 84.62 12.20
++ - 7.3980 0.928 0.923 0.927 7.40 170.000 67 1.2e+02 0.892 -0.021 202 49 0.009 24 0 19737 1185666487.1728 1185555917.1750 5.0e+01 7.3e+01 3.7e-23 4.5e-23 60.88 135.39 11.75
++ - 7.3972 0.878 0.869 0.842 7.44 488.000 112 1.7e+02 1.011 0.003 154 33 0.015 42 0 32319 1185397563.1669 1185617875.1607 5.6e+01 1.2e+02 3.8e-23 5.7e-23 203.20 51.70 16.04
++ - 7.3932 0.905 0.867 0.876 7.39 561.000 80 3.3e+02 0.932 -0.007 50 17 0.018 42 0 23723 1185809240.8684 1185845879.8699 2.9e+02 4.4e+01 1.6e-22 1.4e-22 237.30 97.78 12.64
++ - 7.3897 0.936 0.936 0.903 7.39 305.000 65 1.2e+02 0.850 -0.029 230 91 0.005 16 0 18949 1185794780.2136 1185591675.2185 4.5e+01 7.6e+01 3.6e-23 4.7e-23 36.89 138.53 11.62
++ - 7.3893 0.907 0.866 0.888 7.39 344.000 124 1.2e+02 0.946 -0.013 262 151 0.005 17 0 36200 1185551849.2202 1185840705.2268 8.5e+01 3.7e+01 5.3e-23 3.5e-23 285.47 83.72 13.54
++ - 7.3851 0.938 0.951 0.874 7.39 550.000 78 7.9e+01 0.927 -0.011 595 4 0.136 17 0 22989 1185591434.0877 1185719284.0833 3.9e+01 4.0e+01 4.7e-23 5.1e-23 223.14 36.04 9.43
++ - 7.3838 0.869 0.835 0.852 7.40 145.000 4 1.6e+02 1.005 0.003 153 40 0.014 42 0 1610 1185466852.1487 1185709107.1578 4.8e+01 1.1e+02 3.7e-23 6.3e-23 339.87 137.36 16.05
++ - 7.3801 0.904 0.871 0.892 7.38 100.000 81 2.4e+02 0.998 0.012 55 16 0.015 39 0 24178 1185700266.2061 1185876566.2048 1.9e+02 4.1e+01 1.2e-22 9.9e-23 85.08 126.05 9.94
++ - 7.3760 0.927 0.905 0.879 7.38 403.000 24 2.2e+02 0.795 -0.039 500 2 0.106 60 0 6413 1185707582.2974 1185857179.3049 1.8e+02 4.2e+01 1.3e-22 6.4e-23 312.54 76.75 13.02
++ - 7.3711 0.893 0.895 0.865 7.48 297.000 115 1.7e+02 1.030 0.007 172 74 0.007 22 0 33176 1185806283.8740 1185598386.8674 5.6e+01 1.2e+02 4.1e-23 6.5e-23 199.34 54.31 13.60
++ - 7.3705 0.931 0.880 0.881 7.37 386.000 24 1.4e+02 0.840 -0.035 44 1 1.533 22 0 6063 1185286813.2278 1185437627.2328 1.1e+02 3.1e+01 9.7e-23 1.3e-22 38.65 148.54 12.87
++ - 7.3602 0.874 0.880 0.876 7.54 178.000 102 1.4e+02 1.051 0.013 232 104 0.006 20 0 28237 1185434006.2046 1185375028.2034 8.2e+01 6.0e+01 4.9e-23 4.6e-23 82.62 124.95 15.59
++ - 7.3556 0.895 0.936 0.835 7.65 431.000 1 1.1e+02 1.083 0.029 104 5 0.089 34 0 867 1185779181.2489 1185591550.2463 5.5e+01 5.2e+01 3.7e-23 4.4e-23 238.08 43.82 10.63
++ - 7.3540 0.972 0.966 0.933 7.35 416.000 44 7.4e+01 0.753 -0.029 249 2 0.223 15 0 12663 1185500456.0453 1185560040.0495 4.8e+01 2.6e+01 3.7e-23 2.5e-23 278.09 66.68 7.27
++ - 7.3454 0.961 0.965 0.951 7.35 352.000 66 1.1e+02 0.888 -0.012 500 1 0.357 15 0 19078 1185457297.0621 1185257745.0666 6.5e+01 4.2e+01 1.2e-22 7.9e-23 279.49 68.62 6.67
++ - 7.3449 0.909 0.905 0.886 7.35 484.000 80 1.2e+02 0.991 -0.002 123 3 0.144 26 0 23337 1185345804.2111 1185382520.2072 7.1e+01 4.8e+01 4.4e-23 3.9e-23 97.38 114.62 12.04
++ - 7.3372 0.901 0.848 0.889 7.34 498.000 114 3.2e+02 0.984 -0.004 77 43 0.008 24 0 32806 1185847050.2178 1185346152.2114 2.8e+02 4.2e+01 1.2e-22 7.2e-23 126.21 110.74 13.24
++ - 7.3369 0.959 0.954 0.925 7.34 521.000 28 8.6e+01 0.790 -0.031 212 4 0.311 14 0 7645 1185470812.8279 1185620291.8290 3.0e+01 5.6e+01 2.8e-23 3.6e-23 69.88 133.80 8.93
++ - 7.3335 0.908 0.918 0.873 7.33 2.000 20 1.2e+02 0.929 -0.017 216 95 0.006 20 0 5098 1185501238.5708 1185884036.5765 4.3e+01 7.4e+01 3.5e-23 5.0e-23 29.07 137.75 13.68
++ - 7.3279 0.897 0.829 0.920 7.40 145.000 94 1.6e+02 1.020 0.004 35 6 0.724 19 0 26205 1185264096.4730 1185725951.4665 1.1e+02 4.3e+01 1.7e-22 3.1e-22 198.47 35.28 12.87
++ - 7.3244 0.898 0.921 0.851 7.32 267.000 90 1.1e+02 0.979 -0.005 550 1 0.640 18 0 25078 1185530832.7718 1185244965.7678 4.4e+01 6.1e+01 4.8e-23 5.5e-23 227.62 38.36 13.50
++ - 7.3222 0.864 0.895 0.831 7.93 438.000 112 1.6e+02 1.174 0.041 162 59 0.009 34 0 32303 1185378024.8636 1185598386.8677 6.8e+01 9.0e+01 4.3e-23 5.4e-23 43.19 133.41 15.49
++ - 7.3041 0.946 0.895 0.940 7.30 354.000 35 1.2e+02 0.831 -0.029 44 2 0.776 15 0 10019 1185272010.9756 1185811656.9788 9.5e+01 2.6e+01 9.3e-23 1.1e-22 54.25 140.09 10.17
++ - 7.3015 0.870 0.849 0.805 7.65 550.000 18 1.3e+02 1.097 0.025 84 3 0.368 39 0 4725 1185347622.0473 1185801872.0387 4.6e+01 7.9e+01 3.6e-23 6.8e-23 172.88 45.01 14.31
++ - 7.2918 0.908 0.903 0.860 7.36 496.000 112 1.0e+02 1.020 0.004 83 2 0.606 17 0 32473 1185582545.0673 1185802662.0756 3.9e+01 6.2e+01 3.5e-23 6.8e-23 359.64 133.01 11.28
++ - 7.2899 0.877 0.819 0.839 7.29 7.000 57 1.8e+02 0.936 -0.020 235 94 0.007 32 0 16541 1185338748.5248 1185599141.5337 1.4e+02 3.9e+01 6.5e-23 3.5e-23 299.53 98.69 17.10
++ - 7.2896 0.928 0.905 0.841 7.29 435.000 46 9.6e+01 0.902 -0.019 100 3 0.355 20 0 13057 1185298677.1911 1185715842.1831 3.0e+01 6.6e+01 2.7e-23 5.5e-23 182.60 45.40 11.16
++ - 7.2721 0.919 0.861 0.906 7.27 559.000 120 4.3e+02 0.991 -0.002 54 22 0.016 17 0 34575 1185650897.8104 1185377938.8166 3.9e+02 3.9e+01 1.6e-22 9.1e-23 314.30 65.70 10.53
++ - 7.2617 0.830 0.891 0.756 8.58 134.000 59 1.5e+02 1.395 0.090 111 53 0.018 38 0 17119 1185404203.6122 1185507269.6147 7.8e+01 7.4e+01 6.0e-23 7.1e-23 59.35 136.57 17.24
++ - 7.2613 0.941 0.953 0.912 7.26 479.000 42 8.8e+01 0.945 -0.008 134 4 0.201 16 0 11919 1185793175.7662 1185672696.7664 4.7e+01 4.1e+01 3.2e-23 3.5e-23 257.34 50.93 8.24
++ - 7.2509 0.873 0.895 0.768 7.58 563.000 120 1.3e+02 1.093 0.030 96 2 0.592 26 0 34466 1185519971.0084 1185247008.0002 5.2e+01 8.1e+01 3.6e-23 7.5e-23 182.11 50.93 13.52
++ - 7.2481 0.867 0.909 0.752 7.70 447.000 96 1.2e+02 1.130 0.042 206 85 0.007 32 0 26771 1185610161.9501 1185254514.9476 5.3e+01 7.1e+01 3.9e-23 4.9e-23 238.61 44.61 12.72
++ - 7.2462 0.912 0.893 0.913 7.27 142.000 105 1.4e+02 1.006 0.006 500 2 0.110 42 0 29231 1185688993.8360 1185340851.8286 9.9e+01 3.9e+01 1.0e-22 4.8e-23 121.99 100.81 9.83
++ - 7.2304 0.919 0.898 0.881 7.23 104.000 65 1.7e+02 0.931 -0.014 79 32 0.013 29 0 18739 1185542437.4686 1185340733.4702 1.3e+02 4.5e+01 7.3e-23 6.5e-23 265.78 55.41 11.58
++ - 7.2247 0.903 0.910 0.878 7.29 107.000 71 1.1e+02 1.017 0.003 117 2 0.349 25 0 20489 1185286723.4187 1185544616.4180 6.8e+01 4.4e+01 4.7e-23 4.2e-23 80.16 126.80 11.96
++ - 7.2127 0.920 0.936 0.860 7.21 185.000 75 1.2e+02 0.956 -0.006 500 1 0.778 23 0 21852 1185456703.0659 1185279584.0737 7.3e+01 4.9e+01 1.3e-22 6.6e-23 309.02 79.80 9.94
++ - 7.2121 0.901 0.893 0.856 7.21 521.000 50 1.3e+02 0.995 -0.001 67 2 0.194 22 0 14528 1185929537.1276 1185516216.1229 9.0e+01 4.0e+01 5.6e-23 6.5e-23 96.68 106.96 12.53
++ - 7.2089 0.919 0.906 0.898 7.34 527.000 43 1.2e+02 1.036 0.006 149 54 0.005 17 0 12047 1185254971.3151 1185452444.3147 7.6e+01 4.2e+01 4.6e-23 3.8e-23 80.16 129.07 9.60
++ - 7.2077 0.959 0.971 0.951 7.21 561.000 66 1.1e+02 0.780 -0.033 500 1 0.477 17 0 19078 1185457506.1802 1185257745.1793 5.5e+01 5.5e+01 1.0e-22 8.6e-23 81.91 125.69 8.88
++ - 7.2076 0.884 0.851 0.856 7.77 185.000 121 3.2e+02 1.162 0.032 85 39 0.008 22 0 34886 1185332624.2799 1185502839.2852 2.6e+02 5.9e+01 1.1e-22 7.9e-23 310.08 60.34 12.98
++ - 7.2054 0.942 0.946 0.889 7.21 434.000 59 1.0e+02 0.838 -0.029 527 2 0.197 18 0 17070 1185344662.0398 1185448628.0391 4.1e+01 6.2e+01 4.5e-23 5.4e-23 252.42 48.59 10.37
++ - 7.2032 0.911 0.857 0.848 7.20 519.000 70 1.2e+02 0.907 -0.020 192 42 0.009 31 0 20232 1185361898.7654 1185668579.7578 3.2e+01 9.0e+01 2.9e-23 4.9e-23 184.76 38.74 12.51
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/OSG-GW150914-singularity.ini b/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/O2background.ini
similarity index 69%
rename from BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/OSG-GW150914-singularity.ini
rename to BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/O2background.ini
index acf242a67594dbae4ac0df318723ca09157b2cfa..a9ae232db74faaafb731e953e6434af48f069cb1 100644
--- a/BayesWaveUtils/bayeswave_pipe_examples/OSG-GW150914-singularity/OSG-GW150914-singularity.ini
+++ b/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/O2background.ini
@@ -1,30 +1,41 @@
[input]
dataseed=1234
-seglen=2.0
+seglen=4.0
window=1.0
flow=32
-srate=512
+srate=2048
+min-srate=256
+max-srate=256
+min-flow=32
+max-flow=32
+min-window=1
+max-window=1
+min-seglen=4
+max-seglen=4
-;PSDstart=1187008818.4457
-;PSDlength=128.0
-;padding=0.0
+PSDlength=4.0
+padding=0.0
+
+;keep-frac=0.25
+;rho-threshold=7.0
ifo-list=['H1','L1']
[engine]
; Paths to bayeswave executables at run time. These should generally be
; prefixed with e.g., /home/jclark/opt/bayewave for personal
-; installations or /opt/bayeswave/bin for containerized applications
+; installations or /opt/bayeswave/bin for containerized applications
bayeswave=/opt/bayeswave/bin/BayesWave
bayeswave_post=/opt/bayeswave/bin/BayesWavePost
megaplot=/opt/bayeswave/bin/megaplot.py
megasky=/opt/bayeswave/bin/megasky.py
-singularity="/cvmfs/ligo-containers.opensciencegrid.org/lscsoft/bayeswave:master"
-use-singularity=
+singularity="/cvmfs/ligo-containers.opensciencegrid.org/lscsoft/bayeswave/production"
[datafind]
-channel-list={'H1':'H1:DCS-CALIB_STRAIN_C02','L1':'L1:DCS-CALIB_STRAIN_C02'}
-frtype-list={'H1':'H1_HOFT_C02','L1':'L1_HOFT_C02'}
+channel-list={'H1':'H1:DCH-CLEAN_STRAIN_C02','L1':'L1:DCH-CLEAN_STRAIN_C02'}
+frtype-list={'H1':'H1_CLEANED_HOFT_C02','L1':'L1_CLEANED_HOFT_C02'}
+;channel-list={'H1':'H1:DCS-CALIB_STRAIN_C02','L1':'L1:DCS-CALIB_STRAIN_C02'}
+;frtype-list={'H1':'H1_HOFT_C02','L1':'L1_HOFT_C02'}
url-type=file
veto-categories=[1]
@@ -34,11 +45,11 @@ bayesLine=
updateGeocenterPSD=
waveletPrior=
Dmax=100
-signalOnly=
-Niter=500
+Niter=1000
NCmin=2
NCmax=2
+
[bayeswave_post_options]
; command line options for BayesWavePost. See BayesWavePost --help
0noise=
@@ -48,14 +59,15 @@ NCmax=2
;accounting-group = ligo.prod.o1.burst.paramest.bayeswave
universe=vanilla
checkpoint=
-bayeswave-request-memory=4000
+bayeswave-request-memory=1000
bayeswave_post-request-memory=4000
datafind=/usr/bin/gw_data_find
ligolw_print=/usr/bin/ligolw_print
segfind=/usr/bin/ligolw_segment_query_dqsegdb
accounting-group = ligo.dev.o3.burst.paramest.bayeswave
-;notify-user=james.clark@ligo.org
-;desired-sites="Wisconsin"
+;notify-user=jclark
+;notification=Error
+;desired-sites="LIGO-CIT","LIGO-WA","LIGO-LLO"
[segfind]
; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/makework-O2background.sh b/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/makework-O2background.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a39904b27a7d6205449a6dc2aaf962332efffcb9
--- /dev/null
+++ b/BayesWaveUtils/bayeswave_pipe_examples/OSG-O2background/makework-O2background.sh
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+
+bayeswave_pipe \
+ O2background.ini \
+ --workdir O2background \
+ --cwb-trigger-list 100_cwb_triggers.dat \
+ --osg-jobs \
+ --glide-in \
+ --skip-post \
+ --skip-megapy
+
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/ldg-lalsim.ini b/BayesWaveUtils/bayeswave_pipe_examples/old-configs/ldg-lalsim.ini
index 558b76d733403fdd49a42f26a926f6b93093b591..e5308a5ed375b1645d9fa9a8760e2ff57029ee9f 100644
--- a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/ldg-lalsim.ini
+++ b/BayesWaveUtils/bayeswave_pipe_examples/old-configs/ldg-lalsim.ini
@@ -5,9 +5,6 @@ window=1.0
flow=32
srate=512
-PSDstart=1187008818.4457
-PSDlength=128.0
-
padding=0.0
ifo-list=['H1','L1','V1']
@@ -27,7 +24,7 @@ url-type=file
veto-categories=[1]
[injections]
-injfile=HLV-INJECTIONS-SEOB.xml
+injfile=HLV-INJECTIONS-IMRPhenomPv2.xml
events=all
[bayeswave_options]
@@ -55,7 +52,7 @@ bayeswave_post-request-memory=4000
datafind=/usr/bin/gw_data_find
ligolw_print=/usr/bin/ligolw_print
segfind=/usr/bin/ligolw_segment_query_dqsegdb
-accounting_group = ligo.prod.o2.burst.paramest.bayeswave
+accounting-group = ligo.prod.o2.burst.paramest.bayeswave
[segfind]
; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/ldg-singularity.ini b/BayesWaveUtils/bayeswave_pipe_examples/old-configs/ldg-singularity.ini
deleted file mode 100644
index 11a6fe875e55f3cab23237760c5ff07d001693c7..0000000000000000000000000000000000000000
--- a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/ldg-singularity.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-[input]
-dataseed=1234
-seglen=2.0
-window=1.0
-flow=32
-srate=512
-
-PSDstart=1187008818.4457
-PSDlength=128.0
-
-padding=0.0
-ifo-list=['H1','L1','V1']
-
-[engine]
-bayeswave=/opt/bayeswave/bin/bayeswave
-bayeswave_post=/opt/bayeswave/bin/bayeswave_post
-megaplot=/opt/bayeswave/postprocess/megaplot.py
-megasky=/opt/bayeswave/postprocess/skymap/megasky.py
-postprocess=/opt/bayeswave/postprocess
-utils=/opt/bayeswave/utils
-singularity="/home/jclark/test-bw-singularity/bayeswave-o2_online.img"
-
-
-[datafind]
-channel-list={'H1':'H1:GDS-CALIB_STRAIN','L1':'L1:GDS-CALIB_STRAIN','V1':'V1:Hrec_hoft_16384Hz','G1':'G1:DER_DATA_H_HP'}
-frtype-list={'H1':'LALSimAdLIGO','L1':'LALSimAdLIGO','V1':'LALSimAdVirgo'}
-url-type=file
-veto-categories=[1]
-
-[bayeswave_options]
-; command line options for bayeswave
-0noise=
-updateGeocenterPSD=
-waveletPrior=
-Dmax=100
-signalOnly=
-Niter=500
-NCmin=2
-NCmax=2
-
-[bayeswave_post_options]
-; command line options for bayeswave_post
-0noise=
-
-[condor]
-; see e.g., https://ldas-gridmon.ligo.caltech.edu/ldg_accounting/user
-;accounting_group = ligo.prod.o1.burst.paramest.bayeswave
-universe=vanilla
-checkpoint=
-bayeswave-request-memory=4000
-bayeswave_post-request-memory=4000
-datafind=/usr/bin/gw_data_find
-ligolw_print=/usr/bin/ligolw_print
-segfind=/usr/bin/ligolw_segment_query_dqsegdb
-accounting_group = ligo.prod.o2.burst.paramest.bayeswave
-
-[segfind]
-; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
-segment-url=https://segments.ligo.org
-
-[segments]
-; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
-; https://wiki.ligo.org/viewauth/LSC/JRPComm/ObsRun1#Resource_information_40Data_44_segments_44_etc._41
-l1-analyze = L1:DMT-ANALYSIS_READY:1
-h1-analyze = H1:DMT-ANALYSIS_READY:1
-;v1-analyze = V1:ITF_SCIENCEMODE
-
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/make_siminsipral.sh b/BayesWaveUtils/bayeswave_pipe_examples/old-configs/make_siminsipral.sh
index 3e91643a3a5ea79afc5729899abdc039d39165e3..1b8b3dd52924bb173eed8530361a0e805dcc875a 100755
--- a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/make_siminsipral.sh
+++ b/BayesWaveUtils/bayeswave_pipe_examples/old-configs/make_siminsipral.sh
@@ -7,12 +7,12 @@
seed=`lalapps_tconvert now`
gpsstart=`lalapps_tconvert now`
gpsend=$((${gpsstart} + 10))
-outfile="HLV-INJECTIONS-SEOB.xml"
+outfile="HLV-INJECTIONS-IMRPhenomPv2.xml"
lalapps_inspinj \
--seed ${seed} --f-lower 20 --gps-start-time ${gpsstart} \
- --gps-end-time ${gpsend} --waveform SEOBNRv2threePointFivePN \
+ --gps-end-time ${gpsend} --waveform IMRPhenomPv2ThreePointFivePN \
--amp-order 0 \
--time-step 10 --time-interval 5 --l-distr random \
--i-distr uniform --disable-spin \
diff --git a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/osg-gw150914.ini b/BayesWaveUtils/bayeswave_pipe_examples/old-configs/osg-gw150914.ini
deleted file mode 100644
index bb35130f79e2291972bfa161845f355c95fc4d21..0000000000000000000000000000000000000000
--- a/BayesWaveUtils/bayeswave_pipe_examples/old-configs/osg-gw150914.ini
+++ /dev/null
@@ -1,68 +0,0 @@
-[input]
-dataseed=1234
-seglen=2.0
-window=1.0
-flow=32
-srate=512
-
-PSDstart=1187008818.4457
-PSDlength=128.0
-
-padding=0.0
-ifo-list=['H1','L1','V1']
-
-[engine]
-bayeswave=/opt/bayeswave/bin/bayeswave
-bayeswave_post=/opt/bayeswave/bin/bayeswave_post
-megaplot=/opt/bayeswave/postprocess/megaplot.py
-megasky=/opt/bayeswave/postprocess/skymap/megasky.py
-postprocess=/opt/bayeswave/postprocess
-utils=/opt/bayeswave/utils
-singularity="/home/jclark/test-bw-singularity/bayeswave-o2_online.img"
-
-
-[datafind]
-channel-list={'H1':'H1:GDS-CALIB_STRAIN','L1':'L1:GDS-CALIB_STRAIN','V1':'V1:Hrec_hoft_16384Hz','G1':'G1:DER_DATA_H_HP'}
-frtype-list={'H1':'LALSimAdLIGO','L1':'LALSimAdLIGO','V1':'LALSimAdVirgo'}
-url-type=file
-veto-categories=[1]
-
-[bayeswave_options]
-; command line options for bayeswave
-0noise=
-updateGeocenterPSD=
-waveletPrior=
-Dmax=100
-signalOnly=
-Niter=500
-NCmin=2
-NCmax=2
-
-[bayeswave_post_options]
-; command line options for bayeswave_post
-0noise=
-
-[condor]
-; see e.g., https://ldas-gridmon.ligo.caltech.edu/ldg_accounting/user
-;accounting_group = ligo.prod.o1.burst.paramest.bayeswave
-universe=vanilla
-checkpoint=
-bayeswave-request-memory=4000
-bayeswave_post-request-memory=4000
-datafind=/usr/bin/gw_data_find
-ligolw_print=/usr/bin/ligolw_print
-segfind=/usr/bin/ligolw_segment_query_dqsegdb
-accounting_group = ligo.prod.o2.burst.paramest.bayeswave
-transfer-files=/home/jclark/test-bw-singularity/bayeswave-o2_online.img
-
-[segfind]
-; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
-segment-url=https://segments.ligo.org
-
-[segments]
-; See e.g., https://wiki.ligo.org/viewauth/DetChar/DataQuality/AligoFlags
-; https://wiki.ligo.org/viewauth/LSC/JRPComm/ObsRun1#Resource_information_40Data_44_segments_44_etc._41
-l1-analyze = L1:DMT-ANALYSIS_READY:1
-h1-analyze = H1:DMT-ANALYSIS_READY:1
-;v1-analyze = V1:ITF_SCIENCEMODE
-
diff --git a/BayesWaveUtils/scripts/bayeswave_pipe b/BayesWaveUtils/scripts/bayeswave_pipe
index 8c845cea33ab77d0e57a8310d2f1365abc41d8a5..684b008d3990dd266c067336d4c4ec5ff903e84b 100755
--- a/BayesWaveUtils/scripts/bayeswave_pipe
+++ b/BayesWaveUtils/scripts/bayeswave_pipe
@@ -170,7 +170,7 @@ def parser():
parser.add_option("--separate-post-dag", default=False, action="store_true")
parser.add_option("--osg-jobs", default=False, action="store_true")
parser.add_option("--glide-in", default=False, action="store_true")
- parser.add_option("-S", "--singularity", default=False, action="store_true")
+ parser.add_option("-S", "--singularity", default=None)
parser.add_option("--abs-paths", default=False, action="store_true")
parser.add_option("--fpeak-analysis", default=False, action="store_true")
parser.add_option("--trigger-time-delta", type=float, default=0.0)
@@ -232,6 +232,7 @@ if os.path.exists(workdir):
else:
print >> sys.stdout, "making work-directory: %s"%workdir
os.makedirs(workdir)
+ os.makedirs(workdir+"/logs")
# Decide whether OSG-submitting
if not cp.has_option('condor','osg-jobs'):
@@ -248,14 +249,15 @@ elif cp.has_option('condor','glide-in') and opts.glide_in:
# Must use singularity and CVMFS datafind server on the OSG
if cp.getboolean('condor', 'osg-jobs'):
- opts.singularity=True
+ cp.set('engine', 'use-singularity', str(True))
opts.server="datafind.ligo.org:443"
# Decide whether to use a singularity image
-if opts.singularity:
- cp.set('engine', 'use-singularity', opts.singularity)
+if opts.singularity is not None:
+ cp.set('engine', 'use-singularity', str(True))
+ cp.set('engine', 'singularity', opts.singularity)
-if cp.has_option('engine', 'use-singularity'):
+if cp.has_option('engine', 'singularity'):
cp.set('engine', 'use-singularity', str(True))
try:
cp.get('engine', 'singularity')
@@ -686,9 +688,9 @@ postdag = pipeline.CondorDAG(log=opts.workdir+'_post.log')
fpeakdag = pipeline.CondorDAG(log=opts.workdir+'_fpeak.log')
# ---- Set the name of the file that will contain the DAG.
-dag.set_dag_file( 'bayeswave_{0}'.format(os.path.basename(opts.workdir)) )
-postdag.set_dag_file( 'bayeswave_post_{0}'.format(os.path.basename(opts.workdir)) )
-fpeakdag.set_dag_file( 'bayeswave_fpeak_{0}'.format(os.path.basename(opts.workdir)) )
+dag.set_dag_file( '{0}'.format(os.path.basename(opts.workdir)) )
+postdag.set_dag_file( 'post_{0}'.format(os.path.basename(opts.workdir)) )
+fpeakdag.set_dag_file( 'fpeak_{0}'.format(os.path.basename(opts.workdir)) )
# ---- Create DAG jobs
# bayeswave: main bayeswave analysis
@@ -803,7 +805,7 @@ for t,trigger in enumerate(trigger_list.triggers):
enumerate(framePaths[ifo]) if frame_idx[f]]
# Make output directory for this trigger
- outputDir = 'bayeswave_' + str('%.9f'%trigger.trigger_time) + '_' + \
+ outputDir = 'trigtime_' + str('%.9f'%trigger.trigger_time) + '_' + \
str(float(trigger.hl_time_lag)) + '_' +\
str(float(trigger.hv_time_lag)) #+ str(uuid.uuid4())
diff --git a/README.md b/README.md
index ceb5a34b303cf1dfb23ed66e73c0246644108a36..c835849ee2f54838ec16761af3e2ddaa4cd0e5f4 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
# BayesWave
-Welcome to the BayesWave software repository. This wiki provides instructions for:
+Welcome to the BayesWave software repository. These pages provide instructions for:
* [Installation](https://git.ligo.org/lscsoft/bayeswave/blob/master/doc/INSTALLATION.md)
* [Running Analyses](https://git.ligo.org/lscsoft/bayeswave/blob/master/doc/RUNNING.md)
-Please see the [BayesWave wiki](https://wiki.ligo.org/Bursts/BayesWave) for further information
+See the [BayesWave wiki](https://wiki.ligo.org/Bursts/BayesWave) for further info
## Quick Start
See