From 5807471b810529c1a5ca1be74f9932d49b468d67 Mon Sep 17 00:00:00 2001 From: Francesco Pannarale Date: Wed, 11 Sep 2024 03:25:50 -0700 Subject: [PATCH 1/2] Enable handling json file output from pycbc_pygrb_efficiency in pygrb workflow --- pycbc/workflow/grb_utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pycbc/workflow/grb_utils.py b/pycbc/workflow/grb_utils.py index 3ad2a4ddf4a..835255daa97 100644 --- a/pycbc/workflow/grb_utils.py +++ b/pycbc/workflow/grb_utils.py @@ -526,7 +526,11 @@ def make_pygrb_plot(workflow, exec_name, out_dir, node.new_output_file_opt(workflow.analysis_time, '.png', '--onsource-output-file', tags=extra_tags+['onsource']) + node.new_output_file_opt(workflow.analysis_time, '.json', + '--exclusion-dist-output-file', + tags=extra_tags) node.add_opt('--injection-set-name', tags[1]) + node.add_opt('--trial-name', tags[0]) else: node.new_output_file_opt(workflow.analysis_time, '.png', '--output-file', tags=extra_tags) @@ -539,6 +543,8 @@ def make_pygrb_plot(workflow, exec_name, out_dir, node.add_opt('--y-variable', tags[0]) # Quantity to be displayed on the x-axis of the plot elif exec_name == 'pygrb_plot_stats_distribution': + seg_filelist = FileList([resolve_url_to_file(sf) for sf in seg_files]) + node.add_input_list_opt('--seg-files', seg_filelist) node.add_opt('--x-variable', tags[0]) elif exec_name == 'pygrb_plot_injs_results': # Variables to plot on x and y axes From f48f76ebf0393a6e9827a10ed97b4eb88cad2dd0 Mon Sep 17 00:00:00 2001 From: Francesco Pannarale Date: Thu, 19 Sep 2024 08:26:48 -0700 Subject: [PATCH 2/2] Removing resolve_url_to_file from setup_pygrb_minifollowups --- pycbc/workflow/grb_utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pycbc/workflow/grb_utils.py b/pycbc/workflow/grb_utils.py index 835255daa97..73c8bc7c53c 100644 --- a/pycbc/workflow/grb_utils.py +++ b/pycbc/workflow/grb_utils.py @@ -543,8 +543,7 @@ def make_pygrb_plot(workflow, exec_name, out_dir, node.add_opt('--y-variable', tags[0]) # Quantity to be displayed on the x-axis of the plot elif exec_name == 'pygrb_plot_stats_distribution': - seg_filelist = FileList([resolve_url_to_file(sf) for sf in seg_files]) - node.add_input_list_opt('--seg-files', seg_filelist) + node.add_input_list_opt('--seg-files', seg_files) node.add_opt('--x-variable', tags[0]) elif exec_name == 'pygrb_plot_injs_results': # Variables to plot on x and y axes