Added support for dq tags

bin/workflows/pycbc_make_offline_search_workflow

@@ -126,8 +126,12 @@ save_fig_with_metadata(time_str, time_file.storage_path, **kwds)
 
 # Get segments and find the data locations
 sci_seg_name = 'science'
+science_tags = []
+if 'science' in workflow.cp.get_subsections('workflow-segments'):
+    science_tags = ['science']
 science_seg_file = wf.get_segments_file(workflow, sci_seg_name, 'segments-science',
-                                        rdir['analysis_time/segment_data'])
+                                        rdir['analysis_time/segment_data'],
+                                        tags=science_tags)
 
 ssegs = {}
 for ifo in workflow.ifos:
@@ -143,15 +147,23 @@ datafind_files, analyzable_file, analyzable_segs, analyzable_name = \
                                      seg_file=science_seg_file, tags=hoft_tags)
 
 final_veto_name = 'vetoes'
+veto_tags = []
+if 'veto' in workflow.cp.get_subsections('workflow-segments'):
+    veto_tags = ['veto']
 final_veto_file = wf.get_segments_file(workflow, final_veto_name,
                                        'segments-vetoes',
-                                       rdir['analysis_time/segment_data'])
+                                       rdir['analysis_time/segment_data'],
+                                       tags=veto_tags)
 
 # Get dq segments from veto definer and calculate data quality timeseries
 dq_flag_name = 'dq_flag'
+dq_tags = []
+if 'dq' in workflow.cp.get_subsections('workflow-segments'):
+    dq_tags = ['dq']
 dq_segment_file = wf.get_flag_segments_file(workflow, dq_flag_name,
                                       'segments-dq',
-                                      rdir['analysis_time/segment_data'])
+                                      rdir['analysis_time/segment_data'],
+                                      tags=dq_tags)
 
 # Template bank stuff
 hdfbank = wf.setup_tmpltbank_workflow(workflow, analyzable_segs,

pycbc/workflow/segment.py

@@ -61,7 +61,7 @@ def save_veto_definer(cp, out_dir, tags=None):
     return veto_def_new_path
 
 
-def get_segments_file(workflow, name, option_name, out_dir):
+def get_segments_file(workflow, name, option_name, out_dir, tags=None):
     """Get cumulative segments from option name syntax for each ifo.
 
     Use syntax of configparser string to define the resulting segment_file
@@ -76,6 +76,9 @@ def get_segments_file(workflow, name, option_name, out_dir):
         Name of the segment list being created
     option_name: str
         Name of option in the associated config parser to get the flag list
+    tags : list of strings
+        Used to retrieve subsections of the ini file for
+        configuration options.
 
     returns
     --------
@@ -95,18 +98,19 @@ def get_segments_file(workflow, name, option_name, out_dir):
 
     # Check for provided server
     server = "https://segments.ligo.org"
-    if cp.has_option("workflow-segments", "segments-database-url"):
-        server = cp.get("workflow-segments",
-                                 "segments-database-url")
+    if cp.has_option_tags("workflow-segments", "segments-database-url", tags):
+        server = cp.get_opt_tags("workflow-segments",
+                                 "segments-database-url", tags)
 
-    if cp.has_option("workflow-segments", "segments-source"):
-        source = cp.get("workflow-segments", "segments-source")
+    if cp.has_option_tags("workflow-segments", "segments-source", tags):
+        source = cp.get_opt_tags("workflow-segments", "segments-source", tags)
     else:
         source = "any"
 
     if source == "file":
         local_file_path = \
-            resolve_url(cp.get("workflow-segments", option_name+"-file"))
+            resolve_url(cp.get_opt_tag("workflow-segments",
+                                       option_name+"-file", tags))
         pfn = os.path.join(out_dir, os.path.basename(local_file_path))
         shutil.move(local_file_path, pfn)
         return SegFile.from_segment_xml(pfn)
@@ -380,7 +384,7 @@ def generate_triggered_segment(workflow, out_dir, sciencesegs):
     except UnboundLocalError:
         return None, min_seg
 
-def get_flag_segments_file(workflow, name, option_name, out_dir):
+def get_flag_segments_file(workflow, name, option_name, out_dir, tags=None):
      """Get segments from option name syntax for each ifo for indivudal flags.
 
      Use syntax of configparser string to define the resulting segment_file
@@ -415,15 +419,17 @@ def get_flag_segments_file(workflow, name, option_name, out_dir):
 
      # Check for provided server
      server = "https://segments.ligo.org"
-     if cp.has_option("workflow-segments", "segments-database-url"):
-         server = cp.get("workflow-segments", "segments-database-url")
+     if cp.has_option_tags("workflow-segments", "segments-database-url", tags):
+         server = cp.get_opt_tags("workflow-segments",
+                                  "segments-database-url", tags)
 
      source = "any"
-     if cp.has_option("workflow-segments", "segments-source"):
-         source = cp.get("workflow-segments", "segments-source")
+     if cp.has_option_tags("workflow-segments", "segments-source", tags):
+         source = cp.get_opt_tags("workflow-segments", "segments-source", tags)
      if source == "file":
          local_file_path = \
-             resolve_url(cp.get("workflow-segments", option_name+"-file"))
+             resolve_url(cp.get_opt_tags("workflow-segments",
+                                         option_name+"-file", tags))
          pfn = os.path.join(out_dir, os.path.basename(local_file_path))
          shutil.move(local_file_path, pfn)
          return SegFile.from_segment_xml(pfn)