From 40db45151f64fa7d4940121bcde9e765c41f837a Mon Sep 17 00:00:00 2001
From: Elmar Ritsch <Elmar.Ritsch@cern.ch>
Date: Thu, 4 Aug 2016 09:32:19 +0200
Subject: [PATCH] Adopt package to new location of Barcode.h and
PhysicsProcessCode.h files (moved from BarcodeInterfaces package into new
BarcodeEvent package). This is to follow ATLAS conventions about providing
event-data types in dedicated *Event packages. ATLASSIM-2281
(ISF_FastCaloSimServices-00-08-00)
* Adopt package to new location of Barcode.h and PhysicsProcessCode.h files
(moved from BarcodeInterfaces package into new BarcodeEvent package). This is
to follow ATLAS conventions about providing event-data types in dedicated
*Event packages. ATLASSIM-2281
* Tag as ISF_FastCaloSimServices-00-08-00
---
.../ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt | 2 +-
.../ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements | 2 +-
.../ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx | 2 ++
.../ISF_FastCaloSimServices/src/FastCaloSimSvc.h | 3 ---
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
index 655853d4a52..64d43da464c 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
- Simulation/Barcode/BarcodeInterfaces
+ Simulation/Barcode/BarcodeEvent
Simulation/ISF/ISF_Core/ISF_Interfaces
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkExtrapolation/TrkExInterfaces
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements
index 2e5265ff801..60d8e29f0f9 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements
@@ -14,7 +14,7 @@ use GaudiInterface GaudiInterface-* External
# private use statements
private
use AthenaBaseComps AthenaBaseComps-* Control
-use BarcodeInterfaces BarcodeInterfaces-* Simulation/Barcode
+use BarcodeEvent BarcodeEvent-* Simulation/Barcode
use CaloInterface CaloInterface-* Calorimeter
use ISF_Interfaces ISF_Interfaces-* Simulation/ISF/ISF_Core
use AtlasCLHEP AtlasCLHEP-* External
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx
index c828e6ecdde..81c5955b0e2 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx
@@ -28,6 +28,8 @@
#include "CaloEvent/CaloCell.h"
#include "CaloEvent/CaloCellContainer.h"
#include "NavFourMom/INavigable4MomentumCollection.h"
+// Barcode
+#include "BarcodeEvent/Barcode.h"
// use FastShowerCellBuilderTool for actual simulation
//#include "FastSimulationEvent/GenParticleEnergyDepositMap.h"
#include "FastCaloSim/FastShowerCellBuilderTool.h"
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h
index 6c96951eab0..41ddaf2e6a3 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h
@@ -27,9 +27,6 @@
#include "TrkExInterfaces/ITimedExtrapolator.h"
#include "TrkEventPrimitives/PdgToParticleHypothesis.h"
-// Barcode includes
-#include "BarcodeInterfaces/Barcode.h"
-
// forward declarations
class ITrackingGeometrySvc;
class CaloCellContainer;
--
GitLab