From 61e652d69f8fa4222d866c702d3311c4cc1b9b31 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Thu, 21 Mar 2019 17:44:18 +0100
Subject: [PATCH] Drop keyless retrieve of xAOD::EventInfo in
CscDigitizationTool
CscDigitizationTool was retrieving an `xAOD::EventInfo` object from the
`evtStore` and storing the event and run numbers in member variables.
These values were only used in two DEBUG messages.
---
.../CSC_Digitization/CMakeLists.txt | 3 +--
.../CSC_Digitization/CscDigitizationTool.h | 5 -----
.../CSC_Digitization/src/CscDigitizationTool.cxx | 15 +++------------
3 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
index 9500ba5150a..74b338bb3d5 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
Control/PileUpTools
- Event/xAOD/xAODEventInfo
GaudiKernel
MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
@@ -32,7 +31,7 @@ atlas_add_component( CSC_Digitization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib xAODEventInfo GaudiKernel MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonSimData MuonSimEvent HitManagement StoreGateLib SGtests GeneratorObjects )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib GaudiKernel MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonSimData MuonSimEvent HitManagement StoreGateLib SGtests GeneratorObjects )
# Install files from the package:
atlas_install_headers( CSC_Digitization )
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h
index 3471731333f..ada19032c6f 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h
@@ -21,9 +21,6 @@
#include "MuonSimEvent/CSCSimHitCollection.h"
#include "MuonSimData/CscSimDataCollection.h"
-#include "xAODEventInfo/EventInfo.h" // NEW EDM
-#include "xAODEventInfo/EventAuxInfo.h" // NEW EDM
-
#include "PileUpTools/PileUpToolBase.h"
class PileUpMergeSvc;
@@ -113,8 +110,6 @@ private:
double m_driftVelocity;
double m_electronEnergy;
bool m_NInterFixed;
- unsigned int m_run{0};
- unsigned int m_evt{0};
///////////////////////////////////////////////////////////////////
// Access to the event methods:
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
index 0a35f25695c..813ce7281f7 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
@@ -21,8 +21,6 @@
#include "AthenaKernel/RNGWrapper.h"
#include "CLHEP/Random/RandFlat.h"
-#include "xAODEventInfo/EventInfo.h"
-
using namespace MuonGM;
static constexpr unsigned int crazyParticleBarcode(
@@ -196,14 +194,6 @@ StatusCode CscDigitizationTool::processAllSubEvents() {
StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,CscSimDataCollection* cscSimData, CLHEP::HepRandomEngine* rndmEngine) {
- // get the iterator pairs for this DetEl
- //iterate over hits
- const xAOD::EventInfo* pevt = nullptr;
- ATH_CHECK( evtStore()->retrieve(pevt) );
- m_evt = pevt->eventNumber();
- m_run = pevt->runNumber();
-
-
std::map <IdentifierHash,deposits> myDeposits;
csc_map data_map;
csc_newmap data_SampleMap, data_SampleMapOddPhase;
@@ -216,6 +206,7 @@ StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,Cs
return StatusCode::FAILURE;
}
+ // get the iterator pairs for this DetEl
while( m_thpcCSC->nextDetectorElement(i, e) ) {
// Loop over the hits:
@@ -393,7 +384,7 @@ FillCollectionWithNewDigitEDM(csc_newmap& data_SampleMap,
// CscDigit * newDigitOddPhase = new CscDigit(digitId, samplesOddPhase);
ATH_MSG_DEBUG ( "NEWDigit sec:measphi:wlay:istr:chg:t(w/latency) "
- << m_run << " " << m_evt << " " << m_cscIdHelper->show_to_string(digitId,&context)
+ << m_cscIdHelper->show_to_string(digitId,&context)
<< " hash:eleId = " << hashId << " " << elementId << " " << prevId << " "
<< sector << " " << measphi << " " << wlay << " " << istrip << " "
<< int(stripCharge+1) << " " << float(driftTime)
@@ -519,7 +510,7 @@ FillCollectionWithOldDigitEDM(csc_map& data_map, std::map<IdentifierHash,deposit
Identifier elementId = m_cscIdHelper->parentID(digitId);
ATH_MSG_DEBUG ( "CSC Digit sector:measphi:wlay:istrip:charge "
- << m_run << " " << m_evt << " " << sector << " "
+ << sector << " "
<< measphi << " " << wlay << " " << istrip
<< " " << int(stripCharge+1) << " " << float(driftTime) << " " << (newDigit->sampleCharges()).size());
--
GitLab