Commit ac233364 authored by James Clark's avatar James Clark

Merge branch 'logfixes' into 'master'

Send BayesWave logs to their own log file

See merge request lscsoft/bayeswave!156
parents aeb8a595 27e89d72
......@@ -1060,7 +1060,7 @@ class bayeswaveJob(pipeline.CondorDAGJob, pipeline.AnalysisJob):
'BayesWave_$(macrooutputDir)-$(cluster)-$(process).out'))
self.set_stderr_file(os.path.join(workdir, 'logs',
'BayesWave_$(macrooutputDir)-$(cluster)-$(process).err'))
self.set_log_file(os.path.join('workdir', 'logs',
self.set_log_file(os.path.join(workdir, 'logs',
'BayesWave_$(macrooutputDir)-$(cluster)-$(process).log'))
if cp.has_option('condor','arch'):
......@@ -1283,8 +1283,8 @@ class bayeswave_postJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
'BayesWavePost_$(macrooutputDir)-$(cluster)-$(process).out'))
self.set_stderr_file(os.path.join(workdir, 'logs',
'BayesWavePost_$(macrooutputDir)-$(cluster)-$(process).err'))
self.set_log_file(os.path.join('workdir', 'logs',
'BayesWave_$(macrooutputDir)-$(cluster)-$(process).log'))
self.set_log_file(os.path.join(workdir, 'logs',
'BayesWavePost_$(macrooutputDir)-$(cluster)-$(process).log'))
if cp.has_option('condor','arch'):
self.add_condor_cmd('+arch',cp.get('condor','arch'))
......@@ -1594,7 +1594,7 @@ class megaskyJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
'megasky_$(macrooutputDir)-$(cluster)-$(process).out'))
self.set_stderr_file(os.path.join(workdir, 'logs',
'megasky_$(macrooutputDir)-$(cluster)-$(process).err'))
self.set_log_file(os.path.join('workdir', 'logs',
self.set_log_file(os.path.join(workdir, 'logs',
'megasky_$(macrooutputDir)-$(cluster)-$(process).log'))
#
......@@ -1641,7 +1641,7 @@ class megaplotJob(pipeline.CondorDAGJob,pipeline.AnalysisJob):
'megaplot_$(macrooutputDir)-$(cluster)-$(process).out'))
self.set_stderr_file(os.path.join(workdir, 'logs',
'megaplot_$(macrooutputDir)-$(cluster)-$(process).err'))
self.set_log_file(os.path.join('workdir', 'logs',
self.set_log_file(os.path.join(workdir, 'logs',
'megaplot_$(macrooutputDir)-$(cluster)-$(process).log'))
#
......
......@@ -801,6 +801,7 @@ if opts.bayesline_median_psd:
cache_files,
injfile=injfile,
numrel_data=numrel_data)
bayesline_medianpsd_log = bayesline_medianpsd_job._CondorJob__log_file
bayesline_medianpsd_job.set_sub_file(os.path.join(workdir,
'bayeswave_median_psd.sub'))
......@@ -808,6 +809,7 @@ if opts.bayesline_median_psd:
cache_files,
injfile=injfile,
numrel_data=numrel_data)
bayesline_post_medianpsd_log = bayesline_post_medianpsd_job._CondorJob__log_file
bayeswave_post_median_psd_job.set_sub_file(os.path.join(workdir,
'bayeswave_post_median_psd.sub'))
......@@ -829,9 +831,11 @@ if opts.bayesline_median_psd:
bayeswave_job = pipe_utils.bayeswaveJob(cp, cache_files, injfile=injfile,
numrel_data=numrel_data)
bayeswave_log = bayeswave_job._CondorJob__log_file
bayeswave_post_job = pipe_utils.bayeswave_postJob(cp, cache_files,
injfile=injfile, numrel_data=numrel_data)
bayeswave_post_log = bayeswave_post_job._CondorJob__log_file
#
# Setup any extra post-proc options
......@@ -854,11 +858,16 @@ if opts.fpeak_analysis:
# different executable
bayeswave_fpeak_job = pipe_utils.bayeswave_fpeakJob(cp, cache_files,
injfile=injfile, numrel_data=numrel_data)
bayeswave_fpeak_log = bayeswave_fpeak_job._CondorJob__log_file
megasky_job = pipe_utils.megaskyJob(cp, injfile)
megasky_log = megasky_job._CondorJob__log_file
megaplot_job = pipe_utils.megaplotJob(cp)
megaplot_log = megaplot_job._CondorJob__log_file
if opts.submit_to_gracedb: submitToGraceDB_job = pipe_utils.submitToGraceDB(cp)
if opts.submit_to_gracedb:
submitToGraceDB_job = pipe_utils.submitToGraceDB(cp)
submitToGraceDB_log = submitToGraceDB_job._CondorJob__log_file
#
# Build Nodes
......@@ -1219,7 +1228,24 @@ for t,trigger in enumerate(trigger_list.triggers):
dag.add_node(gracedb_node)
#
# Correct log files
#
# FIXME: this is a horrendous hack. glue.pipeline overrides nodes' job log file
# paths. Something to do with multiple inheritance in the job classes?
if opts.bayesline_median_psd:
bayesline_medianpsd_job._CondorJob__log_file = bayesline_medianpsd_log
bayesline_post_medianpsd_job._CondorJob__log_file = bayesline_post_medianpsd_log
bayeswave_job._CondorJob__log_file = bayeswave_log
bayeswave_post_job._CondorJob__log_file = bayeswave_post_log
if opts.fpeak_analysis:
bayeswave_fpeak_job._CondorJob__log_file = bayeswave_fpeak_log
megasky_job._CondorJob__log_file = megasky_log
megaplot_job._CondorJob__log_file = megaplot_log
if opts.submit_to_gracedb:
submitToGraceDB_job._CondorJob__log_file = submitToGraceDB_log
#
# Finalise DAG
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment