lalapps_cbc_sbank_sim.py, lalapps_cbc_sbank_sim_pipe.py, lalapps_cbc_sbank_plot_sim.py : Injection spacing fixes and QOL changes
Hi, Please assign this issue to Surabhi Sachdev, who co-wrote much of this code. She has developed part of these patches, and they need to be deployed/pushed. The injection spacing is incorrect in the current version of lalapps_cbc_sbank_sim.py, as noted in Marnix's ticket, and the rcparams need to be updated in plotsim.
diff --git a/lalapps/src/inspiral/lalapps_cbc_sbank_plot_sim.py b/lalapps/src/inspiral/lalapps_cbc_sbank_plot_sim.py
index 201c03225b..32ff43838e 100644
--- a/lalapps/src/inspiral/lalapps_cbc_sbank_plot_sim.py
+++ b/lalapps/src/inspiral/lalapps_cbc_sbank_plot_sim.py
@@ -21,6 +21,13 @@ import sys
import os
import numpy as np
import matplotlib
+matplotlib.rcParams['text.usetex'] = True
+matplotlib.rcParams['lines.markersize'] = 2
+matplotlib.rcParams['lines.linewidth'] = 1
+matplotlib.rcParams['font.size'] = 10
+matplotlib.rcParams['savefig.dpi'] = 300
+matplotlib.rcParams['text.latex.preamble'].append(r'\usepackage{amsmath}')
+matplotlib.rcParams['legend.fontsize'] = 10
matplotlib.use("Agg")
from lalsimulation import SimInspiralTaylorF2ReducedSpinComputeChi, SimIMRPhenomBComputeChi, SimIMRSEOBNRv4ROMTimeOfFrequency
diff --git a/lalapps/src/inspiral/lalapps_cbc_sbank_sim.py b/lalapps/src/inspiral/lalapps_cbc_sbank_sim.py
index 2a88c567ee..b950a8f203 100644
--- a/lalapps/src/inspiral/lalapps_cbc_sbank_sim.py
+++ b/lalapps/src/inspiral/lalapps_cbc_sbank_sim.py
@@ -196,14 +196,14 @@ for s in sims:
if len(newtbl) == opts.injection_max - opts.injection_min:
break
- if 1./opts.mratio_max <= s.mass1/s.mass2 <= opts.mratio_max and opts.mtotal_min <= s.mass1 + s.mass2 <= opts.mtotal_max and (opts.duration_min == 0 or lalsim.SimIMRSEOBNRv4ROMTimeOfFrequency(opts.flow, s.mass1 * MSUN_SI, s.mass2* MSUN_SI, s.spin1z, s.spin2z) > opts.duration_min):
- s.polarization = np.random.uniform(0, 2*np.pi)
+ #s.polarization = np.random.uniform(0, 2*np.pi)
# start adding to table once we reach min injection requested
# by user
- if opts.injection_min <= noinjs:
+ if opts.injection_min <= noinjs:
+ if 1./opts.mratio_max <= s.mass1/s.mass2 <= opts.mratio_max and opts.mtotal_min <= s.mass1 + s.mass2 <= opts.mtotal_max and (opts.duration_min == 0 or lalsim.SimIMRSEOBNRv4ROMTimeOfFrequency(opts.flow, s.mass1 * MSUN_SI, s.mass2* MSUN_SI, s.spin1z, s.spin2z) > opts.duration_min):
newtbl.append(s)
- noinjs += 1
+ noinjs += 1
sims = newtbl
diff --git a/lalapps/src/inspiral/lalapps_cbc_sbank_sim_pipe.py b/lalapps/src/inspiral/lalapps_cbc_sbank_sim_pipe.py
index f3ddfb9ee8..ff5353790c 100644
--- a/lalapps/src/inspiral/lalapps_cbc_sbank_sim_pipe.py
+++ b/lalapps/src/inspiral/lalapps_cbc_sbank_sim_pipe.py
@@ -308,7 +308,7 @@ for inj_run in cp.options("injections"):
# because we will prune injections, we generate 50 times more
# than we think we need. this is fast.
# FIXME: this is still no guarantee we have enough injections!!
- gpsend = gpsstart + 50 * (njobs * injperjob)
+ gpsend = gpsstart + (njobs * injperjob)
cp.set("inspinj", "gps-start-time", str(gpsstart))
cp.set("inspinj", "gps-end-time", str(gpsend))
cp.set("inspinj", "time-step", str(1))