From 6157b955684c59ba85d7c5d73e8318540088d706 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 16 Mar 2018 20:57:20 +0100
Subject: [PATCH] Add study for new Velo-Pixel Detector element conditions.
Include fixes from Chris Burr for alignment computations
---
DDDB/include/Detector/DeVP.h | 6 +++---
DDDB/include/Detector/DeVPGeneric.h | 8 ++++----
DDDB/src/Detector/DeHandles.cpp | 13 ++++++-------
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/DDDB/include/Detector/DeVP.h b/DDDB/include/Detector/DeVP.h
index bda06044b..678763ac8 100644
--- a/DDDB/include/Detector/DeVP.h
+++ b/DDDB/include/Detector/DeVP.h
@@ -50,7 +50,7 @@ namespace gaudi {
/// Standard constructors and assignment
DE_CTORS_DEFAULT(DeVPStaticObject);
/// Initialization of sub-classes
- virtual void initialize();
+ virtual void initialize() override;
/// Printout method to stdout
virtual void print(int indent, int flags) const override;
};
@@ -109,9 +109,9 @@ namespace gaudi {
/// Standard constructors and assignment
DE_CTORS_DEFAULT(DeVPObject);
/// Initialization of sub-classes
- virtual void initialize();
+ virtual void initialize() override;
/// Printout method to stdout
- void print(int indent, int flags) const;
+ void print(int indent, int flags) const override;
};
} // End namespace detail
diff --git a/DDDB/include/Detector/DeVPGeneric.h b/DDDB/include/Detector/DeVPGeneric.h
index 6adf91ab3..b03964c45 100644
--- a/DDDB/include/Detector/DeVPGeneric.h
+++ b/DDDB/include/Detector/DeVPGeneric.h
@@ -45,9 +45,9 @@ namespace gaudi {
/// Standard constructors and assignment
DE_CTORS_DEFAULT(DeVPGenericStaticObject);
/// Initialization of sub-classes
- virtual void initialize();
+ virtual void initialize() override;
/// Printout method to stdout
- void print(int indent, int flg) const;
+ virtual void print(int indent, int flg) const override;
};
} // End namespace detail
@@ -98,9 +98,9 @@ namespace gaudi {
/// Standard constructors and assignment
DE_CTORS_DEFAULT(DeVPGenericObject);
/// Initialization of sub-classes
- virtual void initialize();
+ virtual void initialize() override;
/// Printout method to stdout
- void print(int indent, int flg) const;
+ virtual void print(int indent, int flg) const override;
};
} // End namespace detail
diff --git a/DDDB/src/Detector/DeHandles.cpp b/DDDB/src/Detector/DeHandles.cpp
index cfed91afe..a0998e9da 100644
--- a/DDDB/src/Detector/DeHandles.cpp
+++ b/DDDB/src/Detector/DeHandles.cpp
@@ -33,15 +33,14 @@ DD4HEP_INSTANTIATE_HANDLE_UNNAMED(DeVPSensorObject,DeIOVObject,ConditionObject);
DD4HEP_INSTANTIATE_HANDLE_UNNAMED(DeVPGenericObject,DeIOVObject,ConditionObject);
DD4HEP_INSTANTIATE_HANDLE_UNNAMED(DeVPObject,DeVPGenericObject,DeIOVObject,ConditionObject);
+inline std::ostream& operator << (std::ostream& s, const DeVPStaticObject&) { return s; }
+inline std::ostream& operator << (std::ostream& s, const DeVPSensorStaticObject&) { return s; }
+inline std::ostream& operator << (std::ostream& s, const DeVPGenericStaticObject&) { return s; }
+inline std::ostream& operator << (std::ostream& s, const DeVPObject&) { return s; }
+inline std::ostream& operator << (std::ostream& s, const DeVPSensorObject&) { return s; }
+inline std::ostream& operator << (std::ostream& s, const DeVPGenericObject&) { return s; }
#include "Parsers/Parsers.h"
-DD4HEP_DEFINE_OSTREAM_DUMMY(DeVPStaticObject)
-DD4HEP_DEFINE_OSTREAM_DUMMY(DeVPSensorStaticObject)
-DD4HEP_DEFINE_OSTREAM_DUMMY(DeVPGenericStaticObject)
-DD4HEP_DEFINE_OSTREAM_DUMMY(DeVPObject)
-DD4HEP_DEFINE_OSTREAM_DUMMY(DeVPSensorObject)
-DD4HEP_DEFINE_OSTREAM_DUMMY(DeVPGenericObject)
-
DD4HEP_DEFINE_PARSER_DUMMY(DeVPStaticObject)
DD4HEP_DEFINE_PARSER_DUMMY(DeVPSensorStaticObject)
DD4HEP_DEFINE_PARSER_DUMMY(DeVPGenericStaticObject)
--
GitLab