From cd7c6d897be79db932d1e7abb59aa307cdfd33ed Mon Sep 17 00:00:00 2001
From: Elmar Ritsch <Elmar.Ritsch@cern.ch>
Date: Wed, 27 Jul 2016 16:07:18 +0200
Subject: [PATCH] Move Barcode.h and PhysicsProcessCode.h from
BarcodeInterfaces package into new BarcodeEvent package. This is follow
ATLASconventions for putting event-data types into dedicated *Event packages.
ATLASSIM-2281 (BarcodeInterfaces-00-01-00)
* Move Barcode.h and PhysicsProcessCode.h from BarcodeInterfaces
package into new BarcodeEvent package. This is follow ATLASconventions
for putting event-data types into dedicated *Event packages. ATLASSIM-2281
* tag as BarcodeInterfaces-00-01-00
---
.../BarcodeInterfaces/Barcode.h | 35 -------------------
.../BarcodeInterfaces/IBarcodeSvc.h | 4 +--
.../BarcodeInterfaces/PhysicsProcessCode.h | 21 -----------
.../Barcode/BarcodeInterfaces/CMakeLists.txt | 3 +-
.../BarcodeInterfaces/cmt/requirements | 1 +
5 files changed, 5 insertions(+), 59 deletions(-)
delete mode 100644 Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/Barcode.h
delete mode 100644 Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/PhysicsProcessCode.h
diff --git a/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/Barcode.h b/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/Barcode.h
deleted file mode 100644
index 4257bda0c92..00000000000
--- a/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/Barcode.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// Barcode.h, (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-#ifndef BARCODEINTERFACES_BARCODE_H
-#define BARCODEINTERFACES_BARCODE_H 1
-
-#include <stdint.h>
-
-namespace Barcode {
-
- /** Identifier type for particles */
- typedef int ParticleBarcode;
-
- // until HepMC::GenParticle::suggest_barcode(...) takes 'int' as argument,
- // better not use fancy types like 'uint32_t' (may cause overflows in
- // implicit type conversions)
- //typedef uint32_t ParticleBarcode;
-
- /** Identifier type for vertices (usually negative numbers) */
- // similar to what is said above: one could use 'uint32_t' instead of 'int' here
- typedef int VertexBarcode;
-
-
- /** enum to make the code more readable */
- enum BarcodeDefinitions {
- fUndefinedBarcode = 0
- };
-
-}
-
-#endif
diff --git a/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/IBarcodeSvc.h b/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/IBarcodeSvc.h
index db619093b0d..d8c7d203f22 100644
--- a/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/IBarcodeSvc.h
+++ b/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/IBarcodeSvc.h
@@ -9,8 +9,8 @@
#define BARCODEINTERFACES_IBARCODESVC_H 1
// Barcode includes
-#include "BarcodeInterfaces/Barcode.h"
-#include "BarcodeInterfaces/PhysicsProcessCode.h"
+#include "BarcodeEvent/Barcode.h"
+#include "BarcodeEvent/PhysicsProcessCode.h"
// Include Files
#include "GaudiKernel/IInterface.h"
diff --git a/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/PhysicsProcessCode.h b/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/PhysicsProcessCode.h
deleted file mode 100644
index 7cf32b8d5ba..00000000000
--- a/Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/PhysicsProcessCode.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// PhysicsProcessCode.h, (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-#ifndef BARCODEINTERFACES_PHYSICSPROCESSCODE_H
-#define BARCODEINTERFACES_PHYSICSPROCESSCODE_H 1
-
-
-namespace Barcode {
-
- /** Identifier type for physics processes */
- typedef int PhysicsProcessCode;
-
- /** Use this to make the code more readable */
- const PhysicsProcessCode fUndefinedProcessCode = 0;
-}
-
-#endif //< BARCODEINTERFACES_PHYSICSPROCESSCODE_H
diff --git a/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt b/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
index 740922c7db1..d3c47e88899 100644
--- a/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
+++ b/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
@@ -7,7 +7,8 @@ atlas_subdir( BarcodeInterfaces )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- GaudiKernel )
+ GaudiKernel
+ Simulation/Barcode/BarcodeEvent )
# Install files from the package:
atlas_install_headers( BarcodeInterfaces )
diff --git a/Simulation/Barcode/BarcodeInterfaces/cmt/requirements b/Simulation/Barcode/BarcodeInterfaces/cmt/requirements
index f1a80f893c7..5e31181ae8d 100644
--- a/Simulation/Barcode/BarcodeInterfaces/cmt/requirements
+++ b/Simulation/Barcode/BarcodeInterfaces/cmt/requirements
@@ -4,5 +4,6 @@ author <Andreas.Salzburger@cern.ch>
public
use AtlasPolicy AtlasPolicy-*
use GaudiInterface GaudiInterface-* External
+use BarcodeEvent BarcodeEvent-* Simulation/Barcode
end_public
--
GitLab