Skip to content
Snippets Groups Projects
Commit 98e50bdc authored by Markus Frank's avatar Markus Frank
Browse files

Allow properties to be externalized to other projects

parent 6a493412
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 175 additions and 135 deletions
DDCore/include/DD4hep/objects/BasicGrammar_inl.h → DDCore/include/DD4hep/BasicGrammar_inl.h
+ 5
− 2
View file @ 98e50bdc
......@@ -26,17 +26,20 @@
#include "DD4hep/Primitives.h"
#include "DD4hep/BasicGrammar.h"
#include "XML/Evaluator.h"
#ifdef DD4HEP_USE_BOOST
#include "DD4hep/Parsers.h"
#include "DD4hep/ToStream.h"
#include "XML/Evaluator.h"
namespace DD4hep { XmlTools::Evaluator& g4Evaluator(); }
namespace { static XmlTools::Evaluator& s__eval(DD4hep::g4Evaluator()); }
#endif
namespace { static XmlTools::Evaluator& s__eval(DD4hep::g4Evaluator()); }
#ifndef DD4HEP_PARSERS_NO_ROOT
#include "Math/Point3D.h"
#include "Math/Vector3D.h"
#include "Math/Vector4D.h"
#endif
// C/C++ include files
#include <string>
......
DDCore/include/DD4hep/ComponentProperties.h
+ 0
− 2
View file @ 98e50bdc
......@@ -16,8 +16,6 @@
#define DD4HEP_DDG4_COMPONENTPROPERTIES_H
// Framework include files
//#include "DD4hep/Primitives.h"
//#include "DD4hep/Exceptions.h"
// C/C++ include files
#include <algorithm>
......
DDCore/src/AlignmentData.cpp
+ 1
− 1
View file @ 98e50bdc
......@@ -206,6 +206,6 @@ Alignment AlignmentData::nominal() const {
DD4HEP_DEFINE_CONDITIONS_TYPE_DUMMY(Delta)
DD4HEP_DEFINE_CONDITIONS_TYPE_DUMMY(AlignmentData)
#include "DD4hep/objects/BasicGrammar_inl.h"
#include "DD4hep/BasicGrammar_inl.h"
DD4HEP_DEFINE_PARSER_GRAMMAR(Delta,eval_none<Delta>)
DD4HEP_DEFINE_PARSER_GRAMMAR(AlignmentData,eval_none<AlignmentData>)
DDCore/src/BasicGrammarTypes.cpp
+ 7
− 5
View file @ 98e50bdc
......@@ -13,7 +13,9 @@
//==========================================================================
// Framework include files
#include "DD4hep/objects/BasicGrammar_inl.h"
#include "DD4hep/BasicGrammar_inl.h"
#ifndef DD4HEP_PARSERS_NO_ROOT
namespace ROOT {
namespace Math {
......@@ -41,6 +43,10 @@ namespace ROOT {
template struct std::less<ROOT::Math::XYZPoint>;
template struct std::less<ROOT::Math::XYZVector>;
template struct std::less<ROOT::Math::PxPyPzEVector>;
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::XYZPoint,eval_obj)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::XYZVector,eval_obj)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::PxPyPzEVector,eval_obj)
#endif
#if defined(DD4HEP_HAVE_ALL_PARSERS)
DD4HEP_DEFINE_PARSER_GRAMMAR_U_CONT(char)
......@@ -54,7 +60,3 @@ DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(bool,eval_item)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(float,eval_item)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(double,eval_item)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(std::string,eval_item)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::XYZPoint,eval_obj)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::XYZVector,eval_obj)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::PxPyPzEVector,eval_obj)
DDCore/src/ComponentProperties.cpp
+ 1
− 1
View file @ 98e50bdc
......@@ -257,7 +257,7 @@ namespace DD4hep {
#include "Math/Vector3D.h"
#include "Math/Vector4D.h"
#include "DD4hep/objects/BasicGrammar_inl.h"
#include "DD4hep/BasicGrammar_inl.h"
#include "DD4hep/ComponentProperties_inl.h"
DD4HEP_DEFINE_PARSER_GRAMMAR_TYPE(Property)
......
DDCore/src/ConditionsData.cpp
+ 1
− 1
View file @ 98e50bdc
......@@ -74,6 +74,6 @@ AbstractMap& AbstractMap::operator=(const AbstractMap& c) {
#include "DD4hep/objects/ConditionsInterna.h"
DD4HEP_DEFINE_CONDITIONS_TYPE_DUMMY(AbstractMap)
#include "DD4hep/objects/BasicGrammar_inl.h"
#include "DD4hep/BasicGrammar_inl.h"
DD4HEP_DEFINE_PARSER_GRAMMAR(AbstractMap,eval_none<AbstractMap>)
DDCore/src/ObjectPrintout.cpp 0 → 100644
+ 142
− 0
View file @ 98e50bdc
// $Id: $
//==========================================================================
// 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/LCDD.h"
#include "DD4hep/Objects.h"
#include "DD4hep/Conditions.h"
#include "DD4hep/objects/ObjectsInterna.h"
#include "DD4hep/Printout.h"
// C/C++ include files
#include <cstdarg>
#include <stdexcept>
using namespace std;
#include "TMap.h"
#include "TROOT.h"
#include "TColor.h"
using namespace std;
namespace DD4hep {
using namespace Geometry;
using Conditions::Condition;
template <typename T> void PrintMap<T>::operator()() const {
Printer < T > p(lcdd, os);
os << "++" << endl << "++ " << text << endl << "++" << endl;
for (LCDD::HandleMap::const_iterator i = cont.begin(); i != cont.end(); ++i)
p((*i).second);
}
template <> void Printer<Handle<NamedObject> >::operator()(const Handle<NamedObject>& val) const {
printout(INFO, "Printer", "++ %s Handle:%s %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<Handle<TNamed> >::operator()(const Handle<TNamed>& val) const {
printout(INFO, "Printer", "++ %s Handle:%s %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<Constant>::operator()(const Constant& val) const {
printout(INFO, "Printer", "++ %s Constant:%s %s", prefix.c_str(), val->GetName(), val.toString().c_str());
}
template <> void Printer<Material>::operator()(const Material& val) const {
printout(INFO, "Printer", "++ %s Material:%s %s", prefix.c_str(), val->GetName(), val.toString().c_str());
}
template <> void Printer<VisAttr>::operator()(const VisAttr& val) const {
printout(INFO, "Printer", "++ %s VisAttr: %s", prefix.c_str(), val.toString().c_str());
}
template <> void Printer<Readout>::operator()(const Readout& val) const {
printout(INFO, "Printer", "++ %s Readout: %s of type %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<Region>::operator()(const Region& val) const {
printout(INFO, "Printer", "++ %s Region: %s of type %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<RotationZYX>::operator()(const RotationZYX& val) const {
printout(INFO, "Printer", "++ %s ZYXRotation: phi: %7.3 rad theta: %7.3 rad psi: %7.3 rad", prefix.c_str(), val.Phi(),
val.Theta(), val.Psi());
}
template <> void Printer<Position>::operator()(const Position& val) const {
printout(INFO, "Printer", "++ %s Position: x: %9.3 mm y: %9.3 mm z: %9.3 mm", prefix.c_str(), val.X(), val.Y(), val.Z());
}
template <> void Printer<Condition>::operator()(const Condition& val) const {
int flg = Condition::WITH_IOV|Condition::WITH_ADDRESS;
printout(INFO, "Printer", "++ %s %s", prefix.c_str(), val.str(flg).c_str());
}
#if 0
template <> void Printer<LimitSet>::operator()(const LimitSet& val) const {
const set<Limit>& o = val.limits();
printout(INFO, "Printer", "++ %s LimitSet: %s", prefix.c_str(), val.name());
val->TNamed::Print();
for (set<Limit>::const_iterator i = o.begin(); i != o.end(); ++i) {
os << "++ Limit:" << (*i).name << " " << (*i).particles << " [" << (*i).unit << "] " << (*i).content << " "
<< (*i).value << endl;
}
}
template <> void Printer<DetElement>::operator()(const DetElement& val) const {
DetElement::Object* obj = val.data<DetElement::Object>();
if (obj) {
char text[256];
const DetElement& sd = val;
PlacedVolume plc = sd.placement();
bool vis = plc.isValid();
bool env = plc.isValid();
bool mat = plc.isValid();
::snprintf(text, sizeof(text), "ID:%-3d Combine Hits:%3s Material:%s Envelope:%s VisAttr:%s", sd.id(),
yes_no(sd.combineHits()), mat ? plc.material().name() : yes_no(mat),
env ? plc.motherVol()->GetName() : yes_no(env), yes_no(vis));
os << prefix << "+= DetElement: " << val.name() << " " << val.type() << endl;
os << prefix << "| " << text << endl;
if (vis) {
VisAttr attr = plc.volume().visAttributes();
VisAttr::Object* v = attr.data<VisAttr::Object>();
TColor* col = gROOT->GetColor(v->color);
char text[256];
::snprintf(text, sizeof(text), " RGB:%-8s [%d] %7.2f Style:%d %d ShowDaughters:%3s Visible:%3s", col->AsHexString(),
v->color, col->GetAlpha(), int(v->drawingStyle),
int(v->lineStyle), yes_no(v->showDaughters),
yes_no(v->visible));
os << prefix << "| VisAttr: " << setw(32) << left << attr.name() << text << endl;
}
if (plc.isValid()) {
Volume vol = plc.volume();
Solid s = vol.solid();
Material m = vol.material();
::snprintf(text, sizeof(text), "Volume:%s Shape:%s Material:%s", vol->GetName(), s.isValid() ? s.name() : "Unknonw",
m.isValid() ? m->GetName() : "Unknown");
os << prefix << "+------------- " << text << endl;
}
const DetElement::Children& ch = sd.children();
for (DetElement::Children::const_iterator i = ch.begin(); i != ch.end(); ++i)
Printer < DetElement > (lcdd, os, prefix + "| ")((*i).second);
return;
}
}
#endif
template <> void Printer<const LCDD*>::operator()(const LCDD* const &) const {
//Header(lcdd.header()).fromCompact(doc,compact.child(Tag_info),Strng_t("In memory"));
PrintMap < Constant > (lcdd, os, lcdd->constants(), "List of Constants")();
//PrintMap < VisAttr > (lcdd, os, lcdd->visAttributes(), "List of Visualization attributes")();
//PrintMap < LimitSet > (lcdd, os, lcdd->readouts(), "List of Readouts")();
//PrintMap < Region > (lcdd, os, lcdd->regions(), "List of Regions")();
//PrintMap < DetElement > (lcdd, os, lcdd->detectors(), "List of DetElements")();
}
}
DDCore/src/Printout.cpp
+ 0
− 120
View file @ 98e50bdc
......@@ -13,9 +13,6 @@
//==========================================================================
// Framework include files
#include "DD4hep/LCDD.h"
#include "DD4hep/Objects.h"
#include "DD4hep/objects/ObjectsInterna.h"
#include "DD4hep/Printout.h"
// C/C++ include files
......@@ -300,120 +297,3 @@ void DD4hep::setPrinter(void* arg, output_function_t fcn) {
print_arg = arg;
print_func = fcn;
}
#include "DD4hep/Conditions.h"
#include "TMap.h"
#include "TROOT.h"
#include "TColor.h"
using namespace std;
namespace DD4hep {
using namespace Geometry;
using Conditions::Condition;
template <typename T> void PrintMap<T>::operator()() const {
Printer < T > p(lcdd, os);
os << "++" << endl << "++ " << text << endl << "++" << endl;
for (LCDD::HandleMap::const_iterator i = cont.begin(); i != cont.end(); ++i)
p((*i).second);
}
template <> void Printer<Handle<NamedObject> >::operator()(const Handle<NamedObject>& val) const {
printout(INFO, "Printer", "++ %s Handle:%s %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<Handle<TNamed> >::operator()(const Handle<TNamed>& val) const {
printout(INFO, "Printer", "++ %s Handle:%s %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<Constant>::operator()(const Constant& val) const {
printout(INFO, "Printer", "++ %s Constant:%s %s", prefix.c_str(), val->GetName(), val.toString().c_str());
}
template <> void Printer<Material>::operator()(const Material& val) const {
printout(INFO, "Printer", "++ %s Material:%s %s", prefix.c_str(), val->GetName(), val.toString().c_str());
}
template <> void Printer<VisAttr>::operator()(const VisAttr& val) const {
printout(INFO, "Printer", "++ %s VisAttr: %s", prefix.c_str(), val.toString().c_str());
}
template <> void Printer<Readout>::operator()(const Readout& val) const {
printout(INFO, "Printer", "++ %s Readout: %s of type %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<Region>::operator()(const Region& val) const {
printout(INFO, "Printer", "++ %s Region: %s of type %s", prefix.c_str(), val->GetName(), val->GetTitle());
}
template <> void Printer<RotationZYX>::operator()(const RotationZYX& val) const {
printout(INFO, "Printer", "++ %s ZYXRotation: phi: %7.3 rad theta: %7.3 rad psi: %7.3 rad", prefix.c_str(), val.Phi(),
val.Theta(), val.Psi());
}
template <> void Printer<Position>::operator()(const Position& val) const {
printout(INFO, "Printer", "++ %s Position: x: %9.3 mm y: %9.3 mm z: %9.3 mm", prefix.c_str(), val.X(), val.Y(), val.Z());
}
template <> void Printer<Condition>::operator()(const Condition& val) const {
int flg = Condition::WITH_IOV|Condition::WITH_ADDRESS;
printout(INFO, "Printer", "++ %s %s", prefix.c_str(), val.str(flg).c_str());
}
#if 0
template <> void Printer<LimitSet>::operator()(const LimitSet& val) const {
const set<Limit>& o = val.limits();
printout(INFO, "Printer", "++ %s LimitSet: %s", prefix.c_str(), val.name());
val->TNamed::Print();
for (set<Limit>::const_iterator i = o.begin(); i != o.end(); ++i) {
os << "++ Limit:" << (*i).name << " " << (*i).particles << " [" << (*i).unit << "] " << (*i).content << " "
<< (*i).value << endl;
}
}
template <> void Printer<DetElement>::operator()(const DetElement& val) const {
DetElement::Object* obj = val.data<DetElement::Object>();
if (obj) {
char text[256];
const DetElement& sd = val;
PlacedVolume plc = sd.placement();
bool vis = plc.isValid();
bool env = plc.isValid();
bool mat = plc.isValid();
::snprintf(text, sizeof(text), "ID:%-3d Combine Hits:%3s Material:%s Envelope:%s VisAttr:%s", sd.id(),
yes_no(sd.combineHits()), mat ? plc.material().name() : yes_no(mat),
env ? plc.motherVol()->GetName() : yes_no(env), yes_no(vis));
os << prefix << "+= DetElement: " << val.name() << " " << val.type() << endl;
os << prefix << "| " << text << endl;
if (vis) {
VisAttr attr = plc.volume().visAttributes();
VisAttr::Object* v = attr.data<VisAttr::Object>();
TColor* col = gROOT->GetColor(v->color);
char text[256];
::snprintf(text, sizeof(text), " RGB:%-8s [%d] %7.2f Style:%d %d ShowDaughters:%3s Visible:%3s", col->AsHexString(),
v->color, col->GetAlpha(), int(v->drawingStyle),
int(v->lineStyle), yes_no(v->showDaughters),
yes_no(v->visible));
os << prefix << "| VisAttr: " << setw(32) << left << attr.name() << text << endl;
}
if (plc.isValid()) {
Volume vol = plc.volume();
Solid s = vol.solid();
Material m = vol.material();
::snprintf(text, sizeof(text), "Volume:%s Shape:%s Material:%s", vol->GetName(), s.isValid() ? s.name() : "Unknonw",
m.isValid() ? m->GetName() : "Unknown");
os << prefix << "+------------- " << text << endl;
}
const DetElement::Children& ch = sd.children();
for (DetElement::Children::const_iterator i = ch.begin(); i != ch.end(); ++i)
Printer < DetElement > (lcdd, os, prefix + "| ")((*i).second);
return;
}
}
#endif
template <> void Printer<const LCDD*>::operator()(const LCDD* const &) const {
//Header(lcdd.header()).fromCompact(doc,compact.child(Tag_info),Strng_t("In memory"));
PrintMap < Constant > (lcdd, os, lcdd->constants(), "List of Constants")();
//PrintMap < VisAttr > (lcdd, os, lcdd->visAttributes(), "List of Visualization attributes")();
//PrintMap < LimitSet > (lcdd, os, lcdd->readouts(), "List of Readouts")();
//PrintMap < Region > (lcdd, os, lcdd->regions(), "List of Regions")();
//PrintMap < DetElement > (lcdd, os, lcdd->detectors(), "List of DetElements")();
}
}
DDCore/src/ToStream.cpp
+ 13
− 0
View file @ 98e50bdc
......@@ -13,7 +13,17 @@
//==========================================================================
// Framework include files
#if defined(DD4HEP_PARSER_HEADER)
// This is the case, if the parsers are externalized
// and the DD4hep namespace is renamed!
#include DD4HEP_PARSER_HEADER
#else
// Standard DD4hep parser handling
#include "DD4hep/ToStream.h"
#endif
#include "XML/Evaluator.h"
// C/C++ include files
......@@ -53,6 +63,8 @@ namespace DD4hep { namespace Parsers {
}
}
#ifndef DD4HEP_PARSERS_NO_ROOT
// ============================================================================
// print XYZ-point
std::ostream& DD4hep::Utils::toStream(const ROOT::Math::XYZPoint& obj, std::ostream& s) {
......@@ -91,3 +103,4 @@ std::ostream& DD4hep::Utils::toStream(const ROOT::Math::PxPyPzEVector& obj, std:
s << " )";
return s;
}
#endif
DDCore/src/parsers/UsedParser.h
+ 5
− 3
View file @ 98e50bdc
......@@ -13,12 +13,14 @@
#define DD4HEP_DDCORE_PARSERS_USEDPARSERS_H
#if defined(DD4hep)
#include "Parsers/UsedParser.h"
#if defined(DD4HEP_PARSER_HEADER)
// This is the case, if the parsers are externalized
// and the DD4hep namespace is renamed!
#include DD4HEP_PARSER_HEADER
#else
// Standard DD4hep parser handling
#include "DD4hep/Parsers.h"
#include "DD4hep/ToStream.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment