diff --git a/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py b/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py index d72669b366b26612d3f7eb84e6153ddaf290a877..b397a8f00f61a85e480543758f552da4cb65fb05 100755 --- a/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py +++ b/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py @@ -80,10 +80,10 @@ def readHashes(joFileName="", smk=0, dbAlias=""): from TrigConfIO.HLTTriggerConfigAccess import HLTJobOptionsAccess joData = HLTJobOptionsAccess(dbalias = dbAlias, smkey = smk) else: - log.debug("Additional names not available") + log.debug("Additional collection's names from HLTJobOptions file are not available") return list() except Exception as err: - log.warning("Retrieving additional names failed: {0}".format(err)) + log.warning("Retrieving additional names fron HLTJO failed: {0}".format(err)) return list() namesList = set() @@ -135,13 +135,15 @@ def hltConfigSvcCfg(flags, smk, dbAlias): hltConfigSvc.InputType = "file" hltConfigSvc.XMLMenuFile = "None" hltConfigSvc.JsonFileName = menuFile - else: + elif smk and dbAlias: log.debug("Reading HLTMenu from database {0} {1}".format(smk, dbAlias)) hltConfigSvc.InputType = "DB" hltConfigSvc.JsonFileName = "" hltConfigSvc.TriggerDB = dbAlias hltConfigSvc.SMK = smk + else: + log.error("Cannot read the HLTMenu! Provide file or relevant keys.") acc.addService(hltConfigSvc, False, True) @@ -155,6 +157,7 @@ def readConfigFromCool(smk, dbAlias): runNumber = GetFileMD(ConfigFlags.Input.Files)['runNumbers'][0] configKeys = TriggerCoolUtil.getHLTConfigKeys(dbconn, [[runNumber, runNumber]]) + log.debug("Getting keys from COOL for run {0}".format(runNumber)) if configKeys and runNumber in configKeys.keys(): if not smk: smk = configKeys[runNumber]['SMK'] @@ -166,12 +169,14 @@ def readConfigFromCool(smk, dbAlias): log.debug("Config keys are SMK: {0} DB alias: {1}".format(smk, dbAlias)) else: - log.error("Configuration keys not found!") + log.debug("Configuration keys for run {0} not found!".format(runNumber)) + dbAlias = None if not dbAlias else dbAlias + smk = None if not smk else smk return (smk, dbAlias) -# Get HLT Menu from json file or from DB +# Get HLT Menu from json file def getHltMenu(): # Try to find local menu file menuFileName = 'HLTMenu_.*json' @@ -207,7 +212,7 @@ if __name__=='__main__': parser.add_argument('--maxEvents', type=int, help='Maximum number of events to process') parser.add_argument('--skipEvents',type=int, help='Number of events to skip') - parser.add_argument('--loglevel', type=int, default=3, help='Verbosity level') + parser.add_argument('--loglevel', type=int, default=3, help='Verbosity level: 1 - VERBOSE, 2 - DEBUG, 3 - INFO') parser.add_argument('flags', nargs='*', help='Config flag overrides') args = parser.parse_args()