From 7ed5f8789fbbf9569f40cf6d1235a10d5bc6e09c Mon Sep 17 00:00:00 2001 From: Jonah Kanner <jonah.kanner@LIGO.ORG> Date: Fri, 8 Aug 2014 04:25:35 +0000 Subject: [PATCH] Set up a branch for Craig git-svn-id: https://svn.ligo.caltech.edu/svn/bayeswave/branches/condor_compile@127 c56465c9-8126-4a4f-9d7d-ac845eff4865 --- burstinj/s6/make_triggers_elptc.py | 5 ++++- condor/s6/mdc_setup_HLV.py | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/burstinj/s6/make_triggers_elptc.py b/burstinj/s6/make_triggers_elptc.py index 0cbe154b..c15d4593 100644 --- a/burstinj/s6/make_triggers_elptc.py +++ b/burstinj/s6/make_triggers_elptc.py @@ -34,11 +34,14 @@ loudsg = [gps[i] for i in range(len(gps)) if (waveform[i] == sgname) and (gps[i segfmt = ['start', 'stop', 'dur'] h1segs = np.recfromtxt('H1_BURST_CAT2_LONG.txt', names=segfmt) l1segs = np.recfromtxt('L1_BURST_CAT2_LONG.txt', names=segfmt) +v1segs = np.recfromtxt('V1_VSR3.txt', names=segfmt) # -- Find which triggers are in the segment list somewhere h1sg = find_in_segs(loudsg, h1segs) l1sg = find_in_segs(loudsg, l1segs) -indx = np.logical_and(h1sg, l1sg) +v1sg = find_in_segs(loudsg, v1segs) +ligoindx = np.logical_and(h1sg, l1sg) +indx = np.logical_and(ligoindx, v1sg) goodsg = np.array(loudsg)[indx] print "Found {0} SGs in good times".format(goodsg.size) diff --git a/condor/s6/mdc_setup_HLV.py b/condor/s6/mdc_setup_HLV.py index 1929d497..07c0db9b 100644 --- a/condor/s6/mdc_setup_HLV.py +++ b/condor/s6/mdc_setup_HLV.py @@ -12,10 +12,10 @@ import subprocess topdir = '/home/jkanner/baysewave/PEC/mdc_v3' # topdir = '/home/jkanner/baysewave/test' mdcdir = '/home/jkanner/baysewave/svn/branches/condor_compile/burstinj/s6' -waveformList = ['sg153'] -scaleList = ['0.3'] -mdccache = '/home/jkanner/baysewave/svn/trunk/burstinj/s6/brst_s6.cache' -mdclog = '/home/jkanner/baysewave/svn/trunk/burstinj/s6/BurstMDC-BRST_S6-Log.txt' +waveformList = ['elpsg153'] +scaleList = ['0.15' , '0.3', '0.6', '1.2'] +mdccache = '/home/jkanner/baysewave/svn/trunk/burstinj/s6/elptc_s6.cache' +mdclog = '/home/jkanner/baysewave/svn/trunk/burstinj/s6/BurstMDC-ELPTC_S6-Log.txt' bwb = '/home/jkanner/baysewave/svn/branches/condor_compile/src/BayesWaveBurst' ifoList = ['H1', 'L1', 'V1'] frtypeList = ['H1_LDAS_C02_L2', 'L1_LDAS_C02_L2', 'HrecV2'] -- GitLab