From 494e93472f8c59d433e105497c5ada6af655fa9f Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 21 Mar 2018 23:57:40 +0100
Subject: [PATCH] LArMonTools: Uniformly use LArPedestal as the SG key.
The Pedestal conditions were being called Pedestal in data conditions
and LArPedistal in MC conditions. This was causing problems when
we tried to extend to conditions handles. Try to uniformly use
LArPedestal as the SG key.
---
.../LArMonTools/share/LArCosmicsMonTool_jobOptions.py | 6 +-----
LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py | 6 +-----
LArCalorimeter/LArMonTools/share/LArMonBuilders.py | 6 +-----
.../LArMonTools/share/LArOddCellsMonTool_jobOptions.py | 5 +----
.../LArMonTools/share/LArRODMonTool_jobOptions.py | 5 +----
LArCalorimeter/LArMonTools/src/LArDigitMon.cxx | 2 +-
6 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
index 62224d6be4f..7202e20a15a 100755
--- a/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
@@ -14,11 +14,7 @@ theLArCosmicsMonTool = LArCosmicsMonTool(name="LArCosmicsMonTool",
LArBadChannelMask = theLArBadChannelsMasker
)
-from AthenaCommon.BeamFlags import jobproperties
-if jobproperties.Global.DataSource.get_Value() == 'data':
- theLArCosmicsMonTool.LArPedestalKey='Pedestal'
-else:
- theLArCosmicsMonTool.LArPedestalKey='LArPedestal'
+theLArCosmicsMonTool.LArPedestalKey='LArPedestal'
ToolSvc += theLArCosmicsMonTool
diff --git a/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py
index 4e073341a23..b53662da5c6 100644
--- a/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py
@@ -48,11 +48,7 @@ theLArDigitMon = LArDigitMon(name="LArDigitMon",
Streams = StreamsToMonitor
)
-from AthenaCommon.BeamFlags import jobproperties
-if jobproperties.Global.DataSource.get_Value() == 'data':
- theLArDigitMon.LArPedestalKey='Pedestal'
-else:
- theLArDigitMon.LArPedestalKey='LArPedestal'
+theLArDigitMon.LArPedestalKey='LArPedestal'
ToolSvc += theLArDigitMon
diff --git a/LArCalorimeter/LArMonTools/share/LArMonBuilders.py b/LArCalorimeter/LArMonTools/share/LArMonBuilders.py
index 6b92cd0cf6b..b1e7801f30e 100644
--- a/LArCalorimeter/LArMonTools/share/LArMonBuilders.py
+++ b/LArCalorimeter/LArMonTools/share/LArMonBuilders.py
@@ -22,11 +22,7 @@ if Type == 'Cosmic':
include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
include("CaloCosEx/LArSignalReco_Cosmics_jobOptions.py")
- from AthenaCommon.BeamFlags import jobproperties
- if jobproperties.Global.DataSource.get_Value() == 'data':
- theLArRawChannelBuilderPedestalDataBase.LArPedestalKey='Pedestal'
- else:
- theLArRawChannelBuilderPedestalDataBase.LArPedestalKey='LArPedestal'
+ theLArRawChannelBuilderPedestalDataBase.LArPedestalKey='LArPedestal'
else:
# Use a simple Tool
diff --git a/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py
index 6f00369e9fd..7362ac50b71 100755
--- a/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py
@@ -42,10 +42,7 @@ theLArOddCellsMonTool = LArOddCellsMonTool(name="LArOddCellsMonTool",
)
from AthenaCommon.BeamFlags import jobproperties
-if jobproperties.Global.DataSource.get_Value() == 'data':
- theLArOddCellsMonTool.LArPedestalKey='Pedestal'
-else:
- theLArOddCellsMonTool.LArPedestalKey='LArPedestal'
+theLArOddCellsMonTool.LArPedestalKey='LArPedestal'
#The next line is actually getting all the information. I'm sure this is available offline at the T0, but
diff --git a/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py
index 526f5c8f4b7..fe66877dcb9 100755
--- a/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py
@@ -120,10 +120,7 @@ theLArRODMonTool = LArRODMonTool(name="LArRODMonTool",
)
from AthenaCommon.BeamFlags import jobproperties
-if jobproperties.Global.DataSource.get_Value() == 'data':
- theLArRODMonTool.LArPedestalKey='Pedestal'
-else:
- theLArRODMonTool.LArPedestalKey='LArPedestal'
+theLArRODMonTool.LArPedestalKey='LArPedestal'
from LArRecUtils.LArADC2MeVToolDefault import LArADC2MeVToolDefault
theLArRODMonTool.ADC2MeVTool=LArADC2MeVToolDefault()
diff --git a/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx b/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx
index 08fcc02a727..0239fa0446e 100755
--- a/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx
@@ -86,7 +86,7 @@ LArDigitMon::LArDigitMon(const std::string& type,
/**bool use to mask the bad channels*/
declareProperty("IgnoreBadChannels", m_ignoreKnownBadChannels=false);
declareProperty("LArBadChannelMask",m_badChannelMask);
- declareProperty("LArPedestalKey", m_larPedestalKey="Pedestal");
+ declareProperty("LArPedestalKey", m_larPedestalKey="LArPedestal");
declareProperty("LArDigitContainerKey", m_LArDigitContainerKey = "FREE");
/**default cut to select events*/
declareProperty("SigmaCut", m_SigmaCut=5);
--
GitLab