Merge branch 'pipe-fixes' into 'master'

Pipe fixes

See merge request lscsoft/bayeswave!82

BayesWaveUtils/scripts/bayeswave_pipe

@@ -31,8 +31,7 @@ import copy
 from glue import pipeline
 
 from lalapps import inspiralutils
-from glue import segments
-import ligo.segments.utils as segmentsUtils
+from ligo import segments
 
 from optparse import OptionParser
 import ConfigParser
@@ -599,7 +598,7 @@ for ifo in ifo_list:
                     segments.segmentlist([segments.segment(gps_start_time,
                         gps_end_time)])
         else:
-            frameSegs[ifo] = segmentsUtils.fromlalcache(open(cache_files[ifo]))
+            frameSegs[ifo] = segments.utils.fromlalcache(open(cache_files[ifo]))
 
         if skip_segment_queries:
             segmentList[ifo] = \
@@ -623,7 +622,7 @@ for ifo in ifo_list:
                     use_available_data=False, data_quality_vetoes=False)
 
             segfile=open(segFileName)
-            segmentList[ifo]=segmentsUtils.fromsegwizard(segfile)
+            segmentList[ifo]=segments.utils.fromsegwizard(segfile)
             segmentList[ifo].coalesce()
             segfile.close()
 
@@ -815,7 +814,8 @@ for t,trigger in enumerate(trigger_list.triggers):
         # Make output directory for this trigger
         outputDir  = 'trigtime_' + str('%.9f'%trigger.trigger_time) + '_' + \
                 str(float(trigger.hl_time_lag)) + '_' +\
-                str(float(trigger.hv_time_lag)) #+ str(uuid.uuid4())
+                str(float(trigger.hv_time_lag)) + '_' + str(t)
+                #str(float(trigger.hv_time_lag)) #+ str(uuid.uuid4())
 
         if not os.path.exists(outputDir): os.makedirs(outputDir)