diff --git a/gstlal-inspiral/python/dags/layers/inspiral.py b/gstlal-inspiral/python/dags/layers/inspiral.py index baf9d358cf80a28f34f5fa336b7cc990548ff3fa..273ab3d03251a79b78dd205bb29a920f11ea7b94 100644 --- a/gstlal-inspiral/python/dags/layers/inspiral.py +++ b/gstlal-inspiral/python/dags/layers/inspiral.py @@ -618,15 +618,24 @@ def calc_likelihood_layer(config, dag, trigger_cache, dist_stat_cache): # assign likelihood to triggers calc_trigger_cache = trigger_cache.copy(root="rank") - calc_triggers = calc_trigger_cache.groupby("bin", "subtype") + calc_triggers = calc_trigger_cache.groupby("bin", "subtype", "dirname") dist_stats = dist_stat_cache.groupby("bin") - for (svd_bin, inj_type), triggers in trigger_cache.groupby("bin", "subtype").items(): + for (svd_bin, inj_type, dirname), triggers in trigger_cache.groupby("bin", "subtype", "dirname").items(): + calc_dirname = dirname.replace("filter", "rank") + + arguments = [ + Option("force"), + Option("copy"), + Option("tmp-space", dagutil.condor_scratch_space()), + ] + + # if file transfer not enabled, need to specify directory to + # copy triggers into as remaps aren't relevant here + if not config.condor.transfer_files: + arguments.append(Option("copy-dir", calc_dirname)) + layer += Node( - arguments = [ - Option("copy"), - Option("force"), - Option("tmp-space", dagutil.condor_scratch_space()), - ], + arguments = arguments, inputs = [ Argument("mass-model", config.prior.mass_model, track=False, suppress=True), Argument("triggers", triggers.files), @@ -634,7 +643,7 @@ def calc_likelihood_layer(config, dag, trigger_cache, dist_stat_cache): ], outputs = Argument( "calc-triggers", - calc_triggers[(svd_bin, inj_type)].files, + calc_triggers[(svd_bin, inj_type, calc_dirname)].files, suppress_with_remap=True ), )