From dcfe32e88562ed5f6567a16bb1f96cd0cd6ceda2 Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Tue, 2 Jun 2020 13:28:42 -0500
Subject: [PATCH] Small changes to reduce error messages in cosmics running
---
.../DataQualityTools/python/DataQualityToolsConfig.py | 3 ++-
.../LArConfiguration/python/LArMonitoringConfig.py | 7 ++++---
.../LumiBlockComps/python/LuminosityCondAlgConfig.py | 9 ++++++++-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py b/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py
index 4af4843c9e5..34d2ae7b29c 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 f4ae4b2a632..ca363c26e4b 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 10119584098..d991f41e12e 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):
--
GitLab