Standard universe condor script is running

git-svn-id: https://svn.ligo.caltech.edu/svn/bayeswave/branches/condor_compile@100 c56465c9-8126-4a4f-9d7d-ac845eff4865

condor/s6/mdc_setup.py

+# -----------------------------------
+# Example Condor setup script for BWB
+# 2014, Jonah Kanner
+# ----------------------------------
+
 import os
 import numpy as np
+import subprocess
 
-# -- Define the key files
+# ------------------
+# -- Set paramters
+# ------------------
+# topdir = '/home/jkanner/baysewave/PEC/mdc_v2'
+topdir = '/home/jkanner/baysewave/test'
+mdcdir = '/home/jkanner/baysewave/svn/trunk/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'
+bwb = '/home/jkanner/baysewave/svn/branches/condor_compile/src/BayesWaveBurst'
+ifoList = ['H1', 'L1']
+frtypeList = ['H1_LDAS_C02_L2', 'L1_LDAS_C02_L2']
+
+bwbargsfmt = """--ifo H1 --H1-flow 40 --H1-channel H1:LDAS-STRAIN \
+       --ifo L1 --L1-flow 40 --L1-channel L1:LDAS-STRAIN \
+       --H1-cache {wavedir}/H1.cache \
+       --L1-cache {wavedir}/L1.cache \
+       --trigtime {gps} --srate 1024 --seglen 4 \
+       --bayesLine --PSDstart {gps} --PSDlength 4 \
+       --Niter 2000 --NCmin 15  \
+       --bayesLine --gnuplot \
+       --MDC-channel [H1:GW-H,L1:GW-H]   \
+       --MDC-cache [{cachefile},{cachefile}] \
+       --MDC-prefactor {scale} \
+"""
+
+# -- Alternate parameters
+# waveformList = ['sg153', 'lwnb', 'qwnb']
+# mdccache = '/home/jkanner/baysewave/svn/trunk/burstinj/s6/brst_s6.cache'
+# scaleList = ['0.15', '0.3', '0.6', '1.2']
+# topdir = '/home/jkanner/baysewave/test'
+
+# ---------------------------------
+# -- Define templates for run files
+# ---------------------------------
 
 doit_str = """#! /bin/sh
 
@@ -9,8 +50,8 @@ source /home/jkanner/.bashrc.mine
 
 cd {top}
 
-gps=$1
-intgps=${{gps%.*}}
+gps={gps}
+intgps={intgps}
 start=`expr $intgps - 100`
 end=`expr $intgps + 100`
 
@@ -25,36 +66,21 @@ ligo_data_find --observatory L --type L1_LDAS_C02_L2 -s $start -e $end --lal-cac
 
 # ligo_data_find --observatory V --type HrecOnline     -s $start -e $end --lal-cache | grep file > V.cache
 #ligo_data_find --observatory V --type BRST_S6   -s $start -e $end --lal-cache | grep file > Vmdc.cache
-
 # --V1-channel V1:h_16384Hz
 # --MDC-channel V1:GW-H16K
 
-/home/jkanner/baysewave/svn/trunk/src/BayesWaveBurst \
-       --ifo H1 --H1-flow 40 --H1-channel H1:LDAS-STRAIN \
-       --ifo L1 --L1-flow 40 --L1-channel L1:LDAS-STRAIN \
-       --H1-cache H.cache \
-       --L1-cache L.cache \
-       --trigtime $gps --srate 1024 --seglen 8 \
-       --bayesLine --PSDstart $gps --PSDlength 8 \
-       --Niter 1000000 --NCmin 15  \
-       --bayesLine --gnuplot \
-       --MDC-channel [H1:GW-H,L1:GW-H]   \
-       --MDC-cache [{cachefile},{cachefile}] \
-       --MDC-prefactor {scale} \
-
 
-python /home/jkanner/baysewave/svn/trunk/postprocess/skymap/skyview.py --mdc {mdclog}
+# tar -cf chains.tar chains
+# tar -cf waveforms.tar waveforms
+# tar -cf snr.tar snr
 
-tar -cf chains.tar chains
-tar -cf waveforms.tar waveforms
-tar -cf snr.tar snr
 """
 
 
 submit_str = """
-executable={top}/doit.sh
-universe=vanilla
-arguments={gps}
+executable={bwb}
+universe=standard
+arguments={bwbargs}
 output={top}/condorOut.txt
 error={top}/condorError.txt
 log={top}/condorLog.txt
@@ -66,26 +92,10 @@ stream_output=True
 queue 1
 """
 
-
 # -----------------
 # Begin Main Script
 # -----------------
-
-# -- Set paramters
-topdir = '/home/jkanner/baysewave/PEC/mdc_v2'
-# topdir = '/home/jkanner/baysewave/test'
-mdcdir = '/home/jkanner/baysewave/svn/trunk/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'
-
-# -- Alternate parameters
-# waveformList = ['sg153', 'lwnb', 'qwnb']
-# mdccache = '/home/jkanner/baysewave/svn/trunk/burstinj/s6/brst_s6.cache'
-# scaleList = ['0.15', '0.3', '0.6', '1.2']
-
-dagfile = open( os.path.join(topdir, 'submit.dag'), 'w')
+dagfile = open( os.path.join(topdir, 'submit_all.sh'), 'w')
 
 for waveform in waveformList:
     trigfile = os.path.join(mdcdir, "trigs_{0}.txt".format(waveform))
@@ -93,6 +103,18 @@ for waveform in waveformList:
     wavedir = os.path.join(topdir, waveform)
     if not os.path.exists(wavedir): os.makedirs(wavedir)
 
+    # ------------------------------------------------
+    # Call LIGO Data find for whole waveform directory
+    # ------------------------------------------------
+    start = int(trigList.min()) - 50
+    end   = int(trigList.max()) + 50
+    for ifo, frtype in zip(ifoList,frtypeList):
+        cachefilefmt = os.path.join(wavedir, '{0}.cache')
+        ldfcmd = "ligo_data_find --observatory {o} --type {frtype} -s {start} -e {end} --lal-cache | grep file > {cachefile}".format(o=ifo[0], frtype=frtype, cachefile = cachefilefmt.format(ifo), start=start, end=end)
+        print "Calling LIGO data find ..."
+        print ldfcmd
+        subprocess.call(ldfcmd, shell=True)
+
     for scale in scaleList:
         scaledir = os.path.join(wavedir, scale)
         if not os.path.exists(scaledir): os.makedirs(scaledir)
@@ -102,18 +124,21 @@ for waveform in waveformList:
             trigdir = os.path.join(scaledir, 'job_'+trig)
             if not os.path.exists(trigdir): os.makedirs(trigdir)
             
+            bwbargs = bwbargsfmt.format(gps=trig, wavedir=wavedir, cachefile=mdccache, scale=scale) 
             submitname = os.path.join(trigdir, 'submit.txt')
             submitfile = open( submitname, 'w' )
-            submitfile.write(submit_str.format(top=trigdir, gps=trig))
+            submitfile.write(submit_str.format(top=trigdir, bwb=bwb, bwbargs=bwbargs))
             submitfile.close()
             
-            doitfile = open( os.path.join(trigdir, 'doit.sh'), 'w')
-            doitfile.write(doit_str.format(top=trigdir, cachefile=mdccache, scale=scale, mdclog=mdclog))
-            doitfile.close()
-
-            jobname = "{0}_{1}_{2}".format(waveform, scale, int(float(trig)))
-            dagfile.write("JOB {0} {1} \n".format(jobname, submitname))
-            dagfile.write("RETRY {0} 1\n\n".format(jobname))
+            dagfile.write("cd {0}\n".format(trigdir))
+            dagfile.write("condor_submit submit.txt\n\n")
+            # doitfile = open( os.path.join(trigdir, 'doit.sh'), 'w')
+            # doitfile.write(doit_str.format(top=trigdir, cachefile=mdccache, scale=scale, mdclog=mdclog))
+            # doitfile.close()
+
+            #jobname = "{0}_{1}_{2}".format(waveform, scale, int(float(trig)))
+            #dagfile.write("JOB {0} {1} \n".format(jobname, submitname))
+            #dagfile.write("RETRY {0} 1\n\n".format(jobname))
 
 dagfile.close()
 print "Thank you, come again"