From 6ac3be2f176c19fe246f5d4b5526d10e25dcfc83 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sun, 10 May 2020 18:39:44 +0000
Subject: [PATCH] Revert "Merge branch 'master' of
https://gitlab.cern.ch:8443/faser/calypso"
This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
---
.gitlab-ci.yml | 2 +-
Control/CalypsoCommon/CMakeLists.txt | 2 +-
README.md | 4 +++-
Simulation/G4Faser/G4FaserAlg/CMakeLists.txt | 6 ++---
.../G4Faser/G4FaserServices/CMakeLists.txt | 24 +++++++------------
Simulation/G4Sim/FaserMCTruth/CMakeLists.txt | 4 ++--
.../FaserMCTruth/FaserEventInformation.h | 2 +-
.../FaserPrimaryParticleInformation.h | 2 +-
.../FaserMCTruth/FaserMCTruth/TruthEvent.h | 2 +-
.../src/FaserTrackInformation.cxx | 2 +-
.../G4Sim/FaserMCTruthBase/CMakeLists.txt | 14 +++++------
.../src/FaserParticleHelper.cxx | 6 ++---
.../FaserISF_Interfaces/CMakeLists.txt | 4 ++--
.../ISF_Core/FaserISF_Services/CMakeLists.txt | 8 +++----
.../src/FaserInputConverter.cxx | 4 ++--
.../FaserISF_Services/src/FaserTruthSvc.cxx | 8 +++----
.../test/FaserTruthSvc_test.cxx | 6 ++---
.../FaserISF_Geant4Event/CMakeLists.txt | 8 +++----
.../FaserGeant4TruthIncident.h | 2 +-
.../src/FaserGeant4TruthIncident.cxx | 2 +-
.../FaserISF_HepMC_Tools/CMakeLists.txt | 4 ++--
.../src/FaserGenParticleGenericFilter.cxx | 4 ++--
.../src/FaserGenParticlePositionFilter.cxx | 4 ++--
.../TrackerAlignGenTools/CMakeLists.txt | 8 +++----
.../VTI12TrackSystems/CMakeLists.txt | 6 ++---
.../src/AscObj_TruthPoint.cxx | 4 ++--
.../src/TrackCollHandle_TruthTracks.cxx | 6 ++---
.../src/TrackHandle_TruthTrack.cxx | 6 ++---
28 files changed, 74 insertions(+), 80 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6370f91f..58db0511 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ build_image:
- cd build
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
- set +e && asetup --input=../../calypso/asetup.faser master,latest,Athena; set -e
- - cmake ../../calypso
+ - cmake -DATLAS_PYTHON_CHECKER="" ../../calypso
- make -j
artifacts:
paths:
diff --git a/Control/CalypsoCommon/CMakeLists.txt b/Control/CalypsoCommon/CMakeLists.txt
index 52a305d7..c8a78238 100644
--- a/Control/CalypsoCommon/CMakeLists.txt
+++ b/Control/CalypsoCommon/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PRIVATE
find_package( six )
# Install files from the package:
-atlas_install_python_modules( python/*.py python/Utils )
+atlas_install_python_modules( python/*.py )
#atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
# share/zeroJO.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py)
#atlas_install_scripts( share/athena.py share/athena3.py share/athena_preload.sh share/chappy.py share/find_cfg_dups.py share/test_cfg_pickling.py )
diff --git a/README.md b/README.md
index d2e2cc4c..5eaf8194 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ asetup --input=calypso/asetup.faser master,latest,Athena
mkdir build
cd build
#build calypso
-cmake -DCMAKE_INSTALL_PREFIX=../run ../calypso ; make ; make install
+cmake -DCMAKE_INSTALL_PREFIX=../run -DATLAS_PYTHON_CHECKER="" ../calypso ; make ; make install
+
+The ATLAS_PYTHON_CHECKER parameter to the cmake command is a temporary workaround for a problem with Flake
It can be convenient to alias the "asetup --input=calypso/asetup.faser" to something like "fsetup"
\ No newline at end of file
diff --git a/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt b/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
index 3b55f60e..1d48d115 100644
--- a/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
+++ b/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
@@ -16,6 +16,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoModel/GeoModelInterfaces
Event/EventInfo
Generators/GeneratorObjects
+ Generators/AtlasHepMC
Simulation/G4Atlas/G4AtlasAlg
Simulation/G4Atlas/G4AtlasInterfaces
Simulation/G4Sim/FaserMCTruthBase
@@ -25,7 +26,6 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
find_package( Geant4 )
-find_package( HepMC )
find_package( XercesC )
find_package( Eigen )
@@ -35,14 +35,14 @@ atlas_add_library( G4FaserAlgLib
src/*.cxx
NO_PUBLIC_HEADERS
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} G4AtlasAlgLib AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces SGTools StoreGateLib SGtests EventInfo GeneratorObjects FaserMCTruthBaseLib )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib G4AtlasAlgLib AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces SGTools StoreGateLib SGtests EventInfo GeneratorObjects GeoModelInterfaces FaserISF_InterfacesLib FaserMCTruthBaseLib )
# Component(s) in the package:
atlas_add_component( G4FaserAlg
src/components/*.cxx
NO_PUBLIC_HEADERS
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces G4FaserAlgLib G4AtlasAlgLib SGTools StoreGateLib SGtests EventInfo GeneratorObjects FaserMCTruthBaseLib )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces G4FaserAlgLib G4AtlasAlgLib SGTools StoreGateLib SGtests EventInfo GeneratorObjects FaserMCTruthBaseLib )
atlas_add_test( G4FaserAlgConfig_Test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/runG4.py
diff --git a/Simulation/G4Faser/G4FaserServices/CMakeLists.txt b/Simulation/G4Faser/G4FaserServices/CMakeLists.txt
index 0a697736..db404972 100644
--- a/Simulation/G4Faser/G4FaserServices/CMakeLists.txt
+++ b/Simulation/G4Faser/G4FaserServices/CMakeLists.txt
@@ -10,32 +10,24 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
- Control/StoreGate
- DetectorDescription/AtlasDetDescr
+ MagneticField/MagFieldInterfaces
Generators/GeneratorObjects
- Generators/TruthUtils
- Simulation/G4Sim/FaserMCTruth
- Simulation/G4Sim/SimHelpers
- Simulation/G4Sim/TrackRecord
- Simulation/ISF/ISF_Core/FaserISF_Event
- Simulation/ISF/ISF_Core/FaserISF_Interfaces
- Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Interfaces
- Tools/PmbCxxUtils )
+ Simulation/G4Atlas/G4AtlasInterfaces
+ Simulation/G4Atlas/G4AtlasTools
+ Simulation/G4Utilities/G4PhysicsLists)
# External dependencies:
find_package( CLHEP )
-find_package( Eigen )
find_package( Geant4 )
-find_package( HepMC )
-find_package( HepPDT )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( TBB )
+find_package( XercesC)
# Component(s) in the package:
#atlas_add_component( G4FaserServices
# src/*.cxx
# src/components/*.cxx
-# INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
-# LINK_LIBRARIES ${ROOT_LIBRARIES} ${GEANT4_LIBRARIES} ${HEPMC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib SGtests GeneratorObjects FaserMCTruth SimHelpers FaserISF_Event FaserISF_Interfaces PmbCxxUtils TruthUtils )
+# INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
+# LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces G4AtlasToolsLib G4PhysicsLists MagFieldInterfaces )
# Install files from the package:
diff --git a/Simulation/G4Sim/FaserMCTruth/CMakeLists.txt b/Simulation/G4Sim/FaserMCTruth/CMakeLists.txt
index 0b51decf..1f5cff9b 100644
--- a/Simulation/G4Sim/FaserMCTruth/CMakeLists.txt
+++ b/Simulation/G4Sim/FaserMCTruth/CMakeLists.txt
@@ -8,6 +8,7 @@ atlas_subdir( FaserMCTruth )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
+ Generators/AtlasHepMC
Generators/GeneratorObjects
PRIVATE
Simulation/ISF/ISF_Core/FaserISF_Event
@@ -17,7 +18,6 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
find_package( Geant4 )
-find_package( HepMC )
find_package( XercesC )
# Component(s) in the package:
@@ -26,5 +26,5 @@ atlas_add_library( FaserMCTruth
PUBLIC_HEADERS FaserMCTruth
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaKernel GeneratorObjects
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel GeneratorObjects
PRIVATE_LINK_LIBRARIES ISF_Event FaserISF_Event SimHelpers )
diff --git a/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserEventInformation.h b/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserEventInformation.h
index 0ef0b9c6..8872cb45 100644
--- a/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserEventInformation.h
+++ b/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserEventInformation.h
@@ -5,7 +5,7 @@
#ifndef FaserEventInformation_H
#define FaserEventInformation_H
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
#include "G4ThreeVector.hh"
#include "G4VUserEventInformation.hh"
diff --git a/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserPrimaryParticleInformation.h b/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserPrimaryParticleInformation.h
index 535c8517..ca993449 100644
--- a/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserPrimaryParticleInformation.h
+++ b/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/FaserPrimaryParticleInformation.h
@@ -6,7 +6,7 @@
#define FaserPrimaryParticleInformation_H
#include "G4VUserPrimaryParticleInformation.hh"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
namespace ISF {
class FaserISFParticle;
diff --git a/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/TruthEvent.h b/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/TruthEvent.h
index 30142b63..d86c5e53 100644
--- a/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/TruthEvent.h
+++ b/Simulation/G4Sim/FaserMCTruth/FaserMCTruth/TruthEvent.h
@@ -5,7 +5,7 @@
#ifndef TruthEvent_H
#define TruthEvent_H
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
#include "AthenaKernel/CLASS_DEF.h"
typedef HepMC::GenEvent TruthEvent;
diff --git a/Simulation/G4Sim/FaserMCTruth/src/FaserTrackInformation.cxx b/Simulation/G4Sim/FaserMCTruth/src/FaserTrackInformation.cxx
index 3bd0d982..e6df0057 100644
--- a/Simulation/G4Sim/FaserMCTruth/src/FaserTrackInformation.cxx
+++ b/Simulation/G4Sim/FaserMCTruth/src/FaserTrackInformation.cxx
@@ -3,7 +3,7 @@
*/
#include "FaserMCTruth/FaserTrackInformation.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
FaserTrackInformation::FaserTrackInformation():m_regenerationNr(0),m_theParticle(0),m_theBaseISFParticle(0),m_returnedToISF(false)
{
diff --git a/Simulation/G4Sim/FaserMCTruthBase/CMakeLists.txt b/Simulation/G4Sim/FaserMCTruthBase/CMakeLists.txt
index 6937f620..52833804 100644
--- a/Simulation/G4Sim/FaserMCTruthBase/CMakeLists.txt
+++ b/Simulation/G4Sim/FaserMCTruthBase/CMakeLists.txt
@@ -13,6 +13,7 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/ISF/ISF_Core/ISF_Interfaces
Simulation/ISF/ISF_Core/FaserISF_Interfaces
PRIVATE
+ Generators/AtlasHepMC
Control/AthenaBaseComps
Control/StoreGate
Simulation/G4Atlas/G4AtlasInterfaces
@@ -25,30 +26,29 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
find_package( Geant4 )
-find_package( HepMC )
find_package( XercesC )
# Component(s) in the package:
atlas_add_library( FaserMCTruthBaseLib
src/*.cxx
PUBLIC_HEADERS FaserMCTruthBase
- INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+ INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaKernel GaudiKernel StoreGateLib SGtests G4AtlasToolsLib
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel GaudiKernel StoreGateLib SGtests G4AtlasToolsLib
PRIVATE_LINK_LIBRARIES AthenaBaseComps
- G4AtlasInterfaces FaserMCTruth SimHelpers ISF_Interfaces FaserISF_Interfaces
+ G4AtlasInterfaces FaserMCTruth SimHelpers ISF_InterfacesLib FaserISF_InterfacesLib
FaserDetDescr FaserISF_Geant4Event
)
#atlas_add_component( FaserMCTruthBase
# src/components/*.cxx
-# INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+# INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
# LINK_LIBRARIES ${GEANT4_LIBRARIES}
# ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES}
-# ${HEPMC_LIBRARIES} AthenaKernel GaudiKernel
+# AtlasHepMCLib AthenaKernel GaudiKernel
# AthenaBaseComps StoreGateLib SGtests
# G4AtlasInterfaces G4AtlasToolsLib FaserMCTruth
-# SimHelpers ISF_Interfaces FaserISF_Interfaces
+# SimHelpers ISF_InterfacesLib FaserISF_InterfacesLib
# FaserDetDescr FaserMCTruthBaseLib
# FaserISF_Geant4Event )
diff --git a/Simulation/ISF/ISF_Core/FaserISF_Event/src/FaserParticleHelper.cxx b/Simulation/ISF/ISF_Core/FaserISF_Event/src/FaserParticleHelper.cxx
index a255fb0e..a6ae7d43 100644
--- a/Simulation/ISF/ISF_Core/FaserISF_Event/src/FaserParticleHelper.cxx
+++ b/Simulation/ISF/ISF_Core/FaserISF_Event/src/FaserParticleHelper.cxx
@@ -10,9 +10,9 @@
#include "FaserISF_Event/FaserParticleHelper.h"
// HepMC includes
-#include "HepMC/GenParticle.h"
-#include "HepMC/Flow.h"
-#include "HepMC/SimpleVector.h" // HepMC::FourVector
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Flow.h"
+#include "AtlasHepMC/SimpleVector.h" // HepMC::FourVector
// ISF includes
#include "FaserISF_Event/FaserISFParticle.h"
diff --git a/Simulation/ISF/ISF_Core/FaserISF_Interfaces/CMakeLists.txt b/Simulation/ISF/ISF_Core/FaserISF_Interfaces/CMakeLists.txt
index 901c6a10..10af6070 100644
--- a/Simulation/ISF/ISF_Core/FaserISF_Interfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/FaserISF_Interfaces/CMakeLists.txt
@@ -25,10 +25,10 @@ find_package( CLHEP )
find_package( Eigen )
# Component(s) in the package:
-atlas_add_library( FaserISF_Interfaces
+atlas_add_library( FaserISF_InterfacesLib
src/*.cxx
PUBLIC_HEADERS FaserISF_Interfaces
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel FaserDetDescr GeoPrimitives GaudiKernel GeneratorObjects FaserISF_Event ISF_Event StoreGateLib SGtests )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel FaserDetDescr GeoPrimitives GaudiKernel GeneratorObjects FaserISF_Event ISF_Event StoreGateLib SGtests TrackRecordLib )
diff --git a/Simulation/ISF/ISF_Core/FaserISF_Services/CMakeLists.txt b/Simulation/ISF/ISF_Core/FaserISF_Services/CMakeLists.txt
index 67cdc047..bbe952c4 100644
--- a/Simulation/ISF/ISF_Core/FaserISF_Services/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/FaserISF_Services/CMakeLists.txt
@@ -9,10 +9,11 @@ atlas_subdir( FaserISF_Services )
atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
- AtlasGeometryCommon/SubDetectorEnvelopes
+ #AtlasGeometryCommon/SubDetectorEnvelopes
Control/AthenaBaseComps
Control/StoreGate
DetectorDescription/FaserDetDescr
+ Generators/AtlasHepMC
Generators/GeneratorObjects
Generators/TruthUtils
Tracker/TrackerSimEvent
@@ -35,7 +36,6 @@ atlas_depends_on_subdirs( PUBLIC
find_package( CLHEP )
find_package( Eigen )
find_package( Geant4 )
-find_package( HepMC )
find_package( HepPDT )
#find_package( GTest )
#find_package( GMock )
@@ -47,8 +47,8 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
atlas_add_component( FaserISF_Services
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${GEANT4_LIBRARIES} ${HEPMC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} GaudiKernel ScintSimEvent AthenaBaseComps StoreGateLib SGtests FaserDetDescr GeneratorObjects TrackerSimEvent G4AtlasInterfaces FaserMCTruth SimHelpers FaserISF_Event ISF_Event FaserISF_Interfaces ISF_Interfaces PmbCxxUtils TruthUtils )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${GEANT4_LIBRARIES} AtlasHepMCLib ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} GaudiKernel BarcodeInterfacesLib ScintSimEvent AthenaBaseComps StoreGateLib SGtests FaserDetDescr GeneratorObjects TrackerSimEvent G4AtlasInterfaces FaserMCTruth SimHelpers FaserISF_Event ISF_Event FaserISF_InterfacesLib ISF_InterfacesLib PmbCxxUtils TruthUtils )
#atlas_add_test( FaserTruthSvc_test
# SOURCES
diff --git a/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserInputConverter.cxx b/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserInputConverter.cxx
index da6cfd0f..77222a4c 100644
--- a/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserInputConverter.cxx
+++ b/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserInputConverter.cxx
@@ -40,8 +40,8 @@
#include "G4LorentzVector.hh"
#include "G4TransportationManager.hh"
// HepMC includes
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
// CLHEP includes
#include "CLHEP/Geometry/Point3D.h"
#include "CLHEP/Geometry/Vector3D.h"
diff --git a/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserTruthSvc.cxx b/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserTruthSvc.cxx
index 93dd6023..83b502ce 100644
--- a/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserTruthSvc.cxx
+++ b/Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserTruthSvc.cxx
@@ -21,10 +21,10 @@
//
#include "TruthUtils/HepMCHelpers.h" // for MC::findChildren(...)
// HepMC includes
-#include "HepMC/SimpleVector.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
// CLHEP includes
#include "CLHEP/Geometry/Point3D.h"
diff --git a/Simulation/ISF/ISF_Core/FaserISF_Services/test/FaserTruthSvc_test.cxx b/Simulation/ISF/ISF_Core/FaserISF_Services/test/FaserTruthSvc_test.cxx
index 4b0d2d28..4816ae75 100644
--- a/Simulation/ISF/ISF_Core/FaserISF_Services/test/FaserTruthSvc_test.cxx
+++ b/Simulation/ISF/ISF_Core/FaserISF_Services/test/FaserTruthSvc_test.cxx
@@ -41,9 +41,9 @@
#include "CLHEP/Units/SystemOfUnits.h"
// HepMC
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
// STL includes
#include <cstdlib> // quick_exit
diff --git a/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/CMakeLists.txt
index 0922e0b1..65bd8372 100644
--- a/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/CMakeLists.txt
@@ -15,6 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/Barcode/BarcodeEvent
Simulation/G4Sim/FaserMCTruth
PRIVATE
+ Generators/AtlasHepMC
DetectorDescription/GeoPrimitives )
@@ -23,7 +24,6 @@ atlas_depends_on_subdirs( PUBLIC
find_package( CLHEP )
find_package( Eigen )
find_package( Geant4 )
-find_package( HepMC )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( XercesC )
@@ -33,12 +33,12 @@ atlas_add_library( FaserISF_Geant4Event
PUBLIC_HEADERS FaserISF_Geant4Event
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- ${HEPMC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
+ ${GEANT4_INCLUDE_DIRS}
${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES}
- ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES}
+ ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib
${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} FaserISF_Event ISF_Event
- SimHelpers GeoPrimitives FaserMCTruth)
+ FaserISF_InterfacesLib ISF_InterfacesLib SimHelpers GeoPrimitives FaserMCTruth)
#atlas_add_test(SOURCES
# INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
diff --git a/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/FaserISF_Geant4Event/FaserGeant4TruthIncident.h b/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/FaserISF_Geant4Event/FaserGeant4TruthIncident.h
index da2d10d8..33a52779 100644
--- a/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/FaserISF_Geant4Event/FaserGeant4TruthIncident.h
+++ b/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/FaserISF_Geant4Event/FaserGeant4TruthIncident.h
@@ -12,7 +12,7 @@
#include "FaserISF_Event/IFaserTruthIncident.h"
// HepMC includes
-#include "HepMC/SimpleVector.h"
+#include "AtlasHepMC/SimpleVector.h"
//Geant4 includes
#include "G4ThreeVector.hh"
diff --git a/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/src/FaserGeant4TruthIncident.cxx b/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/src/FaserGeant4TruthIncident.cxx
index 293dc427..3af3e2fa 100644
--- a/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/src/FaserGeant4TruthIncident.cxx
+++ b/Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/src/FaserGeant4TruthIncident.cxx
@@ -19,7 +19,7 @@
#include "GaudiKernel/PhysicalConstants.h"
// HepMC includes
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
// Geant4 includes
#include "G4Step.hh"
diff --git a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/CMakeLists.txt b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/CMakeLists.txt
index f533d839..0433e79b 100644
--- a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaBaseComps
DetectorDescription/FaserDetDescr
+ Generators/AtlasHepMC
Generators/TruthUtils
Simulation/ISF/ISF_Core/FaserISF_Event
Simulation/ISF/ISF_Core/FaserISF_Interfaces
@@ -19,7 +20,6 @@ atlas_depends_on_subdirs( PUBLIC
Tools/PathResolver )
# External dependencies:
-find_package( HepMC )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( GTest )
find_package( GMock )
@@ -31,7 +31,7 @@ atlas_add_component( FaserISF_HepMC_Tools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel FaserDetDescr AthenaBaseComps TruthUtils FaserISF_Event FaserISF_Interfaces PathResolver )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel FaserDetDescr AthenaBaseComps TruthUtils FaserISF_Event ISF_HepMC_Interfaces FaserISF_InterfacesLib PathResolver )
# Tests
#atlas_add_test( GenParticleGenericFilter_test
diff --git a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticleGenericFilter.cxx b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticleGenericFilter.cxx
index 85666c62..64aefe71 100644
--- a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticleGenericFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticleGenericFilter.cxx
@@ -13,8 +13,8 @@
#include "FaserGenParticleGenericFilter.h"
// HepMC includes
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
// STL includes
#include <limits>
diff --git a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticlePositionFilter.cxx b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticlePositionFilter.cxx
index 7c710b64..0c090db1 100644
--- a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticlePositionFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/src/FaserGenParticlePositionFilter.cxx
@@ -10,8 +10,8 @@
#include "FaserGenParticlePositionFilter.h"
// HepMC includes
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
/** Constructor **/
ISF::FaserGenParticlePositionFilter::FaserGenParticlePositionFilter( const std::string& t,
diff --git a/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt b/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
index a3a2597d..2bc84f26 100644
--- a/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
+++ b/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
@@ -28,6 +28,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/FaserDetDescr
DetectorDescription/DetDescrCond/DetDescrConditions
GaudiKernel
+ Generators/AtlasHepMC
Tracker/TrackerDetDescr/TrackerIdentifier
Tracker/TrackerDetDescr/TrackerReadoutGeometry
# Simulation/G4Sim/TrackRecord
@@ -44,16 +45,15 @@ atlas_depends_on_subdirs( PUBLIC
find_package( CLHEP )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( Eigen )
-find_package( HepMC )
find_package( HepPDT )
# Component(s) in the package:
atlas_add_component( TrackerAlignGenTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaPoolUtilities GeoPrimitives Identifier EventPrimitives AthenaKernel AthContainers FaserDetDescr DetDescrConditions GaudiKernel TrackerIdentifier TrackerReadoutGeometry )
-# LINK_LIBRARIES ${CORAL_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaPoolUtilities GeoPrimitives Identifier EventPrimitives InDetAlignTrkInfo InDetPrepRawData TrkEventPrimitives TrkEventUtils TrkTrack TrkExInterfaces TrkToolInterfaces AthenaKernel AthContainers AtlasDetDescr DetDescrConditions GaudiKernel InDetIdentifier InDetReadoutGeometry TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkTrackSummary TrkTruthData TrkFitterInterfaces EventContainers )
+ INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaPoolUtilities AtlasHepMCLib GeoPrimitives Identifier EventPrimitives AthenaKernel AthContainers FaserDetDescr DetDescrConditions GaudiKernel TrackerIdentifier TrackerReadoutGeometry )
+# LINK_LIBRARIES ${CORAL_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaPoolUtilities AtlasHepMCLib GeoPrimitives Identifier EventPrimitives InDetAlignTrkInfo InDetPrepRawData TrkEventPrimitives TrkEventUtils TrkTrack TrkExInterfaces TrkToolInterfaces AthenaKernel AthContainers AtlasDetDescr DetDescrConditions GaudiKernel InDetIdentifier InDetReadoutGeometry TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkTrackSummary TrkTruthData TrkFitterInterfaces EventContainers )
# Install files from the package:
atlas_install_headers( TrackerAlignGenTools )
diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt
index 578bdd14..3c58b6fe 100644
--- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt
@@ -13,6 +13,7 @@ atlas_depends_on_subdirs(
DetectorDescription/Identifier
# Event/xAOD/xAODTracking
GaudiKernel
+ Generators/AtlasHepMC
Generators/GeneratorObjects
Simulation/G4Sim/TrackRecord
Tracking/TrkDetDescr/TrkDetDescrInterfaces
@@ -57,7 +58,6 @@ atlas_depends_on_subdirs(
# External dependencies:
find_package( CLHEP )
find_package( Coin3D )
-find_package( HepMC )
find_package( Qt5 COMPONENTS Core Gui Widgets )
find_package( GeoModelCore )
@@ -71,14 +71,14 @@ set( CMAKE_AUTOMOC TRUE )
atlas_add_library( VTI12TrackSystems VTI12TrackSystems/*.h src/*.cxx
PUBLIC_HEADERS VTI12TrackSystems
PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- ${HEPMC_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
LINK_LIBRARIES ${GEOMODEL_LIBRARIES} GeoPrimitives Identifier
#xAODTracking
GaudiKernel GeneratorObjects TrkDetDescrInterfaces TrkSurfaces
TrkEventPrimitives TrkParameters VP1Base VTI12Utils StoreGateLib SGtests
Qt5::Core Qt5::Gui
PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${CLHEP_LIBRARIES}
- ${HEPMC_LIBRARIES} AthContainers FaserDetDescr EventPrimitives
+ AtlasHepMCLib AthContainers FaserDetDescr EventPrimitives
ScintIdentifier ScintSimEvent ScintReadoutGeometry
TrackerIdentifier TrackerReadoutGeometry TrackerSimEvent
#InDetPrepRawData InDetRIO_OnTrack
diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/AscObj_TruthPoint.cxx b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/AscObj_TruthPoint.cxx
index 29b65144..e865f1da 100644
--- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/AscObj_TruthPoint.cxx
+++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/AscObj_TruthPoint.cxx
@@ -15,8 +15,8 @@
#include "VTI12TrackSystems/AscObj_TruthPoint.h"
#include "VTI12TrackSystems/SimHitHandleBase.h"
#include "VP1Base/VP1Msg.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
// Eigen migration
//#include "TrkEventPrimitives/GlobalPosition.h"
diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackCollHandle_TruthTracks.cxx b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackCollHandle_TruthTracks.cxx
index 8e9fe623..222b15de 100644
--- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackCollHandle_TruthTracks.cxx
+++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackCollHandle_TruthTracks.cxx
@@ -25,9 +25,9 @@
#include "VTI12Utils/VP1JobConfigInfo.h"
#include "VTI12Utils/VP1ParticleData.h"
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
#include "GeneratorObjects/McEventCollection.h"
#include "TrackRecord/TrackRecordCollection.h"
diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackHandle_TruthTrack.cxx b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackHandle_TruthTrack.cxx
index 6c9dddcb..1d003ab3 100644
--- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackHandle_TruthTrack.cxx
+++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackHandle_TruthTrack.cxx
@@ -17,14 +17,14 @@
#include "VP1Base/VP1Msg.h"
#include "TrkTrack/Track.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
#include "CLHEP/Vector/LorentzVector.h"
#include "TrkTrack/Track.h"
#include "AthContainers/DataVector.h"
#include "TrkParameters/TrackParameters.h"
#include "TrkSurfaces/PlaneSurface.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
//____________________________________________________________________
class TrackHandle_TruthTrack::Imp {
--
GitLab