From 5d948ab22abcf7779268748a2f0628263ac99ab3 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Fri, 9 May 2014 13:46:26 +0000
Subject: [PATCH] - added Id property to files in DDRec and DDSurfaces -
added DDSurfaces to Doxygen - cleaned up DDSurfaces to have only pure
abstract base classes (interfaces)
---
DDRec/include/DDRec/DDGear.h | 4 +--
DDRec/include/DDRec/DetectorSurfaces.h | 2 +-
DDRec/include/DDRec/Exceptions.h | 2 +-
DDRec/include/DDRec/Surface.h | 16 ++++-----
DDRec/include/DDRec/SurfaceManager.h | 2 +-
DDRec/src/Surface.cpp | 10 +++---
DDSurfaces/include/DDSurfaces/ISurface.h | 6 ++--
DDSurfaces/include/DDSurfaces/Vector3D.h | 2 +-
DDSurfaces/src/DiskSurface.cpp | 44 -----------------------
DDSurfaces/src/StraightLineSurface.cpp | 44 -----------------------
DDSurfaces/src/ZCylinderSurface.cpp | 44 -----------------------
DDSurfaces/src/ZPlanarSurface.cpp | 45 ------------------------
cmake/Doxyfile.in | 1 +
13 files changed, 23 insertions(+), 199 deletions(-)
delete mode 100644 DDSurfaces/src/DiskSurface.cpp
delete mode 100644 DDSurfaces/src/StraightLineSurface.cpp
delete mode 100644 DDSurfaces/src/ZCylinderSurface.cpp
delete mode 100644 DDSurfaces/src/ZPlanarSurface.cpp
diff --git a/DDRec/include/DDRec/DDGear.h b/DDRec/include/DDRec/DDGear.h
index 10d65ce0b..40fa17b86 100644
--- a/DDRec/include/DDRec/DDGear.h
+++ b/DDRec/include/DDRec/DDGear.h
@@ -19,7 +19,7 @@ namespace DD4hep {
can be added to DetElements with the extension mechanism.
There can only be one such object added to any given DetElement
@author F.Gaede, DESY
- @version $Id:$
+ @version $Id$
*/
class GearHandle { //: public gear::GearParametersImpl {
@@ -66,7 +66,7 @@ namespace DD4hep {
/** Factory method that creates a GearMgr object pobulated with the GearParametersImpl objects from
all (top level) DetElements in the lcdd object
@author F.Gaede, DESY
- @version $Id:$
+ @version $Id$
*/
gear::GearMgr* createGearMgr( const Geometry::LCDD& lcdd ) ;
diff --git a/DDRec/include/DDRec/DetectorSurfaces.h b/DDRec/include/DDRec/DetectorSurfaces.h
index 815b1b132..bf689c5f4 100644
--- a/DDRec/include/DDRec/DetectorSurfaces.h
+++ b/DDRec/include/DDRec/DetectorSurfaces.h
@@ -11,7 +11,7 @@ namespace DD4hep {
*
* @author F.Gaede, DESY
* @date Apr, 10 2014
- * @version $Id:$
+ * @version $Id$
*/
class DetectorSurfaces: virtual public Geometry::DetElement {
diff --git a/DDRec/include/DDRec/Exceptions.h b/DDRec/include/DDRec/Exceptions.h
index 46895559c..460322d2b 100644
--- a/DDRec/include/DDRec/Exceptions.h
+++ b/DDRec/include/DDRec/Exceptions.h
@@ -1,4 +1,4 @@
-// $Id: Exceptions.h 513 2013-04-05 14:31:53Z gaede $
+// $Id$
//====================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------
diff --git a/DDRec/include/DDRec/Surface.h b/DDRec/include/DDRec/Surface.h
index 6e74fd55f..82454ff5f 100644
--- a/DDRec/include/DDRec/Surface.h
+++ b/DDRec/include/DDRec/Surface.h
@@ -21,7 +21,7 @@ namespace DD4hep {
*
* @author F.Gaede, DESY
* @date Apr, 6 2014
- * @version $Id:$
+ * @version $Id$
*/
struct SurfaceMaterial : public virtual Geometry::Material , public IMaterial{
@@ -58,7 +58,7 @@ namespace DD4hep {
/** Helper class for holding surface data.
* @author F.Gaede, DESY
* @date Apr, 6 2014
- * @version $Id:$
+ * @version $Id$
*/
struct SurfaceData{
@@ -100,7 +100,7 @@ namespace DD4hep {
*
* @author F.Gaede, DESY
* @date Apr, 6 2014
- * @version $Id:$
+ * @version $Id$
*/
class VolSurface : public Geometry::Handle< SurfaceData > , public ISurface {
@@ -180,7 +180,7 @@ namespace DD4hep {
/** std::list of VolSurfaces that takes ownership.
* @author F.Gaede, DESY
* @date Apr, 6 2014
- * @version $Id:$
+ * @version $Id$
*/
struct VolSurfaceList : std::list< VolSurface > {
@@ -219,7 +219,7 @@ namespace DD4hep {
/** Implementation of planar surface attached to a volume
* @author F.Gaede, DESY
* @date Apr, 6 2014
- * @version $Id:$
+ * @version $Id$
*/
class VolPlane : public VolSurface {
@@ -253,7 +253,7 @@ namespace DD4hep {
/** Implementation of cylindrical surface attached to a volume
* @author F.Gaede, DESY
* @date Apr, 6 2014
- * @version $Id:$
+ * @version $Id$
*/
class VolCylinder : public VolSurface {
@@ -288,7 +288,7 @@ namespace DD4hep {
*
* @author F.Gaede, DESY
* @date Apr, 7 2014
- * @version $Id:$
+ * @version $Id$
*/
class Surface: public ISurface {
@@ -393,7 +393,7 @@ namespace DD4hep {
/** std::list of Surfaces that optionally takes ownership.
* @author F.Gaede, DESY
* @date Apr, 10 2014
- * @version $Id:$
+ * @version $Id$
*/
class SurfaceList : public std::list< Surface* > {
diff --git a/DDRec/include/DDRec/SurfaceManager.h b/DDRec/include/DDRec/SurfaceManager.h
index 98ec522c9..c69d7d598 100644
--- a/DDRec/include/DDRec/SurfaceManager.h
+++ b/DDRec/include/DDRec/SurfaceManager.h
@@ -11,7 +11,7 @@ namespace DD4hep {
*
* @author F.Gaede, DESY
* @date Apr, 11 2014
- * @version $Id:$
+ * @version $Id$
*/
class SurfaceManager {
diff --git a/DDRec/src/Surface.cpp b/DDRec/src/Surface.cpp
index fd32f702b..40b3bfafe 100644
--- a/DDRec/src/Surface.cpp
+++ b/DDRec/src/Surface.cpp
@@ -343,11 +343,11 @@ namespace DD4hep {
_n.fill( na ) ;
_o.fill( oa ) ;
- // std::cout << " --- global surface vectors : ------- " << std::endl
- // << " u : " << _u << std::endl
- // << " v : " << _v << std::endl
- // << " n : " << _n << std::endl
- // << " o : " << _o << std::endl ;
+ // std::cout << " --- local and global surface vectors : ------- " << std::endl
+ // << " u : " << _volSurf.u() << " - " << _u << std::endl
+ // << " v : " << _volSurf.v() << " - " << _v << std::endl
+ // << " n : " << _volSurf.normal() << " - " << _n << std::endl
+ // << " o : " << _volSurf.origin() << " - " << _o << std::endl ;
// =========== check parallel and orthogonal to Z ===================
diff --git a/DDSurfaces/include/DDSurfaces/ISurface.h b/DDSurfaces/include/DDSurfaces/ISurface.h
index aabed8529..fb5070402 100644
--- a/DDSurfaces/include/DDSurfaces/ISurface.h
+++ b/DDSurfaces/include/DDSurfaces/ISurface.h
@@ -18,7 +18,7 @@ namespace DDSurfaces {
* the inner and outer materials with corresponding thicknesses.
*
* @author C.Grefe, CERN, F. Gaede, DESY
- * @version $Id: $
+ * @version $Id$
* @date Mar 7 2014
*/
class ISurface {
@@ -68,7 +68,7 @@ namespace DDSurfaces {
//==============================================================================================
/** Minimal interface to provide acces to radius of cylinder surfaces.
* @author F. Gaede, DESY
- * @version $Id: $
+ * @version $Id$
* @date May 6 2014
*/
class ICylinder {
@@ -85,7 +85,7 @@ namespace DDSurfaces {
* Usage: SurfaceType type( SurfaceType::Plane, SurfaceType::Sensitive ) ;
*
* @author F. Gaede, DESY
- * @version $Id: $
+ * @version $Id$
* @date Apr 6 2014
*/
class SurfaceType{
diff --git a/DDSurfaces/include/DDSurfaces/Vector3D.h b/DDSurfaces/include/DDSurfaces/Vector3D.h
index 340c35c8d..3f3f9a6c6 100644
--- a/DDSurfaces/include/DDSurfaces/Vector3D.h
+++ b/DDSurfaces/include/DDSurfaces/Vector3D.h
@@ -13,7 +13,7 @@ namespace DDSurfaces {
* cartesian. (copy of original version from gear).
*
* @author F. Gaede, DESY
- * @version $Id: $
+ * @version $Id$
* @date Apr 6 2014
*/
diff --git a/DDSurfaces/src/DiskSurface.cpp b/DDSurfaces/src/DiskSurface.cpp
deleted file mode 100644
index 869a84267..000000000
--- a/DDSurfaces/src/DiskSurface.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#define OBSOLETE
-#ifndef OBSOLETE
-/*
- * DiskSurface.cpp
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#include "DDSurfaces/DiskSurface.h"
-
-namespace DDSurfaces {
-
-DiskSurface::DiskSurface() {
- // TODO Auto-generated constructor stub
-
-}
-
-DiskSurface::~DiskSurface() {
- // TODO Auto-generated destructor stub
-}
-
-/// Checks if the given point lies within the surface
-bool DiskSurface::isInsideBoundaries(const Vector3D& point) const {
- // TODO
- return false;
-}
-
-/// Access to the normal direction at the given point
-Vector3D DiskSurface::getNormal(const Vector3D& point) const {
- // TODO
- return Vector3D();
-
-}
-
-/// Access to the measurement directions at the given point
-MeasurementDirections DiskSurface::measurement(const Vector3D& point) const {
- // TODO
- return MeasurementDirections();
-}
-
-} /* namespace DDSurfaces */
-
-#endif
diff --git a/DDSurfaces/src/StraightLineSurface.cpp b/DDSurfaces/src/StraightLineSurface.cpp
deleted file mode 100644
index 604a50dfb..000000000
--- a/DDSurfaces/src/StraightLineSurface.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#define OBSOLETE
-#ifndef OBSOLETE
-/*
- * StraightLineSurface.cpp
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#include "DDSurfaces/StraightLineSurface.h"
-
-namespace DDSurfaces {
-
-StraightLineSurface::StraightLineSurface() {
- // TODO Auto-generated constructor stub
-
-}
-
-StraightLineSurface::~StraightLineSurface() {
- // TODO Auto-generated destructor stub
-}
-
-/// Checks if the given point lies within the surface
-bool StraightLineSurface::isInsideBoundaries(const Vector3D& point) const {
- // TODO
- return false;
-}
-
-/// Access to the normal direction at the given point
-Vector3D StraightLineSurface::getNormal(const Vector3D& point) const {
- // TODO
- return Vector3D();
-
-}
-
-/// Access to the measurement directions at the given point
-MeasurementDirections StraightLineSurface::measurement(const Vector3D& point) const {
- // TODO
- return MeasurementDirections();
-}
-
-} /* namespace DDSurfaces */
-
-#endif
diff --git a/DDSurfaces/src/ZCylinderSurface.cpp b/DDSurfaces/src/ZCylinderSurface.cpp
deleted file mode 100644
index 9c3f6d081..000000000
--- a/DDSurfaces/src/ZCylinderSurface.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#define OBSOLETE
-#ifndef OBSOLETE
-/*
- * ZCylinderSurface.cpp
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#include "DDSurfaces/ZCylinderSurface.h"
-
-namespace DDSurfaces {
-
-ZCylinderSurface::ZCylinderSurface() {
- // TODO Auto-generated constructor stub
-
-}
-
-ZCylinderSurface::~ZCylinderSurface() {
- // TODO Auto-generated destructor stub
-}
-
-/// Checks if the given point lies within the surface
-bool ZCylinderSurface::isInsideBoundaries(const Vector3D& point) const {
- // TODO
- return false;
-}
-
-/// Access to the normal direction at the given point
-Vector3D ZCylinderSurface::getNormal(const Vector3D& point) const {
- // TODO
- return Vector3D();
-
-}
-
-/// Access to the measurement directions at the given point
-MeasurementDirections ZCylinderSurface::measurement(const Vector3D& point) const {
- // TODO
- return MeasurementDirections();
-}
-
-} /* namespace DDSurfaces */
-
-#endif
diff --git a/DDSurfaces/src/ZPlanarSurface.cpp b/DDSurfaces/src/ZPlanarSurface.cpp
deleted file mode 100644
index 5c7b4561e..000000000
--- a/DDSurfaces/src/ZPlanarSurface.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#define OBSOLETE
-#ifndef OBSOLETE
-/*
- * ZPlanarSurface.cpp
- *
- * Created on: Mar 7, 2014
- * Author: cgrefe
- */
-
-#include "DDSurfaces/ZPlanarSurface.h"
-
-namespace DDSurfaces {
-
-ZPlanarSurface::ZPlanarSurface() {
- // TODO Auto-generated constructor stub
-
-}
-
-ZPlanarSurface::~ZPlanarSurface() {
- // TODO Auto-generated destructor stub
-}
-
-/// Checks if the given point lies within the surface
-bool ZPlanarSurface::isInsideBoundaries(const Vector3D& point) const {
- // TODO
- return false;
-}
-
-/// Access to the normal direction at the given point
-Vector3D ZPlanarSurface::getNormal(const Vector3D& point) const {
- // TODO
- return Vector3D();
-
-}
-
-/// Access to the measurement directions at the given point
-MeasurementDirections ZPlanarSurface::measurement(const Vector3D& point) const {
- // TODO
- return MeasurementDirections();
-}
-
-} /* namespace DDSurfaces */
-
-#endif
-
diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in
index 892d76781..c1305829b 100644
--- a/cmake/Doxyfile.in
+++ b/cmake/Doxyfile.in
@@ -663,6 +663,7 @@ INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSense/src
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSense/include/DDSense
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDRec/src
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDRec/include/DDRec
+INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSurfaces/include/DDSurfaces
#INPUT += @CMAKE_CURRENT_SOURCE_DIR@//src
#INPUT += @CMAKE_CURRENT_SOURCE_DIR@//include
--
GitLab