diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/share/AOD_OutputList_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/share/AOD_OutputList_jobOptions.py
index fe692b4457ee5705948675b346b834083d6a7028..db3a06ac803b697ef0fbfbfec381c6f99c676384 100755
--- a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/share/AOD_OutputList_jobOptions.py
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/share/AOD_OutputList_jobOptions.py
@@ -124,9 +124,6 @@ if DetFlags.detdescr.Calo_on():
AOD_ItemList+=CaloClusterItemList
-if DetFlags.detdescr.Calo_on():
- AOD_ItemList+=["MuonCaloEnergyContainer#MuonCaloEnergyCollection"]
-
AOD_ItemList+=["CaloClusterContainer#Tau1P3PPi0ClusterContainer"]
# TileCell
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPD_OutputDefinitions.py b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPD_OutputDefinitions.py
index 3352c1da3fcf8dee894d689dbcb13640801e85d8..bb93dadf2dadfa7bd1220f0f52a6288d782c44b6 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPD_OutputDefinitions.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPD_OutputDefinitions.py
@@ -199,7 +199,7 @@ def addMuons(streamName=""):
stream.AddItem( ["Muon::MdtPrepDataContainer#MDT_DriftCircles"] )
stream.AddItem( ["Muon::RpcPrepDataContainer#RPC_Measurements"] )
stream.AddItem( ["Muon::TgcPrepDataContainer#TGC_Measurements"] )
- stream.AddItem( ["MuonCaloEnergyContainer#MuonCaloEnergyCollection"] )
+
if primDPD.UseMCTruth() :
stream.AddItem( ["PRD_MultiTruthCollection#*"] )
@@ -667,7 +667,6 @@ def excludeContainersList():
'MissingEtCalo#MET_LocHadTopo',
'MissingETSigHypoContainer#EtMissHypoCollection',
'Rec::MuonSpShowerContainer#MuonSpShowers',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
#'MuonContainer#CaloMuonCollection', #AT 19-Feb-2009
'TileContainer<TileMu>#TileMuObj',
'TileCellVec#MBTSContainer',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py
index 52901b0c5e1676488d468aab878464b52119ea3a..4d1a287713a88fca0282df0abb0b910577fe3ed0 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py
@@ -767,7 +767,6 @@ outList = CfgItemList( 'IDALIGN',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py
index 8e9c41d03516c72d53ce6ac11de571fdeafd7850..cbce63b22a8a349587a32193549f014dbcff3533 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py
@@ -766,7 +766,6 @@ outList = CfgItemList( 'DEDX',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py
index ef51202cf2fd19029eaec9cee3630be99110f38a..9245ac067bc7140d1d158bc7d0c108f0be7e2cbb 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py
@@ -766,7 +766,6 @@ outList = CfgItemList( 'ALLCELLS',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py
index 80b0a68f3de3c335a361d14e0ab765cbbbf960f0..58ea2a7703b2271ae3d35b3a9ae12f0caebe4a1a 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py
@@ -1034,7 +1034,6 @@ outList = CfgItemList( 'EGAMMA',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py
index 04d95457b9848852896c261431d7e27b4920619f..f6738d1e21c5185ee2d5480a255ed934dc9d5faa 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py
@@ -781,7 +781,6 @@ outList = CfgItemList( 'EOVERP',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py
index 3b8d2c00acca23f6577d553ae3713d652630c11e..da2473341926fc548e7b54d66131930cfd8be0a0 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py
@@ -898,7 +898,6 @@ outList = CfgItemList( 'CALJET',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py
index 1005ead8da3c8365a3ae1112937a5196600abf08..b2ee06d8a5e372785ef40c047cd9c25fee70fbd5 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py
@@ -733,7 +733,6 @@ outList = CfgItemList( 'PHOJET',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py
index d983c33b9153f9bfe66057ec376e6cbdab2f379d..bdc484aab118767e953fd6fd4f486ab399e97e1e 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py
@@ -733,7 +733,6 @@ outList = CfgItemList( 'SGLEL',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
index 988f8d48e0da092a8db941a802643eb0b2bb0abb..1566b1c17f02fd451f7509fb01479b666770c177 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
@@ -779,7 +779,6 @@ outList = CfgItemList( 'SLTTMU',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py
index 17d8adec9a70e6d1fae7b42ebfa33a20d21549b5..78bdb95408a35c505a05cdd1ae6f5d69f5e77196 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py
@@ -731,7 +731,6 @@ outList = CfgItemList( 'HIPsStream',
'xAOD::MuonSegmentAuxContainer#MuonSegmentsAux.',
'xAOD::MuonSegmentAuxContainer#NCB_MuonSegmentsAux.',
'Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs',
- 'MuonCaloEnergyContainer#MuonCaloEnergyCollection',
'DataHeader#StreamESD']
)
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/InitializeMuonCaloEnergy.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/InitializeMuonCaloEnergy.cxx
deleted file mode 100644
index 990157d1b8641c6cdbcee8a26c43ff8d62d8ca64..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/InitializeMuonCaloEnergy.cxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// InitializeMuonClusters.cxx, (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-// Include files
-
-#include "InitializeMuonCaloEnergy.h"
-#include "muonEvent/MuonCaloEnergyContainer.h"
-
-/////////////////////////////////////////////////////////////////
-// Constructor
-/////////////////////////////////////////////////////////////////
-
-Rec::InitializeMuonCaloEnergy::InitializeMuonCaloEnergy(const std::string& name,
- ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
- m_muonCaloEnergyContainerName("MuonCaloEnergyContainer")
-{
- declareProperty("MuonCaloEnergyContainer", m_muonCaloEnergyContainerName);
-}
-
-/////////////////////////////////////////////////////////////////
-// Destructor
-/////////////////////////////////////////////////////////////////
-
-Rec::InitializeMuonCaloEnergy::~InitializeMuonCaloEnergy() {}
-
-/////////////////////////////////////////////////////////////////
-// Initialize
-/////////////////////////////////////////////////////////////////
-
-StatusCode Rec::InitializeMuonCaloEnergy::initialize() {
-
- ATH_MSG_INFO ("Initialize done in "<<name());
- return StatusCode::SUCCESS;
-}
-
-/////////////////////////////////////////////////////////////////
-// Finalize
-/////////////////////////////////////////////////////////////////
-
-StatusCode Rec::InitializeMuonCaloEnergy::finalize() {
- return StatusCode::SUCCESS;
-}
-
-/////////////////////////////////////////////////////////////////
-// Execute
-/////////////////////////////////////////////////////////////////
-
-StatusCode Rec::InitializeMuonCaloEnergy::execute() {
-
- if (evtStore()->contains<MuonCaloEnergyContainer>(m_muonCaloEnergyContainerName) ) {
-
- const MuonCaloEnergyContainer * tmp;
- if ( evtStore()->retrieve(tmp,m_muonCaloEnergyContainerName).isSuccess() ) {
- if ( evtStore()->remove(tmp).isSuccess() )
- ATH_MSG_DEBUG ("removed pre-existing MuonCaloEnergyContainer" );
- }
- }
-
- MuonCaloEnergyContainer * caloEnergyContainer = new MuonCaloEnergyContainer();
- StatusCode sc = evtStore()->record(caloEnergyContainer, m_muonCaloEnergyContainerName);
- if ( sc.isFailure() ) {
- ATH_MSG_WARNING ("Not able to create Muon CaloEnergy Container - bailing out ...");
- return StatusCode::SUCCESS;
- }
-
- return StatusCode::SUCCESS;
-}
-
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/InitializeMuonCaloEnergy.h b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/InitializeMuonCaloEnergy.h
deleted file mode 100644
index b405dae7cf24b9fe9bcdd2b4f25fea35b9b886d4..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/InitializeMuonCaloEnergy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef REC_INITIALIZEMUONCALOENERGY_H
-#define REC_INITIALIZEMUONCALOENERGY_H
-/*****************************************************************************
-Name : InitialzeMuonCaloEnergy.h
-Package : Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs
-Author : Ketevi A. Assamagan
-Created : August 2007
-Note :
-
-DESCRIPTION:
-
- - Initalization of Muon CaloEnergy Making: open a storegate container.
- - called before any combined muon algorithm runs
-
-*****************************************************************************/
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include <string>
-
-namespace Rec {
- class InitializeMuonCaloEnergy : public AthAlgorithm {
- public:
-
- InitializeMuonCaloEnergy(const std::string& name, ISvcLocator* pSvcLocator);
- ~InitializeMuonCaloEnergy();
-
- StatusCode initialize();
- StatusCode finalize();
- StatusCode execute();
-
- private:
-
- std::string m_muonCaloEnergyContainerName;
-
- };
-}
-
-#endif // REC_INITIALIZEMUONCALOENERGY_H
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/MergeMuonCaloEnergyContainers.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/MergeMuonCaloEnergyContainers.cxx
deleted file mode 100644
index 248e4e5a5fc3a698e15a8e2120e8e32d1cd19908..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/MergeMuonCaloEnergyContainers.cxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// MergeCaloClusterContainers.cxx, (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-//this
-#include "MergeMuonCaloEnergyContainers.h"
-
-//muonEvent
-#include "muonEvent/MuonCaloEnergyContainer.h"
-#include "muonEvent/MuonContainer.h"
-#include "muonEvent/Muon.h"
-#include "muonEvent/CaloEnergy.h"
-
-/////////////////////////////////////////////////////////////////
-// Constructor
-/////////////////////////////////////////////////////////////////
-
-Rec :: MergeMuonCaloEnergyContainers :: MergeMuonCaloEnergyContainers(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
- m_MuonCaloEnergyContainerTarget("MuonCaloEnergyCollection"),
- m_NewMuonCollection("StacoMuonCollection")
-{
- declareProperty("MuonCaloEnergyContainerTarget", m_MuonCaloEnergyContainerTarget);
- declareProperty("NewMuonCollection", m_NewMuonCollection);
-}
-
-/////////////////////////////////////////////////////////////////
-//Initialize
-/////////////////////////////////////////////////////////////////
-
-StatusCode Rec::MergeMuonCaloEnergyContainers::initialize()
-{
- ATH_MSG_INFO ("Initialize done in "<<name());
- return StatusCode::SUCCESS;
-}
-
-/////////////////////////////////////////////////////////////////
-// Finalize
-/////////////////////////////////////////////////////////////////
-
-StatusCode Rec::MergeMuonCaloEnergyContainers::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-
-/////////////////////////////////////////////////////////////////
-// Execute
-/////////////////////////////////////////////////////////////////
-
-StatusCode Rec::MergeMuonCaloEnergyContainers::execute()
-{
- const MuonCaloEnergyContainer * muonCaloEnergyContainerTarget(NULL);
- const Analysis::MuonContainer * muonCollection_const(NULL);
-
- if(!evtStore()->retrieve(muonCaloEnergyContainerTarget, m_MuonCaloEnergyContainerTarget).isSuccess())
- {
- ATH_MSG_FATAL ("Cannot retrieve " << m_MuonCaloEnergyContainerTarget <<" !");
- return StatusCode::FAILURE;
- }
- if(!evtStore()->retrieve(muonCollection_const, m_NewMuonCollection).isSuccess())
- {
- ATH_MSG_FATAL("Cannot retrieve " << m_NewMuonCollection<<" !");
- return StatusCode::FAILURE;
- }
-
- Analysis::MuonContainer * muonCollection(const_cast<Analysis::MuonContainer *>(muonCollection_const));
-
- for(Analysis::MuonContainer :: iterator it=muonCollection->begin(); it!=muonCollection->end(); it++)
- {
- Analysis::Muon *muon(*it);
- if(muon->caloEnergyLink().isValid())
- {
- CaloEnergy* caloEnergy(new CaloEnergy(**(muon->caloEnergyLink())));
- const_cast<MuonCaloEnergyContainer *>(muonCaloEnergyContainerTarget)->push_back(caloEnergy);
- muon->set_energyLoss(muonCaloEnergyContainerTarget, caloEnergy);
- }
- }
- return StatusCode::SUCCESS;
-}
-
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/MergeMuonCaloEnergyContainers.h b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/MergeMuonCaloEnergyContainers.h
deleted file mode 100644
index 0494cb7cd4728287886b33c266da37289e6b0b8d..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/MergeMuonCaloEnergyContainers.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef REC_MERGEMUONCALOENERGYCONTAINERS_H
-#define REC_MERGEMUONCALOENERGYCONTAINERS_H
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include <string>
-
-namespace Rec {
- /** @class MergeMuonCaloEnergyContainers
- @brief update MuonCaloEnergies container during AODfix procedures
- @author Felix Rauscher
- */
-
- class MergeMuonCaloEnergyContainers : public AthAlgorithm {
- public:
- //Constructor
- MergeMuonCaloEnergyContainers(const std::string& name, ISvcLocator* pSvcLocator);
-
- //Algoritm interface functions
- StatusCode initialize();
- StatusCode finalize();
- StatusCode execute();
-//=============================================================================
- private:
-
- //MuonCaloEnergyContainer target and new container - job option
- std::string m_MuonCaloEnergyContainerTarget;
-
- //Newly created muon collection - job option
- std::string m_NewMuonCollection;
-
- };
-}
-
-
-#endif //REC_MERGEMUONCALOENERGYCONTAINERS_H
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
index ebb69d1193504fba0c95d65fbdad40ce7b171e49..2723e5fe0b812a80423613d766dd39b41bc0adff 100644
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
@@ -1,8 +1,6 @@
#include "../FinalizeMuonContainers.h"
#include "../InitializeMuonClusters.h"
#include "../FinalizeMuonClusters.h"
-#include "../InitializeMuonCaloEnergy.h"
-#include "../MergeMuonCaloEnergyContainers.h"
#include "../MergeMuonCaloClusterContainers.h"
#include "../MuonToTrackConverterAlg.h"
#include "../MuonTrackSlimmer.h"
@@ -10,8 +8,6 @@
DECLARE_COMPONENT( Rec::FinalizeMuonContainers )
DECLARE_COMPONENT( Rec::InitializeMuonClusters )
DECLARE_COMPONENT( Rec::FinalizeMuonClusters )
-DECLARE_COMPONENT( Rec::InitializeMuonCaloEnergy )
-DECLARE_COMPONENT( Rec::MergeMuonCaloEnergyContainers )
DECLARE_COMPONENT( Rec::MergeMuonCaloClusterContainers )
DECLARE_COMPONENT( MuonToTrackConverterAlg )
DECLARE_COMPONENT( Rec::MuonTrackSlimmer )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py
index 92f8939e673c13792f22ebc3d376a959f79b5165..3631d313e9c320d04d3a9d6e7db2ee7d3bfe50e6 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py
@@ -5,17 +5,6 @@
include.block ("MuonCombinedRecExample/MuonCombinedRec_preprocessing.py")
from AthenaCommon import CfgMgr
#
-# Muon Calo Energy Container is needed even if Calo is Off: use the parametrized energy loss in that case - KAA
-if rec.doMuonCombined() and muonCombinedRecFlags.doAnyMuons() and DetFlags.Muon_on():
- # Needed by MuonIsolationTools - whether calo is ON or OFF. In calo is Off use parametrized energy loss - KAA
-
- InitializeMuonCaloEnergy = CfgMgr.Rec__InitializeMuonCaloEnergy(
- name = "InitializeMuonCaloEnergy",
- MuonCaloEnergyContainer = "MuonCaloEnergyCollection"
- )
- topSequence += InitializeMuonCaloEnergy
- if muonCombinedRecFlags.printConfigurables():
- print InitializeMuonCaloEnergy
if rec.doMuonCombined() and muonCombinedRecFlags.doMuonClusters() and ( rec.readAOD() or rec.readESD() or DetFlags.haveRIO.Calo_on() ):
# hack until MuonClusterCollection is properly added to ObjKeyStore
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
index 3714c04ab2ea61305e8bbaf0dea5a1e1e71e9ebc..298d2589cd45a950b56208696118acfdcda492b7 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
@@ -23,7 +23,6 @@ if DetFlags.detdescr.Muon_on():
MuonCombinedAODList+=[ "xAOD::TrackParticleAuxContainer#"+MuonCbKeys.SpectrometerParticles()+"Aux." + excludedAuxData ]
MuonCombinedAODList+=[ "xAOD::MuonContainer#Muons" ]
MuonCombinedAODList+=[ "xAOD::MuonAuxContainer#MuonsAux.-DFCommonMuonsTight.-DFCommonGoodMuon.-DFCommonMuonsMedium.-DFCommonMuonsLoose" ] # See note
- MuonCombinedAODList+=["MuonCaloEnergyContainer#MuonCaloEnergyCollection"]
MuonCombinedAODList+=["xAOD::MuonSegmentContainer#"+MuonCbKeys.MuGirlxAODSegments()]
MuonCombinedAODList+=["xAOD::MuonSegmentAuxContainer#"+MuonCbKeys.MuGirlxAODSegments()+"Aux."]
# Note: hack to remove derivation framework variables that are added by DRAW building and are supposed to be transient
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsESD.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsESD.py
index 8e8cce48b171c07e3843121a21a7328a9457d2f9..84a4e09705253c1d3b062526e329f34eacbd6165 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsESD.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsESD.py
@@ -19,9 +19,6 @@ if DetFlags.detdescr.Muon_on():
MuonCombinedESDList+=["Trk::SegmentCollection#"+MuonCbKeys.MuGirlSegments()]
MuonCombinedESDList+=["Trk::SegmentCollection#"+MuonCbKeys.MuGirlStauSegments()]
- # Calo
- MuonCombinedESDList+=["MuonCaloEnergyContainer#MuonCaloEnergyCollection"]
-
# muon track in muon spectrometer
if rec.doTruth():
#Combined Tracks