From 9c2e8ea842605230071ededb69df3b9c062a2ad4 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Fri, 12 Apr 2024 07:12:51 -0700 Subject: [PATCH 1/5] Forgot to remove unused test options --- bin/live/pycbc_live_supervise_collated_trigger_fits | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/live/pycbc_live_supervise_collated_trigger_fits b/bin/live/pycbc_live_supervise_collated_trigger_fits index 6562d427f3b..0f98d5e6a5f 100755 --- a/bin/live/pycbc_live_supervise_collated_trigger_fits +++ b/bin/live/pycbc_live_supervise_collated_trigger_fits @@ -226,6 +226,11 @@ def fit_over_multiparam( "specified parameters", len(daily_files) ) + logging.info( + "Smoothing fits using fit_over_multiparam with %d files and " + "specified parameters", + len(daily_files) + ) file_id_str = f'{first_date}-{end_date}' out_fname = fit_over_controls['fit-over-format'].format( dates=file_id_str, @@ -293,7 +298,6 @@ def single_significance_fits( day_str, day_dt, controls, - test_options, stat_files=None, ): """ @@ -466,7 +470,6 @@ def supervise_collation_fits_dq(args, day_dt, day_str): combined_control_options = config_opts['significance_combined_fits_control'] combined_plot_options = config_opts['plot_significance_combined'] combined_plot_control_options = config_opts['plot_significance_combined_control'] - test_options = config_opts['test'] # The main output directory will have a date subdirectory which we # put the output into @@ -541,7 +544,6 @@ def supervise_collation_fits_dq(args, day_dt, day_str): day_str, day_dt, controls, - test_options, stat_files=stat_files, ) plot_single_significance_fits( From 394688a6f6f6f9a30498ab77fe913bacccf51a82 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Tue, 20 Aug 2024 08:40:29 -0700 Subject: [PATCH 2/5] Dont report all ifos in significance plots --- .../pycbc_live_supervise_collated_trigger_fits | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/bin/live/pycbc_live_supervise_collated_trigger_fits b/bin/live/pycbc_live_supervise_collated_trigger_fits index 0f98d5e6a5f..3db4ff9176c 100755 --- a/bin/live/pycbc_live_supervise_collated_trigger_fits +++ b/bin/live/pycbc_live_supervise_collated_trigger_fits @@ -306,7 +306,10 @@ def single_significance_fits( """ daily_options['output'] = os.path.join( output_dir, - daily_controls['sig-daily-format'].format(date=day_str), + daily_controls['sig-daily-format'].format( + ifos=''.join(controls['ifos'].split()), + date=day_str + ), ) daily_args = ['pycbc_live_single_significance_fits'] @@ -326,7 +329,10 @@ def plot_single_significance_fits(daily_output, daily_plot_options, controls): """ Plotting daily significance fits, and link to public directory if wanted """ - daily_plot_output = f'{daily_output[:-4]}_{{ifo}}.png' + daily_plot_output = daily_output[:-4].replace( + ''.join(controls['ifos'].split()), + '{ifo}' + ) + '.png' logging.info( "Plotting daily significance fits from %s to %s", daily_output, @@ -369,9 +375,14 @@ def combine_significance_fits( Supervise the smoothing of live trigger significance fits using pycbc_live_combine_single_significance_fits """ + # This has a trick to do partial formatting, get the IFOs into the + # string, but not the date daily_files, first_date, end_date = find_daily_fit_files( combined_controls, - combined_controls['daily-format'], + combined_controls['daily-format'].format( + ifos=''.join(controls['ifos'].split()), + date='{date}' + ), controls['output-directory'], ) logging.info( From ed929ed3bf95ea404e69dba9c728cbdbae7f9341 Mon Sep 17 00:00:00 2001 From: Gareth S Cabourn Davies Date: Wed, 21 Aug 2024 12:37:04 +0100 Subject: [PATCH 3/5] Update bin/live/pycbc_live_supervise_collated_trigger_fits Co-authored-by: Tito Dal Canton --- bin/live/pycbc_live_supervise_collated_trigger_fits | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/live/pycbc_live_supervise_collated_trigger_fits b/bin/live/pycbc_live_supervise_collated_trigger_fits index 3db4ff9176c..45129f97f00 100755 --- a/bin/live/pycbc_live_supervise_collated_trigger_fits +++ b/bin/live/pycbc_live_supervise_collated_trigger_fits @@ -330,7 +330,7 @@ def plot_single_significance_fits(daily_output, daily_plot_options, controls): Plotting daily significance fits, and link to public directory if wanted """ daily_plot_output = daily_output[:-4].replace( - ''.join(controls['ifos'].split()), + ''.join(sorted(controls['ifos'].split())), '{ifo}' ) + '.png' logging.info( From 608d8451a80d708fcd3792b1f7e49e30da5ff921 Mon Sep 17 00:00:00 2001 From: Gareth S Cabourn Davies Date: Wed, 21 Aug 2024 12:37:11 +0100 Subject: [PATCH 4/5] Update bin/live/pycbc_live_supervise_collated_trigger_fits Co-authored-by: Tito Dal Canton --- bin/live/pycbc_live_supervise_collated_trigger_fits | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/live/pycbc_live_supervise_collated_trigger_fits b/bin/live/pycbc_live_supervise_collated_trigger_fits index 45129f97f00..55a17327711 100755 --- a/bin/live/pycbc_live_supervise_collated_trigger_fits +++ b/bin/live/pycbc_live_supervise_collated_trigger_fits @@ -307,7 +307,7 @@ def single_significance_fits( daily_options['output'] = os.path.join( output_dir, daily_controls['sig-daily-format'].format( - ifos=''.join(controls['ifos'].split()), + ifos=''.join(sorted(controls['ifos'].split())), date=day_str ), ) From 04024ac82ebf1611ea9a4b228d38b091d5b0d674 Mon Sep 17 00:00:00 2001 From: Gareth S Cabourn Davies Date: Wed, 21 Aug 2024 12:39:54 +0100 Subject: [PATCH 5/5] Update bin/live/pycbc_live_supervise_collated_trigger_fits Co-authored-by: Tito Dal Canton --- bin/live/pycbc_live_supervise_collated_trigger_fits | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/live/pycbc_live_supervise_collated_trigger_fits b/bin/live/pycbc_live_supervise_collated_trigger_fits index 55a17327711..087ae5d1339 100755 --- a/bin/live/pycbc_live_supervise_collated_trigger_fits +++ b/bin/live/pycbc_live_supervise_collated_trigger_fits @@ -380,7 +380,7 @@ def combine_significance_fits( daily_files, first_date, end_date = find_daily_fit_files( combined_controls, combined_controls['daily-format'].format( - ifos=''.join(controls['ifos'].split()), + ifos=''.join(sorted(controls['ifos'].split())), date='{date}' ), controls['output-directory'],