From 9085cba7d0f8415a00566e35dfd9674b425e6d6c Mon Sep 17 00:00:00 2001 From: Frank Gaede <frank.gaede@desy.de> Date: Tue, 17 Feb 2015 13:30:11 +0000 Subject: [PATCH] - added xml attribute "distance" --- DDCore/include/XML/UnicodeValues.h | 1 + DDCore/include/XML/XMLChildValue.h | 2 ++ DDCore/include/XML/XMLDimension.h | 2 ++ DDCore/src/XML/XMLChildValue.cpp | 1 + DDCore/src/XML/XMLDimension.cpp | 1 + 5 files changed, 7 insertions(+) diff --git a/DDCore/include/XML/UnicodeValues.h b/DDCore/include/XML/UnicodeValues.h index cc88e4d68..81fc4c9e6 100644 --- a/DDCore/include/XML/UnicodeValues.h +++ b/DDCore/include/XML/UnicodeValues.h @@ -50,6 +50,7 @@ namespace DD4hep { UNICODE (box); UNICODE (c); + UNICODE (distance); UNICODE (C); UNICODE (calorimeter); UNICODE (cartesian_grid_xy); diff --git a/DDCore/include/XML/XMLChildValue.h b/DDCore/include/XML/XMLChildValue.h index 40851cf39..61e1d710c 100644 --- a/DDCore/include/XML/XMLChildValue.h +++ b/DDCore/include/XML/XMLChildValue.h @@ -147,6 +147,8 @@ namespace DD4hep { double rmax2() const; /// Access parameters: radius double radius() const; + /// Access attribute values: distance + double distance() const; /// Access attribute values: outer_radius double outer_radius() const; /// Access attribute values: outer_r diff --git a/DDCore/include/XML/XMLDimension.h b/DDCore/include/XML/XMLDimension.h index ad8b551fd..0c1bf2750 100644 --- a/DDCore/include/XML/XMLDimension.h +++ b/DDCore/include/XML/XMLDimension.h @@ -150,6 +150,8 @@ namespace DD4hep { double c() const; /// Access parameters: c double c(double default_value) const; + ///Access parameters: distance + double distance() const; /// Access parameters: B double B() const; /// Access parameters: g diff --git a/DDCore/src/XML/XMLChildValue.cpp b/DDCore/src/XML/XMLChildValue.cpp index 442584aef..3a0e8940d 100644 --- a/DDCore/src/XML/XMLChildValue.cpp +++ b/DDCore/src/XML/XMLChildValue.cpp @@ -93,6 +93,7 @@ XML_ATTR_ACCESSOR(double, rmin2) XML_ATTR_ACCESSOR(double, rmax2) XML_ATTR_ACCESSOR(double, radius) XML_ATTR_ACCESSOR(double, outer_r) +XML_ATTR_ACCESSOR(double, distance) XML_ATTR_ACCESSOR(double, outer_radius) XML_ATTR_ACCESSOR(double, inner_r) XML_ATTR_ACCESSOR(double, inner_radius) diff --git a/DDCore/src/XML/XMLDimension.cpp b/DDCore/src/XML/XMLDimension.cpp index 6690b6f9c..fe0eadef1 100644 --- a/DDCore/src/XML/XMLDimension.cpp +++ b/DDCore/src/XML/XMLDimension.cpp @@ -74,6 +74,7 @@ XML_ATTR_ACCESSOR(double, inner_z) XML_ATTR_ACCESSOR_DOUBLE(a) XML_ATTR_ACCESSOR_DOUBLE(b) XML_ATTR_ACCESSOR_DOUBLE(c) +XML_ATTR_ACCESSOR(double, distance) XML_ATTR_ACCESSOR(double, g) XML_ATTR_ACCESSOR(double, B) XML_ATTR_ACCESSOR(double, G) -- GitLab