diff --git a/DDCond/src/ConditionsRepository.cpp b/DDCond/src/ConditionsRepository.cpp
index 9738e18e53f468008b121d9ba15cf5cfeb30113c..3b1cc56c491de2bafb5856d112f3fdcfeb34eaff 100644
--- a/DDCond/src/ConditionsRepository.cpp
+++ b/DDCond/src/ConditionsRepository.cpp
@@ -103,7 +103,12 @@ namespace {
return 1;
}
- int createText(const string& output, const AllConditions& all, char sep) {
+#if defined(DD4HEP_MINIMAL_CONDITIONS)
+ int createText(const string& output, const AllConditions&, char)
+#else
+ int createText(const string& output, const AllConditions& all, char sep)
+#endif
+ {
ofstream out(output);
#if !defined(DD4HEP_MINIMAL_CONDITIONS)
size_t siz_nam=0, siz_add=0, siz_tot=0;
diff --git a/DDCond/src/ConditionsTextRepository.cpp b/DDCond/src/ConditionsTextRepository.cpp
index d6b84bbe989c1e8072be6927da37442b93c9157c..cad11d8cdaa67f6672aba501bf085ad26d3fd358 100644
--- a/DDCond/src/ConditionsTextRepository.cpp
+++ b/DDCond/src/ConditionsTextRepository.cpp
@@ -101,7 +101,12 @@ namespace {
return 1;
}
- int createText(const string& output, const AllConditions& all, char sep) {
+#if defined(DD4HEP_MINIMAL_CONDITIONS)
+ int createText(const string& output, const AllConditions&, char)
+#else
+ int createText(const string& output, const AllConditions& all, char sep)
+#endif
+ {
ofstream out(output);
#if !defined(DD4HEP_MINIMAL_CONDITIONS)
size_t siz_nam=0, siz_add=0, siz_tot=0;
diff --git a/DDCore/include/DD4hep/ConditionDerived.h b/DDCore/include/DD4hep/ConditionDerived.h
index b1ce9a0d156057e999b741e60cb5aa91896bcc84..4993b68aa4d071c476ab715751feac883ce07100 100644
--- a/DDCore/include/DD4hep/ConditionDerived.h
+++ b/DDCore/include/DD4hep/ConditionDerived.h
@@ -348,7 +348,7 @@ namespace dd4hep {
ConditionDependency();
/// Access the dependency key
Condition::key_type key() const { return target.hash; }
-#if defined(DD4HEP_CONDITIONS_DEBUG) || defined(DD4HEP_CONDITIONKEY_HAVE_NAME)
+#if defined(DD4HEP_CONDITIONS_HAVE_NAME)
/// Access the dependency key
const char* name() const { return target.name.c_str(); }
#endif
diff --git a/DDCore/include/DD4hep/Conditions.h b/DDCore/include/DD4hep/Conditions.h
index f331e666055973c8f0e33eb246df6e3f83581d5c..c83df7a64fd51075b05e5efab046dab1f156622a 100644
--- a/DDCore/include/DD4hep/Conditions.h
+++ b/DDCore/include/DD4hep/Conditions.h
@@ -268,7 +268,7 @@ namespace dd4hep {
*/
class ConditionKey {
public:
-#if defined(DD4HEP_CONDITIONS_DEBUG) || defined(DD4HEP_CONDITIONKEY_HAVE_NAME)
+#if defined(DD4HEP_CONDITIONS_HAVE_NAME)
/// Optional string identifier. Helps debugging a lot!
std::string name;
#endif
diff --git a/DDCore/include/DD4hep/Shapes.h b/DDCore/include/DD4hep/Shapes.h
index cbadf8d87b9e08e10a9fa67b2dee7dfb6310ce13..520488cc97c639a5aa5d0e6bbf267ae3e172ae07 100644
--- a/DDCore/include/DD4hep/Shapes.h
+++ b/DDCore/include/DD4hep/Shapes.h
@@ -712,7 +712,7 @@ namespace dd4hep {
*
* The Solid::dimension() and Solid::setDimension() calls for the TruncatedTube
* deliver/expect the parameters in the same order as the constructor:
- * (zhalf, rmin, rmax, startPhi, deltaPhi, cutAtStart, cutAtDelta, cutInside)
+ * (dz, rmin, rmax, startPhi, deltaPhi, cutAtStart, cutAtDelta, cutInside)
*
* \author M.Frank
* \version 1.0
@@ -722,7 +722,7 @@ namespace dd4hep {
protected:
/// Internal helper method to support object construction
void make(const std::string& name,
- double zhalf, double rmin, double rmax, double startPhi, double deltaPhi,
+ double dz, double rmin, double rmax, double startPhi, double deltaPhi,
double cutAtStart, double cutAtDelta, bool cutInside);
public:
@@ -738,12 +738,12 @@ namespace dd4hep {
template <typename Q> TruncatedTube(const Handle<Q>& e) : Solid_type<Object>(e) { }
/// Constructor to create a truncated tube object with attribute initialization
- TruncatedTube(double zhalf, double rmin, double rmax, double startPhi, double deltaPhi,
+ TruncatedTube(double dz, double rmin, double rmax, double startPhi, double deltaPhi,
double cutAtStart, double cutAtDelta, bool cutInside);
/// Constructor to create a truncated tube object with attribute initialization
TruncatedTube(const std::string& name,
- double zhalf, double rmin, double rmax, double startPhi, double deltaPhi,
+ double dz, double rmin, double rmax, double startPhi, double deltaPhi,
double cutAtStart, double cutAtDelta, bool cutInside);
/// Move Assignment operator
@@ -962,6 +962,8 @@ namespace dd4hep {
double h1, double bl1, double tl1, double alpha1,
double h2, double bl2, double tl2, double alpha2);
+ /// Accessor: z-half value
+ double dZ() const { return access()->GetDz(); }
/// Accessor: phi value
double phi() const { return access()->GetPhi()*dd4hep::deg; }
/// Accessor: theta value
diff --git a/DDCore/include/DD4hep/config.h b/DDCore/include/DD4hep/config.h
index e1e2e5011542a44d4edc71d3c51b61fb71abf52d..2c0345d8dd259ce5142a67e8e5faf3a75368a1a9 100644
--- a/DDCore/include/DD4hep/config.h
+++ b/DDCore/include/DD4hep/config.h
@@ -18,13 +18,18 @@
/// Enable to have more debugging information for conditions and keys
/// If enabled it overrides DD4HEP_MINIMAL_CONDITIONS and sets it to true
-/// If enabled it overrides DD4HEP_CONDITIONKEY_HAVE_NAME and sets it to true
+/// If enabled it overrides DD4HEP_CONDITIONS_HAVE_NAME and sets it to true
+#if defined(DD4HEP_DEBUG)
#define DD4HEP_CONDITIONS_DEBUG 1
+#endif
-/// Enable this if you want to minimize the footprint of conditions
-//#define DD4HEP_MINIMAL_CONDITIONS 1
+#if defined(DD4HEP_CONDITIONS_DEBUG)
/// Enable flag to store conditions names to keys (needs some support from user code!)
-//#define DD4HEP_CONDITIONKEY_HAVE_NAME 1
+#define DD4HEP_CONDITIONS_HAVE_NAME 1
+#else
+/// Enable this if you want to minimize the footprint of conditions
+#define DD4HEP_MINIMAL_CONDITIONS 1
+#endif
/// Valid implementations of the Gaudi plugin service are 1 and 2
#define DD4HEP_PLUGINSVC_VERSION 2
diff --git a/DDCore/include/DD4hep/detail/ConditionsInterna.h b/DDCore/include/DD4hep/detail/ConditionsInterna.h
index 7e93c5e0e780e3c42313757cbed20252a862e01a..39d1f3a8e91c805d141d62af03764bd8e06e6811 100644
--- a/DDCore/include/DD4hep/detail/ConditionsInterna.h
+++ b/DDCore/include/DD4hep/detail/ConditionsInterna.h
@@ -56,7 +56,7 @@ namespace dd4hep {
* \ingroup DD4HEP_CONDITIONS
*/
class ConditionObject
-#if defined(DD4HEP_CONDITIONS_DEBUG) || !defined(DD4HEP_MINIMAL_CONDITIONS)
+#if defined(DD4HEP_CONDITIONS_HAVE_NAME)
: public NamedObject
#endif
{
diff --git a/DDCore/src/ConditionDerived.cpp b/DDCore/src/ConditionDerived.cpp
index 777d28d533b5be75625fc4dafce1a1cf492649e3..d1ac19fa8d8887e5953ccd222403bb142a87b271 100644
--- a/DDCore/src/ConditionDerived.cpp
+++ b/DDCore/src/ConditionDerived.cpp
@@ -55,7 +55,7 @@ Condition ConditionUpdateContext::condition(const ConditionKey& key_value) cons
iov->iov_intersection(c.iov());
return c;
}
-#if defined(DD4HEP_CONDITIONS_DEBUG) || defined(DD4HEP_CONDITIONKEY_HAVE_NAME)
+#if defined(DD4HEP_CONDITIONS_HAVE_NAME)
except("ConditionUpdateCall:","Failed to access non-existing condition:"+key_value.name);
#else
ConditionKey::KeyMaker key(key_value.hash);
@@ -117,7 +117,7 @@ ConditionResolver::~ConditionResolver() {
/// Throw exception on conditions access failure
void ConditionUpdateContext::accessFailure(const ConditionKey& key_value) const {
-#if defined(DD4HEP_CONDITIONS_DEBUG) || defined(DD4HEP_CONDITIONKEY_HAVE_NAME)
+#if defined(DD4HEP_CONDITIONS_HAVE_NAME)
except("ConditionUpdateCall",
"%s [%016llX]: FAILED to access non-existing item:%s [%016llX]",
dependency->target.name.c_str(), dependency->target.hash,
diff --git a/DDCore/src/Conditions.cpp b/DDCore/src/Conditions.cpp
index b239dee6b3d6aba9c86d4de6077fe3ca14e255d2..d7a96453d9d6ec46a5417f3e6ad12b7794fe389f 100644
--- a/DDCore/src/Conditions.cpp
+++ b/DDCore/src/Conditions.cpp
@@ -23,14 +23,6 @@
using namespace std;
using namespace dd4hep;
-#if defined(DD4HEP_CONDITIONS_DEBUG) && !defined(DD4HEP_CONDITIONKEY_HAVE_NAME)
-#define DD4HEP_CONDITIONKEY_HAVE_NAME 1
-#endif
-
-#if defined(DD4HEP_CONDITIONS_DEBUG) && defined(DD4HEP_MINIMAL_CONDITIONS)
-#undef DD4HEP_MINIMAL_CONDITIONS
-#endif
-
/// Initializing constructor for a pure, undecorated conditions object
Condition::Condition(key_type hash_key) : Handle<Object>()
{
@@ -65,7 +57,7 @@ Condition::Condition(const string& nam,const string& typ, size_t memory)
string Condition::str(int flags) const {
stringstream output;
Object* o = access();
-#if !defined(DD4HEP_MINIMAL_CONDITIONS)
+#if defined(DD4HEP_CONDITIONS_HAVE_NAME)
if ( 0 == (flags&NO_NAME) )
output << setw(16) << left << o->name;
#endif
@@ -206,7 +198,7 @@ ConditionKey::KeyMaker::KeyMaker(Condition::detkey_type det, const std::string&
/// Constructor from string
ConditionKey::ConditionKey(DetElement detector, const string& value) {
hash = KeyMaker(detector,value).hash;
-#ifdef DD4HEP_CONDITIONKEY_HAVE_NAME
+#ifdef DD4HEP_CONDITIONS_HAVE_NAME
name = detector.path()+"#"+value;
#endif
}
@@ -214,7 +206,7 @@ ConditionKey::ConditionKey(DetElement detector, const string& value) {
/// Constructor from detector element key and item sub-key
ConditionKey::ConditionKey(Condition::detkey_type det_key, const string& value) {
hash = KeyMaker(det_key,value).hash;
-#ifdef DD4HEP_CONDITIONKEY_HAVE_NAME
+#ifdef DD4HEP_CONDITIONS_HAVE_NAME
char text[32];
::snprintf(text,sizeof(text),"%08X#",det_key);
name = text+value;
@@ -224,7 +216,7 @@ ConditionKey::ConditionKey(Condition::detkey_type det_key, const string& value)
/// Constructor from detector element key and item sub-key
ConditionKey::ConditionKey(DetElement detector, Condition::itemkey_type item_key) {
hash = KeyMaker(detector.key(),item_key).hash;
-#ifdef DD4HEP_CONDITIONKEY_HAVE_NAME
+#ifdef DD4HEP_CONDITIONS_HAVE_NAME
char text[32];
::snprintf(text,sizeof(text),"#%08X",item_key);
name = detector.path()+text;
@@ -256,7 +248,7 @@ string ConditionKey::toString() const {
dd4hep::ConditionKey::KeyMaker key(hash);
char text[64];
::snprintf(text,sizeof(text),"%08X-%08X",key.values.det_key, key.values.item_key);
-#if defined(DD4HEP_CONDITIONS_DEBUG) || defined(DD4HEP_CONDITIONKEY_HAVE_NAME)
+#if defined(DD4HEP_CONDITIONS_HAVE_NAME)
if ( !name.empty() ) {
stringstream str;
str << "(" << name << ") " << text;
diff --git a/DDCore/src/ShapeUtilities.cpp b/DDCore/src/ShapeUtilities.cpp
index c7cb8ea280ad5626b15054ef5962ba24602f6e8d..864cf59e2859bdcc938b5d09ada8dc11d9505f28 100644
--- a/DDCore/src/ShapeUtilities.cpp
+++ b/DDCore/src/ShapeUtilities.cpp
@@ -858,7 +858,7 @@ namespace dd4hep {
TGeoShape* right_solid = boolean->GetRightShape();
TGeoTubeSeg* tubs = (TGeoTubeSeg*)left_solid;
TGeoBBox* box = (TGeoBBox*)right_solid;
- double zhalf = params[0];
+ double dz = params[0];
double rmin = params[1];
double rmax = params[2];
double startPhi = params[3]/units::deg;
@@ -893,7 +893,7 @@ namespace dd4hep {
double boxX = 1.1*rmax + rmax/sin_alpha; // Need to adjust for move!
double boxY = rmax;
// width of the box > width of the tubs
- double boxZ = 1.1 * zhalf;
+ double boxZ = 1.1 * dz;
double xBox; // center point of the box
if( cutInside )
xBox = r - boxY / sin_alpha;
@@ -904,7 +904,7 @@ namespace dd4hep {
TGeoRotation rot;
rot.RotateZ( -alpha/units::deg );
double box_dim[] = {boxX, boxY, boxZ};
- double tub_dim[] = {rmin, rmax, zhalf, startPhi, deltaPhi};
+ double tub_dim[] = {rmin, rmax, dz, startPhi, deltaPhi};
box->SetDimensions(box_dim);
tubs->SetDimensions(tub_dim);
TGeoCombiTrans* combi = (TGeoCombiTrans*)right_matrix;
diff --git a/DDCore/src/Shapes.cpp b/DDCore/src/Shapes.cpp
index 7871358938ba9cf802d84a5555d7a1053ba66f60..1fd6bb3fc18b31d006d37d47314e2cf484592317 100644
--- a/DDCore/src/Shapes.cpp
+++ b/DDCore/src/Shapes.cpp
@@ -328,19 +328,19 @@ void CutTube::make(const string& nam, double rmin, double rmax, double dz, doubl
}
/// Constructor to create a truncated tube object with attribute initialization
-TruncatedTube::TruncatedTube(double dZ, double rmin, double rmax, double startPhi, double deltaPhi,
+TruncatedTube::TruncatedTube(double dz, double rmin, double rmax, double startPhi, double deltaPhi,
double cutAtStart, double cutAtDelta, bool cutInside)
-{ make("", dZ, rmin, rmax, startPhi/units::deg, deltaPhi/units::deg, cutAtStart, cutAtDelta, cutInside); }
+{ make("", dz, rmin, rmax, startPhi/units::deg, deltaPhi/units::deg, cutAtStart, cutAtDelta, cutInside); }
/// Constructor to create a truncated tube object with attribute initialization
TruncatedTube::TruncatedTube(const string& nam,
- double dZ, double rmin, double rmax, double startPhi, double deltaPhi,
+ double dz, double rmin, double rmax, double startPhi, double deltaPhi,
double cutAtStart, double cutAtDelta, bool cutInside)
-{ make(nam, dZ, rmin, rmax, startPhi/units::deg, deltaPhi/units::deg, cutAtStart, cutAtDelta, cutInside); }
+{ make(nam, dz, rmin, rmax, startPhi/units::deg, deltaPhi/units::deg, cutAtStart, cutAtDelta, cutInside); }
/// Internal helper method to support object construction
void TruncatedTube::make(const string& nam,
- double dZ, double rmin, double rmax, double startPhi, double deltaPhi,
+ double dz, double rmin, double rmax, double startPhi, double deltaPhi,
double cutAtStart, double cutAtDelta, bool cutInside) {
// check the parameters
if( rmin <= 0 || rmax <= 0 || cutAtStart <= 0 || cutAtDelta <= 0 )
@@ -365,7 +365,7 @@ void TruncatedTube::make(const string& nam,
double boxX = 1.1*rmax + rmax/sin_alpha; // Need to adjust for move!
double boxY = rmax;
// width of the box > width of the tubs
- double boxZ = 1.1 * dZ;
+ double boxZ = 1.1 * dz;
double xBox; // center point of the box
if( cutInside )
xBox = r - boxY / sin_alpha;
@@ -377,12 +377,12 @@ void TruncatedTube::make(const string& nam,
rot.RotateZ( -alpha/dd4hep::deg );
TGeoTranslation trans(xBox, 0., 0.);
TGeoBBox* box = new TGeoBBox((nam+"Box").c_str(), boxX, boxY, boxZ);
- TGeoTubeSeg* tubs = new TGeoTubeSeg((nam+"Tubs").c_str(), rmin, rmax, dZ, startPhi, deltaPhi);
+ TGeoTubeSeg* tubs = new TGeoTubeSeg((nam+"Tubs").c_str(), rmin, rmax, dz, startPhi, deltaPhi);
TGeoCombiTrans* combi = new TGeoCombiTrans(trans, rot);
TGeoSubtraction* sub = new TGeoSubtraction(tubs, box, nullptr, combi);
_assign(new TGeoCompositeShape(nam.c_str(), sub),"",TRUNCATEDTUBE_TAG,true);
stringstream params;
- params << dZ << " " << endl
+ params << dz << " " << endl
<< rmin << " " << endl
<< rmax << " " << endl
<< startPhi*units::deg << " " << endl
@@ -394,7 +394,7 @@ void TruncatedTube::make(const string& nam,
//cout << "Params: " << params.str() << endl;
#if 0
params << TRUNCATEDTUBE_TAG << ":" << endl
- << "\t dZ: " << dZ << " " << endl
+ << "\t dz: " << dz << " " << endl
<< "\t rmin: " << rmin << " " << endl
<< "\t rmax: " << rmax << " " << endl
<< "\t startPhi: " << startPhi << " " << endl
@@ -410,7 +410,7 @@ void TruncatedTube::make(const string& nam,
#if 0
cout << "Trans:"; trans.Print(); cout << endl;
cout << "Rot: "; rot.Print(); cout << endl;
- cout << " dZ: " << dZ
+ cout << " Dz: " << dz
<< " rmin: " << rmin
<< " rmax: " << rmax
<< " r/cutAtStart: " << r
diff --git a/DDCore/src/plugins/ShapePlugins.cpp b/DDCore/src/plugins/ShapePlugins.cpp
index 8bc858d439ae6b94c8a284365f0aa9a9b48bf866..0bb0878b4eea69e8412e60fe7b11e9a06fa77c8c 100644
--- a/DDCore/src/plugins/ShapePlugins.cpp
+++ b/DDCore/src/plugins/ShapePlugins.cpp
@@ -151,7 +151,7 @@ DECLARE_XML_SHAPE(EllipticalTube__shape_constructor,create_EllipticalTube)
static Handle<TObject> create_TruncatedTube(Detector&, xml_h element) {
xml_dim_t e(element);
double sp = e.startphi(0.0), dp = e.deltaphi(2*M_PI);
- Solid solid = TruncatedTube(e.zhalf(), e.rmin(0.0), e.rmax(), sp, dp,
+ Solid solid = TruncatedTube(e.dz(), e.rmin(0.0), e.rmax(), sp, dp,
e.attr<double>(xml_tag_t("cutAtStart")),
e.attr<double>(xml_tag_t("cutAtDelta")),
e.attr<bool>(xml_tag_t("cutInside")));
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 221f053fb050656f3667be256b6e3c3cee393646..8fe7bb16530909d40c821f4276a2938890833c49 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -41,10 +41,15 @@ dd4hep_configure_output()
#==========================================================================
-SET(DD4HEP_EXAMPLES "AlignDet CLICSiD ClientTests Conditions DDCMS DDCodex DDDB DDDigi DDG4 DDG4_MySensDet LHeD OpticalSurfaces Persistency DDCAD SimpleDetector"
+SET(DD4HEP_EXAMPLES "AlignDet CLICSiD ClientTests Conditions DDCMS DDCodex DDDigi DDG4 DDG4_MySensDet LHeD OpticalSurfaces Persistency DDCAD SimpleDetector"
CACHE STRING "List of DD4hep Examples to build")
SEPARATE_ARGUMENTS(DD4HEP_EXAMPLES)
+IF(DD4HEP_BUILD_DEBUG)
+ SET(DD4HEP_EXAMPLES "${DD4HEP_EXAMPLES} DDDB"
+ CACHE STRING "List of DD4hep Examples to build")
+ENDIF()
+
FOREACH(DDExample IN LISTS DD4HEP_EXAMPLES)
dd4hep_print("|> Building ${DDExample}")
add_subdirectory(${DDExample})
diff --git a/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml b/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
index d7f3baa6ecdd8f3c5c59a159de47c70ce2793b30..bd09097d1c779c0d69c55d3f929f68f5e8815a62 100644
--- a/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
+++ b/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
@@ -6,19 +6,19 @@
<detectors>
<detector id="1" name="Shape_TruncatedTube" type="DD4hep_TestShape_Creator">
<check vis="Shape1_vis">
- <shape type="TruncatedTube" zhalf="50*cm" rmin="20*cm" rmax="40*cm"
+ <shape type="TruncatedTube" dz="50*cm" rmin="20*cm" rmax="40*cm"
startphi="0*deg" deltaphi="90*deg"
cutAtStart="25*cm" cutAtDelta="35*cm" cutInside="true"/>
<position x="0*cm" y="0*cm" z="100*cm"/>
</check>
<check vis="Shape1_vis">
- <shape type="TruncatedTube" zhalf="50*cm" rmin="20*cm" rmax="40*cm"
+ <shape type="TruncatedTube" dz="50*cm" rmin="20*cm" rmax="40*cm"
startphi="0*deg" deltaphi="90*deg"
cutAtStart="25*cm" cutAtDelta="35*cm" cutInside="false"/>
<position x="0*cm" y="0*cm" z="-100*cm"/>
</check>
<check vis="Shape2_vis">
- <shape type="TruncatedTube" zhalf="50*cm" rmin="20*cm" rmax="40*cm"
+ <shape type="TruncatedTube" dz="50*cm" rmin="20*cm" rmax="40*cm"
startphi="0*deg" deltaphi="45*deg"
cutAtStart="20*cm" cutAtDelta="30*cm" cutInside="true"/>
<position x="0*cm" y="150*cm" z="-100*cm"/>
@@ -26,27 +26,27 @@
<!-- This one for one reason or another creates a slightly different mesh on MAC than on linux
(two mesh points more, the others identical). Lets remove this test.
<check vis="Shape3_vis">
- <shape type="TruncatedTube" zhalf="50*cm" rmin="20*cm" rmax="40*cm"
+ <shape type="TruncatedTube" dz="50*cm" rmin="20*cm" rmax="40*cm"
startphi="0*deg" deltaphi="150*deg"
cutAtStart="20*cm" cutAtDelta="35*cm" cutInside="true"/>
<position x="90*cm" y="150*cm" z="100*cm"/>
</check>
-->
<!--
- <TruncTubs name="trunctubs2" rMin="6.9551*m" rMax="9*m" cutAtStart="6.9551*m" cutAtDelta="7.20045*m" cutInside="true" startPhi="0*deg" deltaPhi="15*deg" zHalf="6.57005*m"/>
+ <TruncTubs name="trunctubs2" rMin="6.9551*m" rMax="9*m" cutAtStart="6.9551*m" cutAtDelta="7.20045*m" cutInside="true" startPhi="0*deg" deltaPhi="15*deg" dz="6.57005*m"/>
<position z="-28.9*m" y="5.9*m" x="0."/>
-->
<!--
<check vis="Shape1_vis">
- <shape type="TruncatedTube" zhalf="6.57005*m" rmin="6.9551*m" rmax="9*m"
+ <shape type="TruncatedTube" dz="6.57005*m" rmin="6.9551*m" rmax="9*m"
startphi="0*deg" deltaphi="15*deg"
cutAtStart="6.9551*m" cutAtDelta="7.20045*m" cutInside="true"/>
</check>
-->
<!--
<check vis="Shape2_vis">
- <shape type="TruncatedTube" zhalf="50*cm" rmin="20*cm" rmax="40*cm"
+ <shape type="TruncatedTube" dz="50*cm" rmin="20*cm" rmax="40*cm"
startphi="0*rad" deltaphi="pi/2*rad"
cutAtStart="25*cm" cutAtDelta="35*cm" cutInside="0"/>
<position x="0*cm" y="90*cm" z="0*cm"/>
diff --git a/examples/DDDB/src/plugins/DDDBConditionsLoader.cpp b/examples/DDDB/src/plugins/DDDBConditionsLoader.cpp
index 8c9ea5cbed9189543fdca42d919e01eaeef90c08..81fd577ac345627ba66043b921dd6f9dbda17f46 100644
--- a/examples/DDDB/src/plugins/DDDBConditionsLoader.cpp
+++ b/examples/DDDB/src/plugins/DDDBConditionsLoader.cpp
@@ -82,12 +82,12 @@ namespace {
if ( i != rc.end() ) {
(*i) = cond;
printout(DEBUG,"DDDB","++ Got MATCH: %-40s [%16llX] --> %s.",
- c->name.c_str(), c->hash, c->address.c_str());
+ cond.name(), cond.key(), c->address.c_str());
iov.iov_intersection(*c->iov);
return;
}
printout(INFO,"DDDB","++ Got update: %-40s [%16llX] --> %s.",
- c->name.c_str(), c->hash, c->address.c_str());
+ cond.name(), cond.key(), c->address.c_str());
}
else if ( cmd == INSERT ) {
iov.iov_intersection(*c->iov);
diff --git a/examples/DDDB/src/plugins/DDDBDetectorDumps.cpp b/examples/DDDB/src/plugins/DDDBDetectorDumps.cpp
index 4c27ef7b224a1e4918181c09101de25c85a84221..a2ed647cc878ccf918d0b987def20a9d26f93af6 100644
--- a/examples/DDDB/src/plugins/DDDBDetectorDumps.cpp
+++ b/examples/DDDB/src/plugins/DDDBDetectorDumps.cpp
@@ -268,7 +268,7 @@ namespace {
::sprintf(fmt,"%03d %%-%ds Key: %%16llX -> %%s # %%s",level+1,2*level+3);
for(const auto cond : conditions ) {
if ( with_keys ) {
- printout(s_PrintLevel,m_detElementPrinter.name,fmt,"",cond->hash, de.path().c_str(), cond->name.c_str());
+ printout(s_PrintLevel,m_detElementPrinter.name,fmt,"",cond.key(), de.path().c_str(), cond.name());
}
if ( with_values ) {
m_detElementPrinter(cond);