diff --git a/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py b/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py index 4af4843c9e5119ff2aabf64ff6af109a873413c3..34d2ae7b29cea32f5df844ce7b382ccf222ed522 100644 --- a/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py +++ b/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py @@ -15,7 +15,8 @@ def DataQualityToolsConfig(flags): # the following should not run in RAW to ESD, if we're in two-step if flags.DQ.Environment != 'tier0Raw': - result.merge(DQTLumiMonAlgConfig(flags)) + if flags.DQ.DataType != 'cosmics': + result.merge(DQTLumiMonAlgConfig(flags)) # only when input is RAW if flags.DQ.Environment in ('online', 'tier0', 'tier0Raw'): diff --git a/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py b/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py index f4ae4b2a6325b701f7e88db2b29f858ec99dcaca..ca363c26e4bdd14ace498c95a595c988c3cdedfd 100644 --- a/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py +++ b/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py @@ -23,9 +23,10 @@ def LArMonitoringConfig(inputFlags): # algos which can run in ESD but not AOD: if inputFlags.DQ.Environment != 'AOD': - from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg - acc.merge(BunchCrossingCondAlgCfg(inputFlags)) - acc.merge(LArCollisionTimeMonConfig(inputFlags)) + if inputFlags.DQ.DataType != 'cosmics': + from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg + acc.merge(BunchCrossingCondAlgCfg(inputFlags)) + acc.merge(LArCollisionTimeMonConfig(inputFlags)) # and others on RAW data only if inputFlags.DQ.Environment in ('online', 'tier0', 'tier0Raw'): diff --git a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py index 1011958409824c234afd7ac7e85aafbd06fcabb4..d991f41e12e3f325ddd10e428020d17a5ec53e3f 100644 --- a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py +++ b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py @@ -30,6 +30,8 @@ def LuminosityCondAlgCfg (configFlags, useOnlineLumi=None, suffix=None): if configFlags.Input.isMC: log.info ("LuminosityCondAlgCfg called for MC!") kwargs = luminosityCondAlgMCCfg (configFlags, name, result) + elif configFlags.Beam.Type != 'collisions': + kwargs = luminosityCondAlgCosmicsCfg (configFlags, name, result) elif ((useOnlineLumi is None and configFlags.Common.useOnlineLumi) or (useOnlineLumi is not None and useOnlineLumi)): kwargs = luminosityCondAlgOnlineCfg (configFlags, name, result) @@ -59,7 +61,12 @@ def luminosityCondAlgMCCfg (configFlags, name, result): 'BunchGroupInputKey' : '', 'FillParamsInputKey' : '' } - +def luminosityCondAlgCosmicsCfg (configFlags, name, result): + return { 'LuminosityFolderInputKey' : '', + 'OnlineLumiCalibrationInputKey' : '', + 'BunchLumisInputKey' : '', + 'BunchGroupInputKey' : '', + 'FillParamsInputKey' : '' } # Configuration for offline default luminosity used in Run2 def luminosityCondAlgRun2Cfg (configFlags, name, result):