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

Add the edm4hep includes to allow compilation with clang #166

Merged
merged 3 commits into from
Jan 27, 2024
Merged

Add the edm4hep includes to allow compilation with clang #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97ecfea
Add the edm4hep includes to allow compilation with clang
jmcarcell Jan 27, 2024
f179ec7
Format
jmcarcell Jan 27, 2024
194e8b3
Remove includes
jmcarcell Jan 27, 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
30 changes: 14 additions & 16 deletions k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@

#include "k4EDM4hep2LcioConv/MappingUtils.h"

#include "edm4hep/CalorimeterHit.h"
#include "edm4hep/Cluster.h"
#include "edm4hep/MCParticle.h"
#include "edm4hep/ParticleID.h"
#include "edm4hep/RawCalorimeterHit.h"
#include "edm4hep/RawTimeSeries.h"
#include "edm4hep/ReconstructedParticle.h"
#include "edm4hep/SimCalorimeterHit.h"
#include "edm4hep/SimTrackerHit.h"
#include "edm4hep/Track.h"
#include "edm4hep/TrackerHit.h"
#include "edm4hep/TrackerHitPlane.h"
#include "edm4hep/Vertex.h"

#include <string_view>

namespace EVENT {
Expand All @@ -39,22 +53,6 @@ namespace EVENT {
class ParticleID;
} // namespace EVENT

namespace edm4hep {
class Track;
class TrackerHit;
class TrackerHitPlane;
class SimTrackerHit;
class CalorimeterHit;
class RawCalorimeterHit;
class SimCalorimeterHit;
class RawTimeSeries;
class Cluster;
class Vertex;
class ReconstructedParticle;
class MCParticle;
class ParticleID;
} // namespace edm4hep

namespace k4MarlinWrapper {

/**
Expand Down
14 changes: 0 additions & 14 deletions k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,6 @@
#include <EVENT/LCCollection.h>
#include <Exceptions.h>

#include <edm4hep/ClusterCollection.h>
#include <edm4hep/Constants.h>
#include <edm4hep/EventHeaderCollection.h>
#include <edm4hep/MCParticleCollection.h>
#include <edm4hep/ParticleIDCollection.h>
#include <edm4hep/RawCalorimeterHitCollection.h>
#include <edm4hep/RawTimeSeriesCollection.h>
#include <edm4hep/ReconstructedParticleCollection.h>
#include <edm4hep/SimCalorimeterHitCollection.h>
#include <edm4hep/SimTrackerHitCollection.h>
#include <edm4hep/TrackCollection.h>
#include <edm4hep/TrackerHitPlaneCollection.h>
#include <edm4hep/VertexCollection.h>

#include "k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h"

#include <k4FWCore/DataHandle.h>
Expand Down
Loading