Commit 3f0e49ca authored by Rory Smith's avatar Rory Smith
Browse files

added roq weights to lalinference_pipe *only* when a gid is used in the run

Original: 3975c7256f269e87f6287caa674a691502a9e251
parent 843a8342
......@@ -492,10 +492,11 @@ def get_roq_mchirp_priors(path, roq_paths, roq_params, key, gid):
if i<len(roq_paths)-1:
mc_priors[roq][1]-= (mc_priors[roq][1]- mc_priors[ordered_roq_paths[i+1]][0])/2.
i+=1
if gid is not None:
trigger_mchirp = get_trigger_chirpmass(gid)
else:
trigger_mchirp = None
# used to scale mass-frequency range of basis to accommodate trigger mass
trigger_mchirp = get_trigger_chirpmass(gid)
return mc_priors, trigger_mchirp
def get_roq_mass_freq_scale_factor(mc_priors, trigger_mchirp):
......
......@@ -97,10 +97,13 @@ if cp.has_option('paths','roq_b_matrix_directory'):
return float(item[1]['seglen'])
print "WARNING: Overwriting user choice of flow, srate, seglen,mc_min, mc_max and q-min"
mc_priors, trigger_mchirp = pipe_utils.get_roq_mchirp_priors(path, roq_paths, roq_params, key, opts.gid)
roq_mass_freq_scale_factor = pipe_utils.get_roq_mass_freq_scale_factor(mc_priors, trigger_mchirp)
if opts.gid is not None:
mc_priors, trigger_mchirp = pipe_utils.get_roq_mchirp_priors(path, roq_paths, roq_params, key, opts.gid)
roq_mass_freq_scale_factor = pipe_utils.get_roq_mass_freq_scale_factor(mc_priors, trigger_mchirp)
else:
mc_priors, trigger_mchirp = pipe_utils.get_roq_mchirp_priors(path, roq_paths, roq_params, key, None)
roq_mass_freq_scale_factor = 1
else:
roq_paths=[None]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment