diff --git a/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py index 62224d6be4f1efa4bcb77b440dcc2919e6ec415d..7202e20a15ac38ee6e283d5de3e64952fa3b1487 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 4e073341a239f903075a820685d2c97a98a202f0..b53662da5c690ac4598e96d7b2a4305075417a91 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 6b92cd0cf6bf0403be6e5539d88347b28cad365c..b1e7801f30ec07af5c9ab88dc14ca5ad0a27a4f3 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 6f00369e9fd993c76b363741e7fdfb657471be80..7362ac50b71a7c407cf1ebf2da52b672cecf9d4f 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 526f5c8f4b7aef4bbb9489e9f11c9a39f33d85ed..fe66877dcb9b53a8590955979142a443cc9d1d58 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 08fcc02a72725a83eb601dfa78de7824134de72e..0239fa0446e5a3e97f8fd561250f803ed7464544 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);