Merge pull request cms-sw#2587 from ktf/get-das-queries

Misc updates -- Refactor InputInfo to easily get the list of DAS queries.

Author: ktf

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -51,13 +51,11 @@ def __init__(self,dataSet,label='',run=[],files=1000,events=InputInfoNDefault,sp
         self.ib_block = ib_block
 
     def das(self, das_options):
-        query_by = "block" if self.ib_block else "dataset"
-        query_source = "{0}#{1}".format(self.dataSet, self.ib_block) if self.ib_block else self.dataSet
         if len(self.run) is not 0:
-            command = ";".join(["das_client.py {3} --query 'file {0}={1} run={2}'".format(query_by, query_source, query_run, das_options) for query_run in self.run])
+            command = ";".join(["das_client.py %s --query '%s'" % (das_options, query) for query in self.queries()])
             command = "({0})".format(command)
         else:
-            command = "das_client.py {2} --query 'file {0}={1} site=T2_CH_CERN'".format(query_by, query_source, das_options)
+            command = "das_client.py %s --query '%s'" % (das_options, self.queries()[0])
 
         # Run filter on DAS output 
         if self.ib_blacklist:
@@ -71,6 +69,14 @@ def lumiRanges(self):
             return "echo '{\n"+",".join(('"%d":[[1,268435455]]\n'%(x,) for x in self.run))+"}'"
         return None
 
+    def queries(self):
+        query_by = "block" if self.ib_block else "dataset"
+        query_source = "{0}#{1}".format(self.dataSet, self.ib_block) if self.ib_block else self.dataSet
+        if len(self.run) is not 0:
+            return ["file {0}={1} run={2}".format(query_by, query_source, query_run) for query_run in self.run]
+        else:
+            return ["file {0}={1} site=T2_CH_CERN".format(query_by, query_source)]
+
     def __str__(self):
         if self.ib_block:
             return "input from: {0} with run {1}#{2}".format(self.dataSet, self.ib_block, self.run)