From 06d684413cb894c7ef017fb11cdefd66f0a56199 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Fri, 9 May 2014 13:39:44 +0000
Subject: [PATCH] - remove initial version of surface classes - no
superseeded by pure abstract ISurface and IMaterial
---
DDSurfaces/include/DDSurfaces/DiskSurface.h | 42 -------------
DDSurfaces/include/DDSurfaces/Material.h | 61 -------------------
.../DDSurfaces/MeasurementDirections.h | 48 ---------------
.../include/DDSurfaces/StraightLineSurface.h | 42 -------------
.../include/DDSurfaces/ZCylinderSurface.h | 42 -------------
.../include/DDSurfaces/ZPlanarSurface.h | 42 -------------
6 files changed, 277 deletions(-)
delete mode 100644 DDSurfaces/include/DDSurfaces/DiskSurface.h
delete mode 100644 DDSurfaces/include/DDSurfaces/Material.h
delete mode 100644 DDSurfaces/include/DDSurfaces/MeasurementDirections.h
delete mode 100644 DDSurfaces/include/DDSurfaces/StraightLineSurface.h
delete mode 100644 DDSurfaces/include/DDSurfaces/ZCylinderSurface.h
delete mode 100644 DDSurfaces/include/DDSurfaces/ZPlanarSurface.h
diff --git a/DDSurfaces/include/DDSurfaces/DiskSurface.h b/DDSurfaces/include/DDSurfaces/DiskSurface.h
deleted file mode 100644
index 73ee7c6aa..000000000
--- a/DDSurfaces/include/DDSurfaces/DiskSurface.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * DiskSurface.h
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#ifndef DDSurfaces_DISKSURFACE_H_
-#define DDSurfaces_DISKSURFACE_H_
-
-#include "DDSurfaces/ISurface.h"
-
-namespace DDSurfaces {
-
-struct DiskBoundary {
- ;
-};
-
-class DiskSurface: public ISurface {
-public:
- /// Default constructor
- DiskSurface();
-
- /// Destructor
- virtual ~DiskSurface();
-
- /// Checks if the given point lies within the surface
- virtual bool isInsideBoundaries(const Vector3D& point) const;
-
- /// Access to the normal direction at the given point
- virtual Vector3D getNormal(const Vector3D& point) const;
-
- /// Access to the measurement directions at the given point
- virtual MeasurementDirections measurement(const Vector3D& point) const;
-
-protected:
- DiskBoundary m_boundary;
-};
-
-} /* namespace DDSurfaces */
-
-#endif /* DDSurfaces_DISKSURFACE_H_ */
diff --git a/DDSurfaces/include/DDSurfaces/Material.h b/DDSurfaces/include/DDSurfaces/Material.h
deleted file mode 100644
index 69da03667..000000000
--- a/DDSurfaces/include/DDSurfaces/Material.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Material.h
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#ifndef DDSurfaces_MATERIAL_H_
-#define DDSurfaces_MATERIAL_H_
-
-namespace DDSurfaces {
-
-/** Container class for material properties used in tracking */
-class Material {
-public:
- /// Default constructor
- Material(int Z = 0, int A = 0, double density = 0., double radiationLength = 0.) :
- m_Z(Z), m_A(A), m_density(density), m_radiationLength(
- radiationLength) {
- }
-
- /// Copy constructor
- Material(const Material& material) :
- m_Z(material.Z()), m_A(material.A()), m_density(material.density()), m_radiationLength(
- material.radiationLength()) {
- }
-
- /// Destructor
- virtual ~Material() {}
-
- /// Access to the atomic number
- int Z() const {
- return m_Z;
- }
-
- /// Access to the atomic mass
- int A() const {
- return m_A;
- }
-
- /// Access to the density
- double density() const {
- return m_density;
- }
-
- /// Access to the radiation length
- double radiationLength() const {
- // FIXME: needs to calculate X0 to allow lazy initialization
- return m_radiationLength;
- }
-
-protected:
- int m_Z; /// the atomic number
- int m_A; /// the atomic mass
- double m_density; /// the density
- double m_radiationLength; /// the radiation length
-};
-
-} /* namespace DDSurfaces */
-
-#endif /* DDSurfaces_MATERIAL_H_ */
diff --git a/DDSurfaces/include/DDSurfaces/MeasurementDirections.h b/DDSurfaces/include/DDSurfaces/MeasurementDirections.h
deleted file mode 100644
index 0a152afa5..000000000
--- a/DDSurfaces/include/DDSurfaces/MeasurementDirections.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * MeasurementDirections.h
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#ifndef DDSurfaces_MEASUREMENTDIRECTIONS_H_
-#define DDSurfaces_MEASUREMENTDIRECTIONS_H_
-
-#include "DDSurfaces/Vector3D.h"
-
-namespace DDSurfaces {
-
-/** Container class for measurement directions */
-class MeasurementDirections {
-public:
- /// Default constructor
- MeasurementDirections(const Vector3D& u = Vector3D(), const Vector3D& v = Vector3D()) :
- m_u(u), m_v(v) {
- }
-
- /// Copy constructor
- MeasurementDirections(const MeasurementDirections& measurement) :
- m_u(measurement.u()), m_v(measurement.v()) {
- }
-
- /// Destructor
- virtual ~MeasurementDirections() {}
-
- /// Access to the U measurement direction
- const Vector3D& u() const {
- return m_u;
- }
-
- /// Access to the V measurement direction
- const Vector3D& v() const {
- return m_v;
- }
-
-protected:
- Vector3D m_u;
- Vector3D m_v;
-};
-
-} /* namespace DDSurfaces */
-
-#endif /* DDSurfaces_MEASUREMENTDIRECTIONS_H_ */
diff --git a/DDSurfaces/include/DDSurfaces/StraightLineSurface.h b/DDSurfaces/include/DDSurfaces/StraightLineSurface.h
deleted file mode 100644
index 2647cc22c..000000000
--- a/DDSurfaces/include/DDSurfaces/StraightLineSurface.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * StraightLineSurface.h
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#ifndef DDSurfaces_STRAIGHTLINESURFACE_H_
-#define DDSurfaces_STRAIGHTLINESURFACE_H_
-
-#include "DDSurfaces/ISurface.h"
-
-namespace DDSurfaces {
-
-struct StraightLineBoundary {
- ;
-};
-
-class StraightLineSurface: public ISurface {
-public:
- /// Default constructor
- StraightLineSurface();
-
- /// Destructor
- virtual ~StraightLineSurface();
-
- /// Checks if the given point lies within the surface
- virtual bool isInsideBoundaries(const Vector3D& point) const;
-
- /// Access to the normal direction at the given point
- virtual Vector3D getNormal(const Vector3D& point) const;
-
- /// Access to the measurement directions at the given point
- virtual MeasurementDirections measurement(const Vector3D& point) const;
-
-protected:
- StraightLineBoundary m_boundary;
-};
-
-} /* namespace DDSurfaces */
-
-#endif /* DDSurfaces_STRAIGHTLINESURFACE_H_ */
diff --git a/DDSurfaces/include/DDSurfaces/ZCylinderSurface.h b/DDSurfaces/include/DDSurfaces/ZCylinderSurface.h
deleted file mode 100644
index 43c39b40b..000000000
--- a/DDSurfaces/include/DDSurfaces/ZCylinderSurface.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * ZCylinderSurface.h
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#ifndef DDSurfaces_ZCYLINDERSURFACE_H_
-#define DDSurfaces_ZCYLINDERSURFACE_H_
-
-#include "DDSurfaces/ISurface.h"
-
-namespace DDSurfaces {
-
-struct ZCylinderBoundary {
- ;
-};
-
-class ZCylinderSurface: public ISurface {
-public:
- /// Default constructor
- ZCylinderSurface();
-
- /// Destructor
- virtual ~ZCylinderSurface();
-
- /// Checks if the given point lies within the surface
- virtual bool isInsideBoundaries(const Vector3D& point) const;
-
- /// Access to the normal direction at the given point
- virtual Vector3D getNormal(const Vector3D& point) const;
-
- /// Access to the measurement directions at the given point
- virtual MeasurementDirections measurement(const Vector3D& point) const;
-
-protected:
- ZCylinderBoundary m_boundary;
-};
-
-} /* namespace DDSurfaces */
-
-#endif /* DDSurfaces_ZCYLINDERSURFACE_H_ */
diff --git a/DDSurfaces/include/DDSurfaces/ZPlanarSurface.h b/DDSurfaces/include/DDSurfaces/ZPlanarSurface.h
deleted file mode 100644
index 1ae33ea44..000000000
--- a/DDSurfaces/include/DDSurfaces/ZPlanarSurface.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * ZPlanarSurface.h
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#ifndef DDSurfaces_ZPLANARSURFACE_H_
-#define DDSurfaces_ZPLANARSURFACE_H_
-
-#include "DDSurfaces/ISurface.h"
-
-namespace DDSurfaces {
-
-struct ZPlanarBoundary {
- ;
-};
-
-class ZPlanarSurface: public ISurface {
-public:
- /// Default constructor
- ZPlanarSurface();
-
- /// Destructor
- virtual ~ZPlanarSurface();
-
- /// Checks if the given point lies within the surface
- virtual bool isInsideBoundaries(const Vector3D& point) const;
-
- /// Access to the normal direction at the given point
- virtual Vector3D getNormal(const Vector3D& point) const;
-
- /// Access to the measurement directions at the given point
- virtual MeasurementDirections measurement(const Vector3D& point) const;
-
-protected:
- ZPlanarBoundary m_boundary;
-};
-
-} /* namespace DDSurfaces */
-
-#endif /* DDSurfaces_ZPLANARSURFACE_H_ */
--
GitLab