From a295e79cc23b848cf5a81c38399f91e443f17aa1 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Tue, 18 Oct 2016 17:24:19 +0200
Subject: [PATCH] See doc/release.notes. First trial to get segmentations into
a more DD4hep like shape.
See doc/release.notes. First trial to get segmentations into a more DD4hep like shape.#
---
DDCore/include/DD4hep/CartesianGridXY.h | 86 ++++++++++++++++++++++++
DDCore/src/CartesianGridXY.cpp | 89 +++++++++++++++++++++++++
2 files changed, 175 insertions(+)
create mode 100644 DDCore/include/DD4hep/CartesianGridXY.h
create mode 100644 DDCore/src/CartesianGridXY.cpp
diff --git a/DDCore/include/DD4hep/CartesianGridXY.h b/DDCore/include/DD4hep/CartesianGridXY.h
new file mode 100644
index 000000000..7f4854278
--- /dev/null
+++ b/DDCore/include/DD4hep/CartesianGridXY.h
@@ -0,0 +1,86 @@
+// AIDA Detector description implementation for LCD
+//--------------------------------------------------------------------------
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
+// All rights reserved.
+//
+// For the licensing terms see $DD4hepINSTALL/LICENSE.
+// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
+//
+// \author Markus Frank
+// \date 2016-10-18
+// \version 1.0
+//
+//==========================================================================
+#ifndef DD4HEP_DDCORE_CARTESIANGRIDXY_H
+#define DD4HEP_DDCORE_CARTESIANGRIDXY_H 1
+
+// Framework include files
+#include "DD4hep/Segmentations.h"
+
+/// Namespace for the AIDA detector description toolkit
+namespace DD4hep {
+
+ /// Namespace for base segmentations
+ namespace DDSegmentation { class CartesianGridXY; }
+
+ /// Namespace for the geometry part of the AIDA detector description toolkit
+ namespace Geometry {
+
+ /// Implementation class for the grid XY segmentation.
+ /**
+ * \author M.Frank
+ * \version 1.0
+ * \ingroup DD4HEP_GEOMETRY
+ */
+ class CartesianGridXY : public Handle<DDSegmentation::CartesianGridXY> {
+ public:
+ /// Defintiion of the basic handled object
+ typedef DDSegmentation::CartesianGridXY Object;
+
+ public:
+ /// Default constructor
+ CartesianGridXY() : Handle<Object>() {}
+ /// Copy constructor from handle
+ CartesianGridXY(const Handle<Object>& e) : Handle<Object>(e) {}
+ /// Copy constructor
+ CartesianGridXY(const CartesianGridXY& e) = default;
+ /// Copy Constructor from segmentation base object
+ CartesianGridXY(const Segmentation& e);
+ /// Assignment operator
+ CartesianGridXY& operator=(const CartesianGridXY& seg) = default;
+ /// Equality operator
+ bool operator==(const CartesianGridXY& seg) const {
+ return m_element == seg.m_element;
+ }
+
+ /// determine the position based on the cell ID
+ Position position(const CellID& cellID) const;
+ /// determine the cell ID based on the position
+ CellID cellID(const Position& local, const Position& global, const VolumeID& volID) const;
+ /// access the grid size in X
+ double gridSizeX() const;
+ /// access the grid size in Y
+ double gridSizeY() const;
+ /// access the coordinate offset in X
+ double offsetX() const;
+ /// access the coordinate offset in Y
+ double offsetY() const;
+ /// access the field name used for X
+ const std::string& fieldNameX() const;
+ /// access the field name used for Y
+ const std::string& fieldNameY() const;
+ /** \brief Returns a vector<double> of the cellDimensions of the given cell ID
+ in natural order of dimensions, e.g., dx/dy/dz, or dr/r*dPhi
+
+ Returns a vector of the cellDimensions of the given cell ID
+ \param cellID is ignored as all cells have the same dimension
+ \return std::vector<double> size 2:
+ -# size in x
+ -# size in y
+ */
+ std::vector<double> cellDimensions(const CellID& cellID) const;
+ };
+
+ } /* End namespace Geometry */
+} /* End namespace DD4hep */
+#endif // DD4HEP_DDCORE_CARTESIANGRIDXY_H
diff --git a/DDCore/src/CartesianGridXY.cpp b/DDCore/src/CartesianGridXY.cpp
new file mode 100644
index 000000000..a09a700fa
--- /dev/null
+++ b/DDCore/src/CartesianGridXY.cpp
@@ -0,0 +1,89 @@
+//==========================================================================
+// AIDA Detector description implementation for LCD
+//--------------------------------------------------------------------------
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
+// All rights reserved.
+//
+// For the licensing terms see $DD4hepINSTALL/LICENSE.
+// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
+//
+// Author : M.Frank
+//
+//==========================================================================
+
+// Framework include files
+#include "DD4hep/Handle.inl"
+#include "DD4hep/Segmentations.h"
+#include "DD4hep/CartesianGridXY.h"
+#include "DDSegmentation/CartesianGridXY.h"
+
+// C/C++ include files
+
+using namespace std;
+using namespace DD4hep;
+using namespace DD4hep::Geometry;
+
+/// Instantiate handle functions
+DD4HEP_INSTANTIATE_HANDLE_UNNAMED(CartesianGridXY::Object);
+
+/// Copy Constructor from segmentation base object
+CartesianGridXY::CartesianGridXY(const Segmentation& e) : Handle<Object>()
+{
+ m_element = Segmentation::get<Object>(e.ptr());
+}
+
+/// determine the position based on the cell ID
+Position CartesianGridXY::position(const CellID& cellID) const {
+ return Position(access()->position(cellID));
+}
+
+/// determine the cell ID based on the position
+CellID CartesianGridXY::cellID(const Position& local,
+ const Position& global,
+ const VolumeID& volID) const
+{
+ return access()->cellID(local, global, volID);
+}
+
+/// access the grid size in X
+double CartesianGridXY::gridSizeX() const {
+ return access()->gridSizeX();
+}
+
+/// access the grid size in Y
+double CartesianGridXY::gridSizeY() const {
+ return access()->gridSizeY();
+}
+
+/// access the coordinate offset in X
+double CartesianGridXY::offsetX() const {
+ return access()->offsetX();
+}
+
+/// access the coordinate offset in Y
+double CartesianGridXY::offsetY() const {
+ return access()->offsetY();
+}
+
+/// access the field name used for X
+const string& CartesianGridXY::fieldNameX() const {
+ return access()->fieldNameX();
+}
+
+/// access the field name used for Y
+const string& CartesianGridXY::fieldNameY() const {
+ return access()->fieldNameY();
+}
+
+/** \brief Returns a vector<double> of the cellDimensions of the given cell ID
+ in natural order of dimensions, e.g., dx/dy/dz, or dr/r*dPhi
+
+ Returns a vector of the cellDimensions of the given cell ID
+ \param cellID is ignored as all cells have the same dimension
+ \return vector<double> size 2:
+ -# size in x
+ -# size in y
+*/
+vector<double> CartesianGridXY::cellDimensions(const CellID& cellID) const {
+ return access()->cellDimensions(cellID);
+}
--
GitLab