Skip to content
Snippets Groups Projects
Commit 49f03aec authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

- Fixed source links concept change

- Fixed DataHandle name change
	modified:   CMakeLists.txt
	modified:   JugBase/JugBase/DataHandle.h
	modified:   JugReco/JugReco/SourceLinks.h
parent 57b5e1ab
No related tags found
No related merge requests found
...@@ -22,6 +22,8 @@ find_package(Geant4) ...@@ -22,6 +22,8 @@ find_package(Geant4)
find_package(Gaudi) find_package(Gaudi)
add_compile_options( -Wfatal-errors )
add_subdirectory(JugBase) add_subdirectory(JugBase)
add_subdirectory(JugDigi) add_subdirectory(JugDigi)
add_subdirectory(JugReco) add_subdirectory(JugReco)
......
...@@ -187,9 +187,9 @@ T* DataHandle<T>::createAndPut() { ...@@ -187,9 +187,9 @@ T* DataHandle<T>::createAndPut() {
// temporary to allow property declaration // temporary to allow property declaration
namespace Gaudi { namespace Gaudi {
template <class T> template <class T>
class Property<::DataHandle<T>&> : public ::DataObjectHandleProperty { class Property<::DataHandle<T>&> : public ::DataHandleProperty {
public: public:
Property(const std::string& name, ::DataHandle<T>& value) : ::DataObjectHandleProperty(name, value) {} Property(const std::string& name, ::DataHandle<T>& value) : ::DataHandleProperty(name, value) {}
/// virtual Destructor /// virtual Destructor
virtual ~Property() {} virtual ~Property() {}
......
...@@ -51,6 +51,7 @@ class SourceLink { ...@@ -51,6 +51,7 @@ class SourceLink {
SourceLink& operator=(SourceLink&&) = default; SourceLink& operator=(SourceLink&&) = default;
SourceLink& operator=(const SourceLink&) = default; SourceLink& operator=(const SourceLink&) = default;
constexpr Acts::GeometryIdentifier geometryId() const { return m_geometryId; } constexpr Acts::GeometryIdentifier geometryId() const { return m_geometryId; }
constexpr const Acts::Surface& referenceSurface() const { return *m_surface; } constexpr const Acts::Surface& referenceSurface() const { return *m_surface; }
//constexpr const ActsFatras::Hit& truthHit() const { return *m_truthHit; } //constexpr const ActsFatras::Hit& truthHit() const { return *m_truthHit; }
...@@ -79,6 +80,7 @@ class SourceLink { ...@@ -79,6 +80,7 @@ class SourceLink {
return lhs.geometryId() == rhs.geometryId(); return lhs.geometryId() == rhs.geometryId();
//lhs.m_truthHit == rhs.m_truthHit; //lhs.m_truthHit == rhs.m_truthHit;
} }
friend bool operator!=(const SourceLink& lhs, const SourceLink& rhs) { return not(lhs == rhs); }
}; };
/// Store source links ordered by geometry identifier. /// Store source links ordered by geometry identifier.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment