Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Live singles fits plot names #4856

Merged
merged 6 commits into from
Aug 21, 2024
Merged

Live singles fits plot names #4856

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c2e8ea
Forgot to remove unused test options
GarethCabournDavies Apr 12, 2024
394688a
Dont report all ifos in significance plots
GarethCabournDavies Aug 20, 2024
ed929ed
Update bin/live/pycbc_live_supervise_collated_trigger_fits
GarethCabournDavies Aug 21, 2024
608d845
Update bin/live/pycbc_live_supervise_collated_trigger_fits
GarethCabournDavies Aug 21, 2024
f313028
Merge branch 'gwastro:master' into supervise_fit_coeff_dq_files
GarethCabournDavies Aug 21, 2024
04024ac
Update bin/live/pycbc_live_supervise_collated_trigger_fits
GarethCabournDavies Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions bin/live/pycbc_live_supervise_collated_trigger_fits
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -293,7 +298,6 @@ def single_significance_fits(
day_str,
day_dt,
controls,
test_options,
stat_files=None,
):
"""
Expand All @@ -302,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()),
GarethCabournDavies marked this conversation as resolved.
Show resolved Hide resolved
date=day_str
),
)
daily_args = ['pycbc_live_single_significance_fits']

Expand All @@ -322,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()),
GarethCabournDavies marked this conversation as resolved.
Show resolved Hide resolved
'{ifo}'
) + '.png'
logging.info(
"Plotting daily significance fits from %s to %s",
daily_output,
Expand Down Expand Up @@ -365,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()),
GarethCabournDavies marked this conversation as resolved.
Show resolved Hide resolved
date='{date}'
),
controls['output-directory'],
)
logging.info(
Expand Down Expand Up @@ -466,7 +481,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
Expand Down Expand Up @@ -541,7 +555,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(
Expand Down
Loading