From bb318f4a0fa2d751507a01204b4fef9f78754fa4 Mon Sep 17 00:00:00 2001 From: Andreas Pfeiffer Date: Fri, 30 Oct 2009 14:53:35 +0000 Subject: [PATCH] --- yaml --- r: 76702 b: "refs/heads/CMSSW_7_1_X" c: 568a7dd6b94f472af3c4cd521d68cdb3d519fc0d h: "refs/heads/CMSSW_7_1_X" v: v3 --- [refs] | 2 +- .../PyReleaseValidation/python/cmsDriverOptions.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 84b4f48a2ef2f..94d7f08eecee4 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 88c0b2d64afb6ce81cac11f56e8220f9c47b6bf6 +"refs/heads/CMSSW_7_1_X": 568a7dd6b94f472af3c4cd521d68cdb3d519fc0d diff --git a/trunk/Configuration/PyReleaseValidation/python/cmsDriverOptions.py b/trunk/Configuration/PyReleaseValidation/python/cmsDriverOptions.py index 1930d8dd6ed7e..a8eb5ac5e9f5b 100755 --- a/trunk/Configuration/PyReleaseValidation/python/cmsDriverOptions.py +++ b/trunk/Configuration/PyReleaseValidation/python/cmsDriverOptions.py @@ -5,6 +5,7 @@ import optparse import sys import os +import re import Configuration.PyReleaseValidation from Configuration.PyReleaseValidation.ConfigBuilder import ConfigBuilder, defaultOptions import traceback @@ -216,8 +217,10 @@ if len(sys.argv)==1: raise "Event Type: ", "No event type specified!" -# check whether steps are compatible -if ("HLT" in options.step and "RECO" in options.step): +# check whether steps are compatible, but make sure we don't trigger on AlCaxyzHLT and L1Reco +hltRe = re.compile('.*[,\s]HLT[,\s].*') +recoRe = re.compile('.*[,\s]RECO[,\s].*') +if ( hltRe.match(str(options.step)) and recoRe.match(str(options.step))): print "ERROR: HLT and RECO cannot be run in the same process" sys.exit(1)