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

Use the newly introduced namespace in the conversion #138

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Use the newly introduced namespace in the conversion #138

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
9cda6ba
Use the newly introduced namespace in the conversion
tmadlener Sep 12, 2023
f4acf77
Use preprocessor to make converter work always
tmadlener Sep 12, 2023
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
5 changes: 5 additions & 0 deletions k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
#include <string>
#include <vector>

#ifdef EDM4HEP2LCIOCONV_NAMESPACE
using EDM4hep2LCIOConv::CollectionsPairVectors;
using EDM4hep2LCIOConv::vec_pair;
#endif

class EDM4hep2LcioTool : public GaudiTool, virtual public IEDMConverter {
public:
EDM4hep2LcioTool(const std::string& type, const std::string& name, const IInterface* parent);
Expand Down
4 changes: 4 additions & 0 deletions k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@

DECLARE_COMPONENT(EDM4hep2LcioTool);

#ifdef EDM4HEP2LCIOCONV_NAMESPACE
using namespace EDM4hep2LCIOConv;
#endif

EDM4hep2LcioTool::EDM4hep2LcioTool(const std::string& type, const std::string& name, const IInterface* parent)
: GaudiTool(type, name, parent), m_eventDataSvc("EventDataSvc", "EDM4hep2LcioTool") {
declareInterface<IEDMConverter>(this);
Expand Down
Loading