Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the check for TrackerHit3D from edm4hep #265

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Remove the check for TrackerHit3D from edm4hep #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c08be3b
Remove the check for TrackerHit3D from edm4hep
jmcarcell Dec 9, 2024
b71ad88
Update the required version for EDM4hep
jmcarcell Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ project(k4FWCore)
find_package(ROOT COMPONENTS RIO Tree REQUIRED)
find_package(Gaudi REQUIRED)
find_package(podio 1.0.1 REQUIRED)
find_package(EDM4HEP REQUIRED)
find_package(EDM4HEP 0.99 REQUIRED)

include(cmake/Key4hepConfig.cmake)

Expand Down
7 changes: 0 additions & 7 deletions test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,7 @@
#include "edm4hep/MCParticleCollection.h"
#include "edm4hep/SimTrackerHitCollection.h"
#include "edm4hep/TrackCollection.h"
#if __has_include("edm4hep/TrackerHit3DCollection.h")
#include "edm4hep/TrackerHit3DCollection.h"
#else
#include "edm4hep/TrackerHitCollection.h"
namespace edm4hep {
using TrackerHit3DCollection = edm4hep::TrackerHitCollection;
} // namespace edm4hep
#endif
#include "podio/UserDataCollection.h"

#include <string>
Expand Down
7 changes: 0 additions & 7 deletions test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,8 @@
#include "edm4hep/MCParticleCollection.h"
#include "edm4hep/SimTrackerHitCollection.h"
#include "edm4hep/TrackCollection.h"
#if __has_include("edm4hep/TrackerHit3DCollection.h")
#include "edm4hep/TrackerHit3DCollection.h"
#else
#include "edm4hep/TrackerHitCollection.h"

namespace edm4hep {
using TrackerHit3DCollection = edm4hep::TrackerHitCollection;
} // namespace edm4hep
#endif
#include "podio/UserDataCollection.h"

#include "k4FWCore/Transformer.h"
Expand Down
12 changes: 0 additions & 12 deletions test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,14 @@
#ifndef K4FWCORE_K4FWCORETEST_CREATEEXAMPLEEVENTDATA
#define K4FWCORE_K4FWCORETEST_CREATEEXAMPLEEVENTDATA

// GAUDI
#include "Gaudi/Algorithm.h"

// key4hep
#include "k4FWCore/DataHandle.h"

// edm4hep
#if __has_include("edm4hep/TrackerHit3DCollection.h")
#include "edm4hep/TrackerHit3DCollection.h"
#else
#include "edm4hep/TrackerHitCollection.h"
namespace edm4hep {
using TrackerHit3DCollection = edm4hep::TrackerHitCollection;
} // namespace edm4hep
#endif

// podio
#include "podio/UserDataCollection.h"

// datamodel
namespace edm4hep {
class MCParticleCollection;
class SimTrackerHitCollection;
Expand Down
Loading