Skip to content
Snippets Groups Projects
Commit 3f5b5c75 authored by James Alexander Clark PhD's avatar James Alexander Clark PhD
Browse files

Merge branch 'bayesline-median-pipe-fix' into 'master'

Fix the variables that deal with the median PSD jobs

See merge request lscsoft/bayeswave!163
parents f7dfa59d e7ebb398
Branches master
No related tags found
No related merge requests found
......@@ -805,12 +805,12 @@ if opts.bayesline_median_psd:
bayesline_medianpsd_job.set_sub_file(os.path.join(workdir,
'bayeswave_median_psd.sub'))
bayeswave_post_median_psd_job = pipe_utils.bayeswave_postJob(bayesline_cp,
bayesline_post_median_psd_job = pipe_utils.bayeswave_postJob(bayesline_cp,
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,
bayesline_post_median_psd_log = bayesline_post_median_psd_job._CondorJob__log_file
bayesline_post_median_psd_job.set_sub_file(os.path.join(workdir,
'bayeswave_post_median_psd.sub'))
# Modify the original config parser and make sure:
......@@ -965,7 +965,7 @@ for t,trigger in enumerate(trigger_list.triggers):
dump_job_info(outputDir_psd, trigger)
bayeswave_psd_node = pipe_utils.bayeswaveNode(bayesline_medianpsd_job)
bayeswave_psd_post_node = pipe_utils.bayeswave_postNode(bayeswave_post_median_psd_job)
bayeswave_psd_post_node = pipe_utils.bayeswave_postNode(bayesline_post_median_psd_job)
#
# Add options for bayesline_psd node
......@@ -1235,7 +1235,7 @@ for t,trigger in enumerate(trigger_list.triggers):
# 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
bayesline_post_median_psd_job._CondorJob__log_file = bayesline_post_median_psd_log
bayeswave_job._CondorJob__log_file = bayeswave_log
bayeswave_post_job._CondorJob__log_file = bayeswave_post_log
if opts.fpeak_analysis:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment