Skip to content
Snippets Groups Projects
Commit 494e9347 authored by scott snyder's avatar scott snyder
Browse files

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.
parent 2b246501
No related merge requests found
...@@ -14,11 +14,7 @@ theLArCosmicsMonTool = LArCosmicsMonTool(name="LArCosmicsMonTool", ...@@ -14,11 +14,7 @@ theLArCosmicsMonTool = LArCosmicsMonTool(name="LArCosmicsMonTool",
LArBadChannelMask = theLArBadChannelsMasker LArBadChannelMask = theLArBadChannelsMasker
) )
from AthenaCommon.BeamFlags import jobproperties theLArCosmicsMonTool.LArPedestalKey='LArPedestal'
if jobproperties.Global.DataSource.get_Value() == 'data':
theLArCosmicsMonTool.LArPedestalKey='Pedestal'
else:
theLArCosmicsMonTool.LArPedestalKey='LArPedestal'
ToolSvc += theLArCosmicsMonTool ToolSvc += theLArCosmicsMonTool
......
...@@ -48,11 +48,7 @@ theLArDigitMon = LArDigitMon(name="LArDigitMon", ...@@ -48,11 +48,7 @@ theLArDigitMon = LArDigitMon(name="LArDigitMon",
Streams = StreamsToMonitor Streams = StreamsToMonitor
) )
from AthenaCommon.BeamFlags import jobproperties theLArDigitMon.LArPedestalKey='LArPedestal'
if jobproperties.Global.DataSource.get_Value() == 'data':
theLArDigitMon.LArPedestalKey='Pedestal'
else:
theLArDigitMon.LArPedestalKey='LArPedestal'
ToolSvc += theLArDigitMon ToolSvc += theLArDigitMon
......
...@@ -22,11 +22,7 @@ if Type == 'Cosmic': ...@@ -22,11 +22,7 @@ if Type == 'Cosmic':
include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py") include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
include("CaloCosEx/LArSignalReco_Cosmics_jobOptions.py") include("CaloCosEx/LArSignalReco_Cosmics_jobOptions.py")
from AthenaCommon.BeamFlags import jobproperties theLArRawChannelBuilderPedestalDataBase.LArPedestalKey='LArPedestal'
if jobproperties.Global.DataSource.get_Value() == 'data':
theLArRawChannelBuilderPedestalDataBase.LArPedestalKey='Pedestal'
else:
theLArRawChannelBuilderPedestalDataBase.LArPedestalKey='LArPedestal'
else: else:
# Use a simple Tool # Use a simple Tool
......
...@@ -42,10 +42,7 @@ theLArOddCellsMonTool = LArOddCellsMonTool(name="LArOddCellsMonTool", ...@@ -42,10 +42,7 @@ theLArOddCellsMonTool = LArOddCellsMonTool(name="LArOddCellsMonTool",
) )
from AthenaCommon.BeamFlags import jobproperties from AthenaCommon.BeamFlags import jobproperties
if jobproperties.Global.DataSource.get_Value() == 'data': theLArOddCellsMonTool.LArPedestalKey='LArPedestal'
theLArOddCellsMonTool.LArPedestalKey='Pedestal'
else:
theLArOddCellsMonTool.LArPedestalKey='LArPedestal'
#The next line is actually getting all the information. I'm sure this is available offline at the T0, but #The next line is actually getting all the information. I'm sure this is available offline at the T0, but
......
...@@ -120,10 +120,7 @@ theLArRODMonTool = LArRODMonTool(name="LArRODMonTool", ...@@ -120,10 +120,7 @@ theLArRODMonTool = LArRODMonTool(name="LArRODMonTool",
) )
from AthenaCommon.BeamFlags import jobproperties from AthenaCommon.BeamFlags import jobproperties
if jobproperties.Global.DataSource.get_Value() == 'data': theLArRODMonTool.LArPedestalKey='LArPedestal'
theLArRODMonTool.LArPedestalKey='Pedestal'
else:
theLArRODMonTool.LArPedestalKey='LArPedestal'
from LArRecUtils.LArADC2MeVToolDefault import LArADC2MeVToolDefault from LArRecUtils.LArADC2MeVToolDefault import LArADC2MeVToolDefault
theLArRODMonTool.ADC2MeVTool=LArADC2MeVToolDefault() theLArRODMonTool.ADC2MeVTool=LArADC2MeVToolDefault()
......
...@@ -86,7 +86,7 @@ LArDigitMon::LArDigitMon(const std::string& type, ...@@ -86,7 +86,7 @@ LArDigitMon::LArDigitMon(const std::string& type,
/**bool use to mask the bad channels*/ /**bool use to mask the bad channels*/
declareProperty("IgnoreBadChannels", m_ignoreKnownBadChannels=false); declareProperty("IgnoreBadChannels", m_ignoreKnownBadChannels=false);
declareProperty("LArBadChannelMask",m_badChannelMask); declareProperty("LArBadChannelMask",m_badChannelMask);
declareProperty("LArPedestalKey", m_larPedestalKey="Pedestal"); declareProperty("LArPedestalKey", m_larPedestalKey="LArPedestal");
declareProperty("LArDigitContainerKey", m_LArDigitContainerKey = "FREE"); declareProperty("LArDigitContainerKey", m_LArDigitContainerKey = "FREE");
/**default cut to select events*/ /**default cut to select events*/
declareProperty("SigmaCut", m_SigmaCut=5); declareProperty("SigmaCut", m_SigmaCut=5);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment