diff --git a/bin/pylal_cbc_cohptf_efficiency b/bin/pylal_cbc_cohptf_efficiency index 0cf8e04ec..76181e04e 100755 --- a/bin/pylal_cbc_cohptf_efficiency +++ b/bin/pylal_cbc_cohptf_efficiency @@ -1581,12 +1581,12 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ fig = plt.figure() ax = fig.gca() if len(gFoundMchirp): - ax.scatter(gFoundMchirp, gFoundEffDist, c="b", marker='x',\ + ax.scatter(gFoundMchirp, gFoundEffDist, c="g", marker='x',\ edgecolors='g') if len(gIFARMchirp): p = ax.scatter(gIFARMchirp, gIFAREffDist, c=gIFARStat,\ norm=colors.Normalize(0,1,clip=False), marker='o',\ - edgecolors='none') + edgecolors='none', cmap=cm.plasma) if len(gMissed2Mchirp): ax.scatter(gMissed2Mchirp, gMissed2EffDist, c="r", marker='x',\ edgecolors='r') @@ -1616,7 +1616,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ if len(gIFARMchirp): p = ax.scatter(gIFARMchirp, gIFAREffDist, c=gIFARStat,\ norm=colors.Normalize(0,1,clip=False), marker='o',\ - edgecolors='none') + edgecolors='none', cmap=cm.plasma) if len(gFoundMchirp): ax.scatter(gFoundMchirp, gFoundEffDist, c="b", marker='x',\ edgecolors='g') @@ -1639,7 +1639,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ if len(gIFARTime): p = ax.scatter(gIFARTime, gIFAREffDist, c=gIFARStat,\ norm=colors.Normalize(0,1,clip=False), marker='o',\ - edgecolors='none') + edgecolors='none', cmap=cm.plasma) if len(gMissed2Time): ax.scatter(gMissed2Time, gMissed2EffDist, c="r", marker='x',\ edgecolors='r') @@ -1670,7 +1670,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ if len(gIFARTime): p = ax.scatter(gIFARTime, gIFAREffDist, c=gIFARStat,\ norm=colors.Normalize(0,1,clip=False), marker='o',\ - edgecolors='none') + edgecolors='none', cmap=cm.plasma) if len(gFoundTime): ax.scatter(gFoundTime, gFoundEffDist, c="b", marker='x', edgecolors='g') ax.grid() @@ -1706,7 +1706,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ gIFARSpin2 = np.sqrt(gIFARSpin2x**2 + gIFARSpin2y**2 + gIFARSpin2z**2) p = ax.scatter(gIFARSpin1, gIFARSpin2, c=gIFARStat, norm=colors.Normalize(0, 1, clip=False), marker="o", - edgecolors="none") + edgecolors="none", cmap=cm.plasma) if len(missedInjSpin1x): ax.scatter(missedInjSpin1, missedInjSpin2, c="k", marker="x", edgecolors="k") @@ -1738,7 +1738,8 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ ax.scatter(gFoundm1, gFoundm2, c="g", marker="x", edgecolors="g") if len(gIFARm1): p = ax.scatter(gIFARm1, gIFARm2, c=gIFARStat, edgecolors="none", - norm=colors.Normalize(0, 1, clip=False), marker="o") + norm=colors.Normalize(0, 1, clip=False), marker="o", + cmap=cm.plasma) if len(missedInjm1): ax.scatter(missedInjm1, missedInjm2, c="k", marker="x", edgecolors="k") if len(gMissed2m1): @@ -1764,7 +1765,8 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ ax.scatter(gFoundMchirp, gFoundInc, c="g", marker="x", edgecolors="g") if len(gIFARInc): p = ax.scatter(gIFARMchirp, gIFARInc, c=gIFARStat, edgecolors="none", - norm=colors.Normalize(0, 1, clip=False), marker="o") + norm=colors.Normalize(0, 1, clip=False), marker="o", + cmap=cm.plasma) if len(gMissed2Inc): ax.scatter(gMissed2Mchirp, gMissed2Inc, c="r", marker="x", edgecolors="r") @@ -1807,7 +1809,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ if len(gIFARMchirp): p = ax.scatter(gIFARMchirp, gIFAREffSiteDist[site],\ c=gIFARStat, norm=colors.Normalize(0,1,clip=False),\ - marker='o', edgecolors='none') + marker='o', edgecolors='none', cmap=cm.plasma) ax.semilogy() if len(gIFARMchirp): cb = ax.figure.colorbar(p) @@ -1835,7 +1837,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ if len(gIFARTime): p = ax.scatter(gIFARTime ,gIFAREffSiteDist[site],\ c=gIFARStat, norm=colors.Normalize(0,1,clip=False),\ - marker='o', edgecolors='none') + marker='o', edgecolors='none', cmap=cm.plasma) ax.semilogy() if len(gIFARTime): cb = ax.figure.colorbar(p) @@ -1862,7 +1864,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ if len(gIFARMchirp): p = ax.scatter(gIFARMchirp, gIFARDist, c=gIFARStat,\ norm=colors.Normalize(0,1,clip=False),\ - marker='o', edgecolors='none') + marker='o', edgecolors='none', cmap=cm.plasma) ax.semilogy() if len(gIFARMchirp): cb = ax.figure.colorbar(p) @@ -1887,7 +1889,7 @@ def main(segdir, outdir, trigFile, foundFile, missedFile,\ if len(gIFARTime): p = ax.scatter(gIFARTime, gIFARDist, c=gIFARStat,\ norm=colors.Normalize(0,1,clip=False),\ - marker='o', edgecolors='none') + marker='o', edgecolors='none', cmap=cm.plasma) ax.semilogy() if len(gIFARTime): cb = ax.figure.colorbar(p) diff --git a/bin/pylal_cbc_cohptf_injcombiner b/bin/pylal_cbc_cohptf_injcombiner index 9431c6eeb..ef8c11fb6 100755 --- a/bin/pylal_cbc_cohptf_injcombiner +++ b/bin/pylal_cbc_cohptf_injcombiner @@ -25,8 +25,8 @@ from __future__ import division import os,sys,glob,re from optparse import OptionParser from pylal import SimInspiralUtils,MultiInspiralUtils,git_version -from glue.ligolw import ilwd,ligolw,table,lsctables,utils -from glue import segments,segmentsUtils,lal +from pycbc_glue.ligolw import ilwd,ligolw,table,lsctables,utils +from pycbc_glue import segments,segmentsUtils,lal from pylal.dq import dqSegmentUtils from pylal.coh_PTF_pyutils import append_process_params,remove_bad_injections,identify_bad_injections,sim_inspiral_get_theta diff --git a/pylal/SimInspiralUtils.py b/pylal/SimInspiralUtils.py index e4eda720d..391290527 100644 --- a/pylal/SimInspiralUtils.py +++ b/pylal/SimInspiralUtils.py @@ -23,10 +23,10 @@ # from pylal.xlal.datatypes.ligotimegps import LIGOTimeGPS -from glue.ligolw import table -from glue.ligolw import lsctables -from glue.ligolw import utils -from glue.ligolw import ligolw +from pycbc_glue.ligolw import table +from pycbc_glue.ligolw import lsctables +from pycbc_glue.ligolw import utils +from pycbc_glue.ligolw import ligolw # # ============================================================================= # diff --git a/pylal/legacy_ihope.py b/pylal/legacy_ihope.py index c2d9413b4..c1201ca22 100644 --- a/pylal/legacy_ihope.py +++ b/pylal/legacy_ihope.py @@ -364,6 +364,9 @@ def create_node(self, trig_files=None, segment_dir=None, analysis_seg=None, if all(t.node.executable.name == "trig_cluster" for t in trig_files): node.add_opt('--input-files', " ".join([t.storage_path for t in trig_files])) + if self.cp.has_option_tag('inspiral', 'do-short-slides', + 'coherent_no_injections'): + node.add_opt('--short-slides') else: node.add_input_list_opt('--input-files', trig_files)