Skip to content

Commit

Permalink
Merge pull request #22477 from fabozzi/from-CMSSW_7_1_X_dasgoclient
Browse files Browse the repository at this point in the history
Using dasgoclient for das queries in runTheMatrix (71X)
  • Loading branch information
cmsbuild committed Mar 12, 2018
2 parents ff0829b + c96d30f commit a9658a2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Configuration/Applications/python/ConfigBuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def filesFromDASQuery(query,s=None):
prim=[]
sec=[]
print "the query is",query
for line in os.popen('das_client.py --query "%s"'%(query)):
for line in os.popen('dasgoclient --query "%s"'%(query)):
if line.count(".root")>=2:
#two files solution...
entries=line.replace("\n","").split()
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ def __init__(self,dataSet,label='',run=[],files=1000,events=InputInfoNDefault,sp

def das(self, das_options):
if len(self.run) is not 0:
command = ";".join(["das_client.py %s --query '%s'" % (das_options, query) for query in self.queries()])
command = ";".join(["dasgoclient %s --query '%s'" % (das_options, query) for query in self.queries()])
command = "({0})".format(command)
else:
command = "das_client.py %s --query '%s'" % (das_options, self.queries()[0])
command = "dasgoclient %s --query '%s'" % (das_options, self.queries()[0])

# Run filter on DAS output
if self.ib_blacklist:
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/scripts/runTheMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def runSelected(opt):
action='store_true')

parser.add_option('--das-options',
help='Options to be passed to das_client.py.',
help='Options to be passed to das_client',
dest='dasOptions',
default="--limit 0",
action='store')
Expand Down

0 comments on commit a9658a2

Please sign in to comment.