Skip to content

Commit

Permalink
Allow waveforms to not be given
Browse files Browse the repository at this point in the history
  • Loading branch information
GarethCabournDavies committed Dec 11, 2023
1 parent 3fe0d00 commit 58b1bbd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions bin/minifollowups/pycbc_foreground_minifollowup
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ tids = {}
ifo_list = f.attrs['ifos'].split(' ')
f_cat = f[file_val]
for ifo in ifo_list:
times[ifo] = f_cat[f'/{ifo}/time'][:][event_idx]
tids[ifo] = f_cat[f'{ifo}/trigger_id'][:][event_idx]
times[ifo] = f_cat[ifo]['time'][:][event_idx]
tids[ifo] = f_cat[ifo]['trigger_id'][:][event_idx]
bank_ids = f_cat['template_id'][:][event_idx]
f.close()

Expand Down
8 changes: 5 additions & 3 deletions bin/minifollowups/pycbc_upload_prep_minifollowup
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,11 @@ for curr_idx in range(event_idx.size):
tids
)
# Extract approximant
appx = params['approximant']
del params['approximant']

if 'approximant' in params:
appx = params['approximant']
del params['approximant']
else:
appx = None
channel_name = ""
for ifo in ifo_list:
ifo_chname = resolve_td_option(
Expand Down
8 changes: 5 additions & 3 deletions pycbc/workflow/minifollowups.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,8 @@ def get_single_template_params(curr_idx, times, bank_data,
params['spin1z'] = bank_data['spin1z'][bank_id]
params['spin2z'] = bank_data['spin2z'][bank_id]
params['f_lower'] = bank_data['f_lower'][bank_id]
params['approximant'] = bank_data['approximant'][bank_id]
if 'approximant' in bank_data:
params['approximant'] = bank_data['approximant'][bank_id]
# don't require precessing template info if not present
try:
params['spin1x'] = bank_data['spin1x'][bank_id]
Expand Down Expand Up @@ -1104,9 +1105,10 @@ def make_upload_files(workflow, psd_files, snr_timeseries, xml_all,
)

if approximant == b'SPAtmplt':
# Bayestar doesnt use the SPAtmplt approximant
# Bayestar doesn't use the SPAtmplt approximant
approximant = b'TaylorF2'
bayestar_node.add_opt('--waveform', approximant.decode())
if approximant is not None:
bayestar_node.add_opt('--waveform', approximant.decode())

workflow += bayestar_node

Expand Down

0 comments on commit 58b1bbd

Please sign in to comment.