diff --git a/DDCore/include/DD4hep/Plugins_ROOT6.inl b/DDCore/include/DD4hep/Plugins_ROOT6.inl
index ceaa48928811256c388941724949b675f24bdd5f..054febc81ab1384d5a998617e0cc9b376579f551 100644
--- a/DDCore/include/DD4hep/Plugins_ROOT6.inl
+++ b/DDCore/include/DD4hep/Plugins_ROOT6.inl
@@ -110,6 +110,11 @@ namespace DD4hep {
template <typename SIGNATURE> static void reflex_plugin(const std::string& name, DD4hep::PluginService::stub_t /* stub */) {
if ( PluginService::debug() ) {
std::string sig_name = "?????";
+/*
+ sig_name = "long (*)(const char*, Object*)";
+ plugin->register(name, sig_name, stub);
+DD4hep::PluginService::Create<R>(name,a0,a1);
+*/
printout(INFO,"PluginService","+++ Declared factory for id %s with signature %s.",name.c_str(),sig_name.c_str());
}
}
@@ -119,9 +124,9 @@ namespace DD4hep {
-#define DD4HEP_IMPLEMENT_PLUGIN_REGISTRY(R, ARGS) namespace DD4hep { \
+#define DD4HEP_IMPLEMENT_PLUGIN_REGISTRY(R, ARGS) namespace DD4hep { \
template <> void PluginRegistry< R ARGS >::add(const char* n, DD4hep::PluginService::stub_t f) \
- { plugin_signatures_namespace::reflex_plugin< R ARGS >(n,f); } \
+ { plugin_signatures_namespace::reflex_plugin< R ARGS >(n,f); } \
namespace plugin_signatures_namespace { template void* instantiate_creator<R> ARGS ; }}
#endif // DD4HEP_PLUGINS_ROOT6_INL
diff --git a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
index 2db0c23b4955ad88397e00edbb7573ab091ea64e..d73aa130877704cf4564e66d9655f93c86279af4 100644
--- a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
+++ b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
@@ -82,15 +82,15 @@ namespace DD4hep {
}
/// PropertyGrammar overload: Retrieve value from string
- template <typename TYPE> bool Grammar<TYPE>::fromString(void* ptr, const std::string& str) const {
+ template <typename TYPE> bool Grammar<TYPE>::fromString(void* ptr, const std::string& string_val) const {
int sc = 0;
TYPE temp;
#ifdef DD4HEP_USE_BOOST
- sc = Parsers::parse(temp,str);
+ sc = Parsers::parse(temp,string_val);
#endif
- if ( !sc ) sc = evaluate(&temp,str);
+ if ( !sc ) sc = evaluate(&temp,string_val);
#if 0
- std::cout << "Sc=" << sc << " Converting value: " << str
+ std::cout << "Sc=" << sc << " Converting value: " << string_val
<< " to type " << typeid(TYPE).name()
<< std::endl;
#endif
@@ -103,7 +103,7 @@ namespace DD4hep {
"To enable elaborated property handling set DD4HEP_USE_BOOST=ON\n"
"and BOOST_INCLUDE_DIR=<boost include path>");
#else
- BasicGrammar::invalidConversion(str, typeid(TYPE));
+ BasicGrammar::invalidConversion(string_val, typeid(TYPE));
return false;
#endif
}
diff --git a/DDCore/src/Detector.cpp b/DDCore/src/Detector.cpp
index c58fef96505859995f17e72da786fc381f6f6290..4fbd9bdca503f1094abc8b51664147285f244f90 100644
--- a/DDCore/src/Detector.cpp
+++ b/DDCore/src/Detector.cpp
@@ -16,33 +16,33 @@ using namespace std;
using namespace DD4hep::Geometry;
/// Clone constructor
-DetElement::DetElement(Object* data, const string& name, const string& type)
- : RefObject(data) {
- this->assign(data, name, type);
+DetElement::DetElement(Object* det_data, const string& det_name, const string& det_type)
+ : RefObject(det_data) {
+ this->assign(det_data, det_name, det_type);
}
/// Constructor for a new subdetector element
-DetElement::DetElement(const string& name, const string& type, int id) {
- assign(new Object(name,id), name, type);
- ptr()->id = id;
+DetElement::DetElement(const string& det_name, const string& det_type, int det_id) {
+ assign(new Object(det_name,det_id), det_name, det_type);
+ ptr()->id = det_id;
}
/// Constructor for a new subdetector element
-DetElement::DetElement(const string& name, int id) {
- assign(new Object(name,id), name, "");
- ptr()->id = id;
+DetElement::DetElement(const string& det_name, int det_id) {
+ assign(new Object(det_name,det_id), det_name, "");
+ ptr()->id = det_id;
}
/// Constructor for a new subdetector element
-DetElement::DetElement(DetElement parent, const string& name, int id) {
- assign(new Object(name,id), name, parent.type());
- ptr()->id = id;
- parent.add(*this);
+DetElement::DetElement(DetElement det_parent, const string& det_name, int det_id) {
+ assign(new Object(det_name,det_id), det_name, det_parent.type());
+ ptr()->id = det_id;
+ det_parent.add(*this);
}
/// Add an extension object to the detector element
-void* DetElement::i_addExtension(void* ptr, const type_info& info, copy_t ctor, destruct_t dtor) const {
- return access()->addExtension(ptr, info, ObjectExtensions::copy_t(ctor), dtor);
+void* DetElement::i_addExtension(void* ext_ptr, const type_info& info, copy_t ctor, destruct_t dtor) const {
+ return access()->addExtension(ext_ptr, info, ObjectExtensions::copy_t(ctor), dtor);
}
/// Access an existing extension object from the detector element
@@ -56,8 +56,8 @@ void DetElement::i_addUpdateCall(unsigned int callback_type, const Callback& cal
}
/// Remove callback from object
-void DetElement::removeAtUpdate(unsigned int type, void* pointer) const {
- access()->removeAtUpdate(type,pointer);
+void DetElement::removeAtUpdate(unsigned int typ, void* pointer) const {
+ access()->removeAtUpdate(typ,pointer);
}
/// Access to the full path to the placed object
@@ -131,10 +131,10 @@ const DetElement::Children& DetElement::children() const {
}
/// Access to individual children by name
-DetElement DetElement::child(const string& name) const {
+DetElement DetElement::child(const string& child_name) const {
if (isValid()) {
const Children& c = ptr()->children;
- Children::const_iterator i = c.find(name);
+ Children::const_iterator i = c.find(child_name);
return i == c.end() ? DetElement() : (*i).second;
}
return DetElement();
@@ -186,12 +186,12 @@ PlacedVolume DetElement::placement() const {
}
/// Set the physical volumes of the detector element
-DetElement& DetElement::setPlacement(const PlacedVolume& placement) {
- if (placement.isValid()) {
+DetElement& DetElement::setPlacement(const PlacedVolume& pv) {
+ if (pv.isValid()) {
Object* o = access();
- o->placement = placement;
+ o->placement = pv;
if ( !o->idealPlace.isValid() ) {
- o->idealPlace = placement;
+ o->idealPlace = pv;
}
return *this;
}
@@ -211,28 +211,28 @@ Volume DetElement::volume() const {
return access()->placement.volume();
}
-DetElement& DetElement::setVisAttributes(const LCDD& lcdd, const string& name, const Volume& volume) {
- volume.setVisAttributes(lcdd, name);
+DetElement& DetElement::setVisAttributes(const LCDD& lcdd, const string& nam, const Volume& vol) {
+ vol.setVisAttributes(lcdd, nam);
return *this;
}
-DetElement& DetElement::setRegion(const LCDD& lcdd, const string& name, const Volume& volume) {
- if (!name.empty()) {
- volume.setRegion(lcdd.region(name));
+DetElement& DetElement::setRegion(const LCDD& lcdd, const string& nam, const Volume& vol) {
+ if (!nam.empty()) {
+ vol.setRegion(lcdd.region(nam));
}
return *this;
}
-DetElement& DetElement::setLimitSet(const LCDD& lcdd, const string& name, const Volume& volume) {
- if (!name.empty()) {
- volume.setLimitSet(lcdd.limitSet(name));
+DetElement& DetElement::setLimitSet(const LCDD& lcdd, const string& nam, const Volume& vol) {
+ if (!nam.empty()) {
+ vol.setLimitSet(lcdd.limitSet(nam));
}
return *this;
}
-DetElement& DetElement::setAttributes(const LCDD& lcdd, const Volume& volume, const string& region, const string& limits,
+DetElement& DetElement::setAttributes(const LCDD& lcdd, const Volume& vol, const string& region, const string& limits,
const string& vis) {
- return setRegion(lcdd, region, volume).setLimitSet(lcdd, limits, volume).setVisAttributes(lcdd, vis, volume);
+ return setRegion(lcdd, region, vol).setLimitSet(lcdd, limits, vol).setVisAttributes(lcdd, vis, vol);
}
/// Set detector element for reference transformations. Will delete existing reference trafo.
@@ -316,14 +316,14 @@ bool DetElement::referenceToLocal(const Position& global, Position& local) const
}
/// Constructor
-SensitiveDetector::SensitiveDetector(const string& name, const string& type) {
+SensitiveDetector::SensitiveDetector(const string& nam, const string& typ) {
/*
<calorimeter ecut="0" eunit="MeV" hits_collection="EcalEndcapHits" name="EcalEndcap" verbose="0">
<global_grid_xy grid_size_x="3.5" grid_size_y="3.5"/>
<idspecref ref="EcalEndcapHits"/>
</calorimeter>
*/
- assign(new Object(name), name, type);
+ assign(new Object(nam), nam, typ);
object<Object>().ecut = 0e0;
object<Object>().verbose = 0;
}
@@ -408,8 +408,8 @@ Region SensitiveDetector::region() const {
}
/// Set the limits to the sensitive detector
-SensitiveDetector& SensitiveDetector::setLimitSet(LimitSet limits) {
- access()->limits = limits;
+SensitiveDetector& SensitiveDetector::setLimitSet(LimitSet ls) {
+ access()->limits = ls;
return *this;
}
@@ -419,8 +419,8 @@ LimitSet SensitiveDetector::limits() const {
}
/// Add an extension object to the detector element
-void* SensitiveDetector::i_addExtension(void* ptr, const type_info& info, destruct_t dtor) {
- return access()->addExtension(ptr, info, dtor);
+void* SensitiveDetector::i_addExtension(void* ext_ptr, const type_info& info, destruct_t dtor) {
+ return access()->addExtension(ext_ptr, info, dtor);
}
/// Access an existing extension object from the detector element
diff --git a/DDCore/src/DetectorInterna.cpp b/DDCore/src/DetectorInterna.cpp
index 8ae41b54dc753126517729af0c9020c1d3fd3fd3..839c511584b62c9506ca4318b265412d1804615f 100644
--- a/DDCore/src/DetectorInterna.cpp
+++ b/DDCore/src/DetectorInterna.cpp
@@ -90,7 +90,7 @@ DetElementObject::~DetElementObject() {
}
/// Deep object copy to replicate DetElement trees e.g. for reflection
-DetElementObject* DetElementObject::clone(int new_id, int flag) const {
+DetElementObject* DetElementObject::clone(int new_id, int flg) const {
DetElementObject* obj = new DetElementObject();
obj->id = new_id;
obj->flag = 0;
@@ -98,7 +98,7 @@ DetElementObject* DetElementObject::clone(int new_id, int flag) const {
obj->alignment = Alignment();
obj->conditions = Conditions();
obj->parent = DetElement();
- if ( (flag & DetElement::COPY_PLACEMENT) == DetElement::COPY_PLACEMENT ) {
+ if ( (flg & DetElement::COPY_PLACEMENT) == DetElement::COPY_PLACEMENT ) {
obj->placement = placement;
obj->idealPlace = idealPlace;
obj->placementPath = placementPath;
@@ -228,9 +228,9 @@ void DetElementObject::revalidate(TGeoHMatrix* parent_world_trafo) {
}
/// Remove callback from object
-void DetElementObject::removeAtUpdate(unsigned int type, void* pointer) {
+void DetElementObject::removeAtUpdate(unsigned int typ, void* pointer) {
for(UpdateCallbacks::iterator i=updateCalls.begin(); i != updateCalls.end(); ++i) {
- if ( (type&((*i).second)) == type && (*i).first.par == pointer ) {
+ if ( (typ&((*i).second)) == typ && (*i).first.par == pointer ) {
updateCalls.erase(i);
return;
}
diff --git a/DDCore/src/Fields.cpp b/DDCore/src/Fields.cpp
index cfbcf4c123c4de605dd2600a0f05c3bde4eb89e9..b06e71aeb8fcaad94a091002f878d4e237b12b30 100644
--- a/DDCore/src/Fields.cpp
+++ b/DDCore/src/Fields.cpp
@@ -80,9 +80,9 @@ OverlayedField::Object::~Object() {
}
/// Object constructor
-OverlayedField::OverlayedField(const string& name)
+OverlayedField::OverlayedField(const string& nam)
: Ref_t() {
- assign(new Object(), name, "overlay_field");
+ assign(new Object(), nam, "overlay_field");
}
/// Access to properties container
diff --git a/DDCore/src/GeoHandler.cpp b/DDCore/src/GeoHandler.cpp
index aa63582782287310a7a074983baf005f9bc554c3..918e8e55fd09cf0d6d1af4749739a6d1e04b0b39 100644
--- a/DDCore/src/GeoHandler.cpp
+++ b/DDCore/src/GeoHandler.cpp
@@ -80,8 +80,8 @@ GeoHandler& GeoHandler::collect(DetElement element, GeometryInfo& info) {
m_data->clear();
i_collect(element.placement().ptr(), 0, Region(), LimitSet());
for (Data::const_reverse_iterator i = m_data->rbegin(); i != m_data->rend(); ++i) {
- const Data::mapped_type& v = (*i).second;
- for (Data::mapped_type::const_iterator j = v.begin(); j != v.end(); ++j) {
+ const Data::mapped_type& mapped = (*i).second;
+ for (Data::mapped_type::const_iterator j = mapped.begin(); j != mapped.end(); ++j) {
const TGeoNode* n = *j;
TGeoVolume* v = n->GetVolume();
if (v) {
diff --git a/DDCore/src/IDDescriptor.cpp b/DDCore/src/IDDescriptor.cpp
index 67888bd7fff97d49fc07ec79898c3f1fbcde2247..f50dd726ec8d0441c9dbe5536f18a8e825aa5e3d 100644
--- a/DDCore/src/IDDescriptor.cpp
+++ b/DDCore/src/IDDescriptor.cpp
@@ -98,10 +98,10 @@ size_t IDDescriptor::fieldID(const string& field_name) const {
}
/// Encode a set of volume identifiers (corresponding to this description of course!) to a volumeID.
-VolumeID IDDescriptor::encode(const std::vector<VolID>& ids) const {
+VolumeID IDDescriptor::encode(const std::vector<VolID>& id_vector) const {
typedef std::vector<VolID> VolIds;
VolumeID id = 0;
- for (VolIds::const_iterator i = ids.begin(); i != ids.end(); ++i) {
+ for (VolIds::const_iterator i = id_vector.begin(); i != id_vector.end(); ++i) {
Field f = field((*i).first);
VolumeID vid = (*i).second;
vid = vid << f->offset();
@@ -111,12 +111,12 @@ VolumeID IDDescriptor::encode(const std::vector<VolID>& ids) const {
}
/// Decode volume IDs and return filled descriptor with all fields
-void IDDescriptor::decodeFields(VolumeID vid, VolIDFields& fields) {
- fields.clear();
+void IDDescriptor::decodeFields(VolumeID vid, VolIDFields& flds) {
+ flds.clear();
if (isValid()) {
const vector<BitFieldValue*>& v = ptr()->fields();
for (vector<BitFieldValue*>::const_iterator i = v.begin(); i != v.end(); ++i)
- fields.push_back(VolIDField(*i, (*i)->value(vid)));
+ flds.push_back(VolIDField(*i, (*i)->value(vid)));
return;
}
throw runtime_error("DD4hep: Attempt to access an invalid IDDescriptor object.");
diff --git a/DDCore/src/LCDDImp.cpp b/DDCore/src/LCDDImp.cpp
index 45b735ac2302ba5217922ad77470a79af37430b9..4209ff40cd91e8af751dfc5b3f2e675ec277624b 100644
--- a/DDCore/src/LCDDImp.cpp
+++ b/DDCore/src/LCDDImp.cpp
@@ -190,12 +190,12 @@ Volume LCDDImp::pickMotherVolume(const DetElement& de) const {
}
LCDD& LCDDImp::addDetector(const Ref_t& ref_det) {
- DetElement detector(ref_det);
+ DetElement det_element(ref_det);
m_detectors.append(ref_det);
- Volume volume = detector.placement()->GetMotherVolume();
+ Volume volume = det_element.placement()->GetMotherVolume();
if ( volume == m_worldVol ) {
- printout(DEBUG,"LCDD","Added detector %s to the world instance.",detector.name());
- m_world.add(detector);
+ printout(DEBUG,"LCDD","Added detector %s to the world instance.",det_element.name());
+ m_world.add(det_element);
return *this;
}
// The detector's placement must be one of the existing detectors
@@ -203,12 +203,12 @@ LCDD& LCDDImp::addDetector(const Ref_t& ref_det) {
DetElement parent((*i).second);
Volume vol = parent.placement().volume();
if ( vol == volume ) {
- printout(INFO,"LCDD","Added detector %s to the parent:%s.",detector.name(),parent.name());
- parent.add(detector);
+ printout(INFO,"LCDD","Added detector %s to the parent:%s.",det_element.name(),parent.name());
+ parent.add(det_element);
return *this;
}
}
- throw runtime_error("LCDD: The detector" + string(detector.name()) + " has no known parent.");
+ throw runtime_error("LCDD: The detector" + string(det_element.name()) + " has no known parent.");
}
/// Typed access to constants: access string values
@@ -277,17 +277,17 @@ namespace {
const GeoHandler::Data::mapped_type& v = (*i).second;
for (GeoHandler::Data::mapped_type::const_iterator j = v.begin(); j != v.end(); ++j) {
const TGeoNode* n = *j;
- TGeoVolume* v = n->GetVolume();
- TGeoShape* s = v->GetShape();
- const char* sn = s->GetName();
+ TGeoVolume* vol = n->GetVolume();
+ TGeoShape* s = vol->GetShape();
+ const char* sn = s->GetName();
::snprintf(text,sizeof(text),"_shape_%p",(void*)s);
if (0 == sn || 0 == ::strlen(sn)) {
- nam = v->GetName();
+ nam = vol->GetName();
nam += text;
s->SetName(nam.c_str());
}
else if (0 == ::strcmp(sn, s->IsA()->GetName())) {
- nam = v->GetName();
+ nam = vol->GetName();
nam += text;
s->SetName(nam.c_str());
}
@@ -357,9 +357,9 @@ void LCDDImp::init() {
m_materialAir = material("Air");
m_materialVacuum = material("Vacuum");
- Volume world("world_volume", worldSolid, m_materialAir);
+ Volume world_vol("world_volume", worldSolid, m_materialAir);
m_world = TopDetElement("world");
- m_worldVol = world;
+ m_worldVol = world_vol;
// Set the world volume to invisible.
VisAttr worldVis("WorldVis");
worldVis.setAlpha(1.0);
diff --git a/DDCore/src/Objects.cpp b/DDCore/src/Objects.cpp
index d4f457c1928959aa8170a08b4f36bec689555fcc..1762164479ba0ac11a12d5b213ba87d22e6cdfa9 100644
--- a/DDCore/src/Objects.cpp
+++ b/DDCore/src/Objects.cpp
@@ -56,9 +56,9 @@ void Author::setAuthorEmail(const std::string& addr) {
}
/// Constructor to be used when creating a new DOM tree
-Header::Header(const string& author, const string& url) {
- Object* ptr = new Object();
- assign(ptr, author, url);
+Header::Header(const string& author_name, const string& descr_url) {
+ Object* obj_ptr = new Object();
+ assign(obj_ptr, author_name, descr_url);
}
/// Accessor to object name
@@ -137,8 +137,8 @@ Constant::Constant(const string& nam, const string& val, const string& typ) {
}
/// Constructor to be used when creating a new DOM tree
-Constant::Constant(const string& name) {
- m_element = new Object(name.c_str(), "", "number");
+Constant::Constant(const string& nam) {
+ m_element = new Object(nam.c_str(), "", "number");
}
/// Access the constant
@@ -159,12 +159,12 @@ string Constant::toString() const {
}
/// Constructor to be used when creating a new DOM tree
-Atom::Atom(const string& name, const string& formula, int Z, int N, double density) {
+Atom::Atom(const string& nam, const string& formula, int Z, int N, double density) {
TGeoElementTable* t = TGeoElement::GetElementTable();
- TGeoElement* e = t->FindElement(name.c_str());
+ TGeoElement* e = t->FindElement(nam.c_str());
if (!e) {
- t->AddElement(name.c_str(), formula.c_str(), Z, N, density);
- e = t->FindElement(name.c_str());
+ t->AddElement(nam.c_str(), formula.c_str(), Z, N, density);
+ e = t->FindElement(nam.c_str());
}
m_element = e;
}
@@ -236,10 +236,10 @@ string Material::toString() const {
return os.str();
}
-/// Constructor to be used when creating a new DOM tree
-VisAttr::VisAttr(const string& name) {
+/// Constructor to be used when creating a new entity
+VisAttr::VisAttr(const string& nam) {
Object* obj = new Object();
- assign(obj, name, "vis");
+ assign(obj, nam, "vis");
obj->color = 2;
setLineStyle (SOLID);
setDrawingStyle(SOLID);
@@ -247,10 +247,10 @@ VisAttr::VisAttr(const string& name) {
setAlpha(0.1f);
}
-/// Constructor to be used when creating a new DOM tree
-VisAttr::VisAttr(const char* name) {
+/// Constructor to be used when creating a new entity
+VisAttr::VisAttr(const char* nam) {
Object* obj = new Object();
- assign(obj, name, "vis");
+ assign(obj, nam, "vis");
obj->color = 2;
setLineStyle (SOLID);
setDrawingStyle(SOLID);
@@ -415,8 +415,8 @@ string Limit::toString() const {
}
/// Constructor to be used when creating a new DOM tree
-LimitSet::LimitSet(const string& name) {
- assign(new Object(), name, "limitset");
+LimitSet::LimitSet(const string& nam) {
+ assign(new Object(), nam, "limitset");
}
/// Add new limit. Returns true if the new limit was added, false if it already existed.
@@ -432,9 +432,9 @@ const set<Limit>& LimitSet::limits() const {
}
/// Constructor to be used when creating a new DOM tree
-Region::Region(const string& name) {
+Region::Region(const string& nam) {
Object* p = new Object();
- assign(p, name, "region");
+ assign(p, nam, "region");
p->magic = magic_word();
p->store_secondaries = false;
p->threshold = 10.0;
diff --git a/DDCore/src/Segmentations.cpp b/DDCore/src/Segmentations.cpp
index 0bfeed0eedc1df0010d68221d17bbf625cef4432..72051bcc3f1e589f2140163a55d0fabf555356d2 100644
--- a/DDCore/src/Segmentations.cpp
+++ b/DDCore/src/Segmentations.cpp
@@ -37,13 +37,13 @@ SegmentationObject::~SegmentationObject() {
}
/// determine the local position based on the cell ID
-DDSegmentation::Vector3D SegmentationObject::position(const long64& cellID) const {
- return segmentation->position(cellID);
+DDSegmentation::Vector3D SegmentationObject::position(const long64& cell) const {
+ return segmentation->position(cell);
}
/// determine the cell ID based on the local position
-long64 SegmentationObject::cellID(const DDSegmentation::Vector3D& localPosition, const DDSegmentation::Vector3D& globalPosition, const long64& volumeID) const {
- return segmentation->cellID(localPosition, globalPosition, volumeID);
+long64 SegmentationObject::cellID(const DDSegmentation::Vector3D& localPosition, const DDSegmentation::Vector3D& globalPosition, const long64& volID) const {
+ return segmentation->cellID(localPosition, globalPosition, volID);
}
/// Access the encoding string
@@ -75,8 +75,8 @@ BitField64* SegmentationObject::decoder() {
}
/// Set the underlying decoder
-void SegmentationObject::setDecoder(BitField64* decoder) {
- segmentation->setDecoder(decoder);
+void SegmentationObject::setDecoder(BitField64* ptr_decoder) {
+ segmentation->setDecoder(ptr_decoder);
}
/// Access to parameter by name
@@ -90,18 +90,18 @@ Parameters SegmentationObject::parameters() const {
}
/// Set all parameters from an existing set of parameters
-void SegmentationObject::setParameters(const Parameters& parameters) {
- segmentation->setParameters(parameters);
+void SegmentationObject::setParameters(const Parameters& params) {
+ segmentation->setParameters(params);
}
/// Constructor to used when creating a new object
-Segmentation::Segmentation(const string& type, const string& name) :
+Segmentation::Segmentation(const string& typ, const string& nam) :
Handle<Implementation>() {
- BaseSegmentation* s = DDSegmentation::SegmentationFactory::instance()->create(type);
+ BaseSegmentation* s = DDSegmentation::SegmentationFactory::instance()->create(typ);
if (s != 0) {
- assign(new Object(s), name, "");
+ assign(new Object(s), nam, "");
} else {
- throw runtime_error("FAILED to create segmentation: " + type + ". Missing factory method for: " + type + "!");
+ throw runtime_error("FAILED to create segmentation: " + typ + ". Missing factory method for: " + typ + "!");
}
}
@@ -125,11 +125,11 @@ DDSegmentation::Segmentation* Segmentation::segmentation() const {
}
/// determine the local position based on the cell ID
-Position Segmentation::position(const long64& cellID) const {
- return Position(segmentation()->position(cellID));
+Position Segmentation::position(const long64& cell) const {
+ return Position(segmentation()->position(cell));
}
/// determine the cell ID based on the local position
-long64 Segmentation::cellID(const Position& localPosition, const Position& globalPosition, const long64& volumeID) const {
- return segmentation()->cellID(localPosition, globalPosition, volumeID);
+long64 Segmentation::cellID(const Position& localPosition, const Position& globalPosition, const long64& volID) const {
+ return segmentation()->cellID(localPosition, globalPosition, volID);
}
diff --git a/DDCore/src/Shapes.cpp b/DDCore/src/Shapes.cpp
index c582fe55206e86c5ff4f6c87de49fd7889221be0..441f13f39b3e9988ceb69430184407952931c912 100644
--- a/DDCore/src/Shapes.cpp
+++ b/DDCore/src/Shapes.cpp
@@ -247,9 +247,9 @@ ConeSegment& ConeSegment::setDimensions(double dz, double rmin1, double rmax1, d
}
/// Constructor to be used when creating a new object with attribute initialization
-void Tube::make(const string& name, double rmin, double rmax, double z, double startPhi, double deltaPhi) {
+void Tube::make(const string& nam, double rmin, double rmax, double z, double startPhi, double deltaPhi) {
//_assign(new TGeoTubeSeg(rmin,rmax,z,startPhi/dd4hep::deg,deltaPhi/dd4hep::deg),name,"tube",true);
- _assign(new MyConeSeg(), name, "tube", true);
+ _assign(new MyConeSeg(), nam, "tube", true);
setDimensions(rmin, rmax, z, startPhi, deltaPhi);
}
diff --git a/DDCore/src/VolumeManager.cpp b/DDCore/src/VolumeManager.cpp
index 30fe81e94c6e9b1924cc2538ad5f5138f7e00fbd..561e295f1edac14b87c5ca59b8107d1bf14784d1 100644
--- a/DDCore/src/VolumeManager.cpp
+++ b/DDCore/src/VolumeManager.cpp
@@ -219,43 +219,43 @@ namespace {
/// Initializing constructor to create a new object
VolumeManager::VolumeManager(LCDD& lcdd, const string& nam, DetElement elt, Readout ro, int flags) {
- Object* ptr = new Object();
- assign(ptr, nam, "VolumeManager");
+ Object* obj_ptr = new Object();
+ assign(obj_ptr, nam, "VolumeManager");
if (elt.isValid()) {
Populator p(lcdd, *this);
- ptr->detector = elt;
- ptr->id = ro.isValid() ? ro.idSpec() : IDDescriptor();
- ptr->top = ptr;
- ptr->flags = flags;
+ obj_ptr->detector = elt;
+ obj_ptr->id = ro.isValid() ? ro.idSpec() : IDDescriptor();
+ obj_ptr->top = obj_ptr;
+ obj_ptr->flags = flags;
p.populate(elt);
}
}
/// Initializing constructor to create a new object
-VolumeManager::VolumeManager(DetElement subdetector, Readout ro) {
- Object* ptr = new Object();
- ptr->detector = subdetector;
- ptr->id = ro.isValid() ? ro.idSpec() : IDDescriptor();
- assign(ptr, subdetector.name(), "VolumeManager");
+VolumeManager::VolumeManager(DetElement sub_detector, Readout ro) {
+ Object* obj_ptr = new Object();
+ obj_ptr->detector = sub_detector;
+ obj_ptr->id = ro.isValid() ? ro.idSpec() : IDDescriptor();
+ assign(obj_ptr, sub_detector.name(), "VolumeManager");
}
/// Add a new Volume manager section according to a new subdetector
-VolumeManager VolumeManager::addSubdetector(DetElement detector, Readout ro) {
+VolumeManager VolumeManager::addSubdetector(DetElement det, Readout ro) {
if (isValid()) {
Object& o = _data();
- if (!detector.isValid()) {
+ if (!det.isValid()) {
throw runtime_error("DD4hep: VolumeManager::addSubdetector: Only valid subdetectors "
"are allowed. [Invalid DetElement]");
}
- Detectors::const_iterator i = o.subdetectors.find(detector);
+ Detectors::const_iterator i = o.subdetectors.find(det);
if (i == o.subdetectors.end()) {
- string det_name = detector.name();
+ string det_name = det.name();
// First check all pre-conditions
if (!ro.isValid()) {
throw runtime_error("DD4hep: VolumeManager::addSubdetector: Only subdetectors with a "
"valid readout descriptor are allowed. [Invalid DetElement:" + det_name + "]");
}
- PlacedVolume pv = detector.placement();
+ PlacedVolume pv = det.placement();
if (!pv.isValid()) {
throw runtime_error("DD4hep: VolumeManager::addSubdetector: Only subdetectors with a "
"valid placement are allowed. [Invalid DetElement:" + det_name + "]");
@@ -266,13 +266,13 @@ VolumeManager VolumeManager::addSubdetector(DetElement detector, Readout ro) {
"valid placement VolIDs are allowed. [Invalid DetElement:" + det_name + "]");
}
- i = o.subdetectors.insert(make_pair(detector, VolumeManager(detector,ro))).first;
+ i = o.subdetectors.insert(make_pair(det, VolumeManager(det,ro))).first;
const PlacedVolume::VolID& id = (*vit);
VolumeManager m = (*i).second;
IDDescriptor::Field field = ro.idSpec().field(id.first);
if (!field) {
throw runtime_error(
- "DD4hep: VolumeManager::addSubdetector: IdDescriptor of " + string(detector.name()) + " has no field " + id.first);
+ "DD4hep: VolumeManager::addSubdetector: IdDescriptor of " + string(det.name()) + " has no field " + id.first);
}
Object& mo = m._data();
mo.top = o.top;
@@ -281,7 +281,7 @@ VolumeManager VolumeManager::addSubdetector(DetElement detector, Readout ro) {
mo.sysID = id.second;
mo.detMask = mo.sysID;
o.managers[mo.sysID] = m;
- detector.callAtUpdate(DetElement::PLACEMENT_CHANGED|DetElement::PLACEMENT_DETECTOR,
+ det.callAtUpdate(DetElement::PLACEMENT_CHANGED|DetElement::PLACEMENT_DETECTOR,
&mo,&Object::update);
}
return (*i).second;
@@ -352,8 +352,8 @@ bool VolumeManager::adoptPlacement(VolumeID /* sys_id */, Context* context) {
printout(ERROR, "VolumeManager", "%s", err.str().c_str());
err.str("");
err << " !!!!! ++++ VolIDS ";
- const VolIDs::Base& ids = context->volID;
- for (VolIDs::Base::const_iterator vit = ids.begin(); vit != ids.end(); ++vit)
+ const VolIDs::Base& id_vector = context->volID;
+ for (VolIDs::Base::const_iterator vit = id_vector.begin(); vit != id_vector.end(); ++vit)
err << (*vit).first << "=" << (*vit).second << "; ";
printout(ERROR, "VolumeManager", "%s", err.str().c_str());
err.str("");
diff --git a/DDCore/src/VolumeManagerInterna.cpp b/DDCore/src/VolumeManagerInterna.cpp
index 538e162a655831e6b98ba108e72e046b7760bbd5..88b703aa6e240fa1e7768f311b29dbed8acb49ac 100644
--- a/DDCore/src/VolumeManagerInterna.cpp
+++ b/DDCore/src/VolumeManagerInterna.cpp
@@ -56,9 +56,9 @@ void VolumeManagerObject::update(unsigned long tags, DetElement& det, void* para
}
/// Search the locally cached volumes for a matching ID
-VolumeManager::Context* VolumeManagerObject::search(const VolumeID& id) const {
+VolumeManager::Context* VolumeManagerObject::search(const VolumeID& vol_id) const {
Context* context = 0;
- VolumeID volume_id(id);
+ VolumeID volume_id(vol_id);
volume_id &= detMask;
Volumes::const_iterator i = volumes.find(volume_id);
if (i != volumes.end()) {
diff --git a/DDCore/src/Volumes.cpp b/DDCore/src/Volumes.cpp
index 934b21c42cc6801ef7202643fb038f6a35cf3423..f08843e57800ef729d944e2a40e5e7d2c9c913c0 100644
--- a/DDCore/src/Volumes.cpp
+++ b/DDCore/src/Volumes.cpp
@@ -369,9 +369,9 @@ PlacedVolume::Object* PlacedVolume::data() const {
}
/// Add identifier
-PlacedVolume& PlacedVolume::addPhysVolID(const string& name, int value) {
+PlacedVolume& PlacedVolume::addPhysVolID(const string& nam, int value) {
Object* obj = _data(*this);
- obj->volIDs.push_back(VolID(name, value));
+ obj->volIDs.push_back(VolID(nam, value));
return *this;
}
@@ -467,13 +467,13 @@ Volume::Object* _data(const Volume& v, bool throw_exception = true) {
}
/// Constructor to be used when creating a new geometry tree.
-Volume::Volume(const string& name) {
- m_element = _createTGeoVolume(name,0,0);
+Volume::Volume(const string& nam) {
+ m_element = _createTGeoVolume(nam,0,0);
}
/// Constructor to be used when creating a new geometry tree. Also sets materuial and solid attributes
-Volume::Volume(const string& name, const Solid& s, const Material& m) {
- m_element = _createTGeoVolume(name,s.ptr(),m.ptr());
+Volume::Volume(const string& nam, const Solid& s, const Material& m) {
+ m_element = _createTGeoVolume(nam,s.ptr(),m.ptr());
}
/// Check if placement is properly instrumented
@@ -624,9 +624,9 @@ const Volume& Volume::setVisAttributes(const VisAttr& attr) const {
}
/// Set Visualization attributes to the volume
-const Volume& Volume::setVisAttributes(const LCDD& lcdd, const string& name) const {
- if (!name.empty()) {
- VisAttr attr = lcdd.visAttributes(name);
+const Volume& Volume::setVisAttributes(const LCDD& lcdd, const string& nam) const {
+ if (!nam.empty()) {
+ VisAttr attr = lcdd.visAttributes(nam);
setVisAttributes(attr);
}
else {
@@ -664,8 +664,8 @@ VisAttr Volume::visAttributes() const {
}
/// Set the volume's solid shape
-const Volume& Volume::setSolid(const Solid& solid) const {
- m_element->SetShape(solid);
+const Volume& Volume::setSolid(const Solid& s) const {
+ m_element->SetShape(s);
return *this;
}
@@ -675,9 +675,9 @@ Solid Volume::solid() const {
}
/// Set the regional attributes to the volume
-const Volume& Volume::setRegion(const LCDD& lcdd, const string& name) const {
- if (!name.empty()) {
- return setRegion(lcdd.region(name));
+const Volume& Volume::setRegion(const LCDD& lcdd, const string& nam) const {
+ if (!nam.empty()) {
+ return setRegion(lcdd.region(nam));
}
return *this;
}
@@ -694,9 +694,9 @@ Region Volume::region() const {
}
/// Set the limits to the volume
-const Volume& Volume::setLimitSet(const LCDD& lcdd, const string& name) const {
- if (!name.empty()) {
- return setLimitSet(lcdd.limitSet(name));
+const Volume& Volume::setLimitSet(const LCDD& lcdd, const string& nam) const {
+ if (!nam.empty()) {
+ return setLimitSet(lcdd.limitSet(nam));
}
return *this;
}
@@ -731,7 +731,7 @@ bool Volume::isSensitive() const {
}
/// Constructor to be used when creating a new geometry tree.
-Assembly::Assembly(const string& name) {
- m_element = _createTGeoVolumeAssembly(name);
+Assembly::Assembly(const string& nam) {
+ m_element = _createTGeoVolumeAssembly(nam);
}
diff --git a/DDCore/src/XML/Layering.cpp b/DDCore/src/XML/Layering.cpp
index d00bc50a1f429bb555b6aea1164e7110ee7ffbfd..07f2e5b370a60b92711f50d6861f023baadc5e9b 100644
--- a/DDCore/src/XML/Layering.cpp
+++ b/DDCore/src/XML/Layering.cpp
@@ -105,9 +105,9 @@ void LayeringCnv::fromCompact(Layering& layering) const {
}
double Layering::singleLayerThickness(XML::Element e) const {
- Component layer = e;
+ Component lay = e;
double thickness = 0e0;
- for (Collection_t s(layer, _U(slice)); s; ++s) {
+ for (Collection_t s(lay, _U(slice)); s; ++s) {
Component slice = s;
thickness += slice.thickness();
}
diff --git a/DDCore/src/XML/XMLDetector.cpp b/DDCore/src/XML/XMLDetector.cpp
index 3a93cddd16e05eac5806af002265dcae7a16a8b8..ae050898b6684745678addbab0f29e5a9f32e204 100644
--- a/DDCore/src/XML/XMLDetector.cpp
+++ b/DDCore/src/XML/XMLDetector.cpp
@@ -28,16 +28,16 @@ bool Component::isSensitive() const {
DD4hep::NamedObject* Component::createShape() const {
using namespace DD4hep::Geometry;
- Dimension child(m_element);
- string type = child.typeStr();
- string fac = type + "__shape_constructor";
+ Dimension child_dim(m_element);
+ string typ = child_dim.typeStr();
+ string fac = typ + "__shape_constructor";
Handle_t solid_elt = m_element;
LCDD* lcdd = 0;
NamedObject* solid = PluginService::Create<NamedObject*>(fac, lcdd, &solid_elt);
if ( !solid ) {
PluginDebug dbg;
- PluginService::Create<NamedObject*>(type, lcdd, &solid_elt);
- throw runtime_error("Failed to create solid of type " + type + ". " + dbg.missingFactory(type));
+ PluginService::Create<NamedObject*>(typ, lcdd, &solid_elt);
+ throw runtime_error("Failed to create solid of type " + typ + ". " + dbg.missingFactory(typ));
}
return solid;
}
@@ -68,8 +68,8 @@ void DetElement::check(bool condition, const string& msg) const {
bool DetElement::isTracker() const {
if (m_element) {
- string type = attr < string > (_U(type));
- if (type.find("Tracker") != string::npos && hasAttr(_U(readout))) {
+ string typ = attr < string > (_U(type));
+ if (typ.find("Tracker") != string::npos && hasAttr(_U(readout))) {
return true;
}
}
@@ -78,8 +78,8 @@ bool DetElement::isTracker() const {
bool DetElement::isCalorimeter() const {
if (m_element) {
- string type = attr < string > (_U(type));
- if (type.find("Calorimeter") != string::npos && hasAttr(_U(readout))) {
+ string typ = attr < string > (_U(type));
+ if (typ.find("Calorimeter") != string::npos && hasAttr(_U(readout))) {
return true;
}
}
diff --git a/DDCore/src/XML/XMLElements.cpp b/DDCore/src/XML/XMLElements.cpp
index 101bde38759e7d71243012b2f6d59c703f43c80a..c9b75f4e3015dd8fda5bbbaab0d344ff80b71d22 100644
--- a/DDCore/src/XML/XMLElements.cpp
+++ b/DDCore/src/XML/XMLElements.cpp
@@ -508,8 +508,8 @@ NodeList::NodeList(const NodeList& copy)
}
/// Initializing constructor
-NodeList::NodeList(XmlElement* node, const XmlChar* tag)
- : m_tag(tag), m_node(node), m_ptr(0)
+NodeList::NodeList(XmlElement* node, const XmlChar* tag_value)
+ : m_tag(tag_value), m_node(node), m_ptr(0)
{
reset();
}
@@ -605,13 +605,13 @@ Handle_t Handle_t::parent() const {
}
/// Access attribute pointer by the attribute's unicode name (no exception thrown if not present)
-Attribute Handle_t::attr_nothrow(const XmlChar* tag) const {
- return attribute_node(m_node, tag);
+Attribute Handle_t::attr_nothrow(const XmlChar* tag_value) const {
+ return attribute_node(m_node, tag_value);
}
/// Check for the existence of a named attribute
-bool Handle_t::hasAttr(const XmlChar* tag) const {
- return m_node && 0 != _E(m_node)->getAttributeNode(tag);
+bool Handle_t::hasAttr(const XmlChar* tag_value) const {
+ return m_node && 0 != _E(m_node)->getAttributeNode(tag_value);
}
/// Retrieve a collection of all attributes of this DOM element
@@ -659,8 +659,8 @@ Handle_t Handle_t::child(const XmlChar* t, bool throw_exception) const {
throw runtime_error(msg);
}
-NodeList Handle_t::children(const XmlChar* tag) const {
- return NodeList(m_node, tag);
+NodeList Handle_t::children(const XmlChar* tag_value) const {
+ return NodeList(m_node, tag_value);
}
/// Append a DOM element to the current node
@@ -689,51 +689,51 @@ Handle_t Handle_t::remove(Handle_t node) const {
}
/// Remove children with a given tag name from the DOM node
-void Handle_t::removeChildren(const XmlChar* tag) const {
+void Handle_t::removeChildren(const XmlChar* tag_value) const {
#ifdef DD4HEP_USE_TINYXML
- for(TiXmlNode* n=_E(m_node)->FirstChildElement(tag);n;n=_E(m_node)->FirstChildElement(tag))
+ for(TiXmlNode* n=_E(m_node)->FirstChildElement(tag_value);n;n=_E(m_node)->FirstChildElement(tag_value))
n->RemoveChild(n);
#else
xercesc::DOMElement* e = _E(m_node);
- xercesc::DOMNodeList* l = e->getElementsByTagName(tag);
+ xercesc::DOMNodeList* l = e->getElementsByTagName(tag_value);
for (XmlSize_t i = 0, n = l->getLength(); i < n; ++i)
e->removeChild(l->item(i));
#endif
}
-bool Handle_t::hasChild(const XmlChar* tag) const {
- return node_first(m_node, tag) != 0;
+bool Handle_t::hasChild(const XmlChar* tag_value) const {
+ return node_first(m_node, tag_value) != 0;
}
/// Set the element's value
-void Handle_t::setValue(const XmlChar* text) const {
- _N(m_node)->setNodeValue(text);
+void Handle_t::setValue(const XmlChar* text_value) const {
+ _N(m_node)->setNodeValue(text_value);
}
/// Set the element's value
-void Handle_t::setValue(const string& text) const {
+void Handle_t::setValue(const string& text_value) const {
#ifdef DD4HEP_USE_TINYXML
- _N(m_node)->setNodeValue(text.c_str());
+ _N(m_node)->setNodeValue(text_value.c_str());
#else
- _N(m_node)->setNodeValue(Strng_t(text));
+ _N(m_node)->setNodeValue(Strng_t(text_value));
#endif
}
/// Set the element's text
-void Handle_t::setText(const XmlChar* text) const {
+void Handle_t::setText(const XmlChar* text_value) const {
#ifdef DD4HEP_USE_TINYXML
- _N(m_node)->LinkEndChild(new TiXmlText(text));
+ _N(m_node)->LinkEndChild(new TiXmlText(text_value));
#else
- _N(m_node)->setTextContent(text);
+ _N(m_node)->setTextContent(text_value);
#endif
}
/// Set the element's text
-void Handle_t::setText(const string& text) const {
+void Handle_t::setText(const string& text_value) const {
#ifdef DD4HEP_USE_TINYXML
- _N(m_node)->LinkEndChild(new TiXmlText(text.c_str()));
+ _N(m_node)->LinkEndChild(new TiXmlText(text_value.c_str()));
#else
- _N(m_node)->setTextContent(Strng_t(text));
+ _N(m_node)->setTextContent(Strng_t(text_value));
#endif
}
@@ -796,26 +796,26 @@ const XmlChar* Handle_t::attr_name(const Attribute a) const {
}
/// Access attribute value by the attribute's unicode name (throws exception if not present)
-const XmlChar* Handle_t::attr_value(const XmlChar* attr) const {
- return attribute_value(attr_ptr(attr));
+const XmlChar* Handle_t::attr_value(const XmlChar* attr_tag) const {
+ return attribute_value(attr_ptr(attr_tag));
}
/// Access attribute value by the attribute (throws exception if not present)
-const XmlChar* Handle_t::attr_value(const Attribute attr) const {
- return attribute_value(attr);
+const XmlChar* Handle_t::attr_value(const Attribute attr_val) const {
+ return attribute_value(attr_val);
}
/// Access attribute value by the attribute's unicode name (no exception thrown if not present)
-const XmlChar* Handle_t::attr_value_nothrow(const XmlChar* attr) const {
- Attribute a = attr_nothrow(attr);
+const XmlChar* Handle_t::attr_value_nothrow(const XmlChar* attr_tag) const {
+ Attribute a = attr_nothrow(attr_tag);
return a ? attribute_value(a) : 0;
}
/// Generic attribute setter with integer value
-Attribute Handle_t::setAttr(const XmlChar* name, int val) const {
+Attribute Handle_t::setAttr(const XmlChar* nam, int val) const {
char txt[32];
::snprintf(txt, sizeof(txt), "%d", val);
- return setAttr(name, Strng_t(txt));
+ return setAttr(nam, Strng_t(txt));
}
/// Generic attribute setter with boolen value
@@ -851,40 +851,40 @@ Attribute Handle_t::setAttr(const XmlChar* name, const char* v) const {
#endif
/// Generic attribute setter with XmlAttr value
-Attribute Handle_t::setAttr(const XmlChar* name, const Attribute v) const {
- return v ? setAttr(name, attribute_value(v)) : 0;
+Attribute Handle_t::setAttr(const XmlChar* nam, const Attribute v) const {
+ return v ? setAttr(nam, attribute_value(v)) : 0;
}
/// Generic attribute setter with unicode value
-Attribute Handle_t::setAttr(const XmlChar* name, const XmlChar* value) const {
+Attribute Handle_t::setAttr(const XmlChar* nam, const XmlChar* val) const {
#ifdef DD4HEP_USE_TINYXML
TiXmlElement* e = Xml(m_node).e;
- e->SetAttribute(name,value);
- return Attribute(e->AttributeNode(name));
+ e->SetAttribute(nam,val);
+ return Attribute(e->AttributeNode(nam));
#else
xercesc::DOMElement* e = _E(m_node);
- xercesc::DOMAttr* a = e->getAttributeNode(name);
+ xercesc::DOMAttr* a = e->getAttributeNode(nam);
if (!a) {
- a = e->getOwnerDocument()->createAttribute(name);
+ a = e->getOwnerDocument()->createAttribute(nam);
e->setAttributeNode(a);
}
- a->setValue(value);
+ a->setValue(val);
return Attribute(a);
#endif
}
/// Add reference child as a new child node. The obj must have the "name" attribute!
-Handle_t Handle_t::setRef(const XmlChar* tag, const XmlChar* ref_name) {
+Handle_t Handle_t::setRef(const XmlChar* tag_value, const XmlChar* ref_name) {
Element me(*this);
- Element ref(me.document(), tag);
+ Element ref(me.document(), tag_value);
ref.setAttr(Unicode_ref, ref_name);
me.append(ref);
return ref;
}
/// Add reference child as a new child node. The obj must have the "name" attribute!
-Handle_t Handle_t::setRef(const XmlChar* tag, const string& ref_name) {
- return setRef(tag, Strng_t(ref_name).ptr());
+Handle_t Handle_t::setRef(const XmlChar* tag_value, const string& ref_name) {
+ return setRef(tag_value, Strng_t(ref_name).ptr());
}
/// Checksum (sub-)tree of a xml document/tree
@@ -968,11 +968,11 @@ unsigned int Handle_t::checksum(unsigned int param, fcn_t fcn) const {
}
/// Create DOM element
-Handle_t Document::createElt(const XmlChar* tag) const {
+Handle_t Document::createElt(const XmlChar* tag_value) const {
#ifdef DD4HEP_USE_TINYXML
- return _XE(new TiXmlElement(tag));
+ return _XE(new TiXmlElement(tag_value));
#else
- return _XE(_D(m_doc)->createElement(tag));
+ return _XE(_D(m_doc)->createElement(tag_value));
#endif
}
@@ -997,8 +997,8 @@ DocumentHolder::~DocumentHolder() {
}
/// Constructor from DOM document entity
-Element::Element(const Document& document, const XmlChar* type)
- : m_element(Xml(document.createElt(type)).xe) {
+Element::Element(const Document& doc, const XmlChar* type)
+ : m_element(Xml(doc.createElt(type)).xe) {
}
/// Access the hosting document handle of this DOM element
@@ -1019,23 +1019,23 @@ Attribute Element::getAttr(const XmlChar* name) const {
}
/// Set the reference attribute to the node (adds attribute ref="ref-name")
-Attribute Element::setRef(const XmlChar* tag, const XmlChar* ref_name) const {
- return setChild(tag).setAttr(Unicode_ref, ref_name);
+Attribute Element::setRef(const XmlChar* tag_value, const XmlChar* ref_name) const {
+ return setChild(tag_value).setAttr(Unicode_ref, ref_name);
}
/// Set the reference attribute to the node (adds attribute ref="ref-name")
-Attribute Element::setRef(const XmlChar* tag, const string& ref_name) const {
- return setRef(tag, Strng_t(ref_name).ptr());
+Attribute Element::setRef(const XmlChar* tag_value, const string& ref_name) const {
+ return setRef(tag_value, Strng_t(ref_name).ptr());
}
/// Access the value of the reference attribute of the node (attribute ref="ref-name")
-const XmlChar* Element::getRef(const XmlChar* tag) const {
- return child(tag).attr < cpXmlChar > (Unicode_ref);
+const XmlChar* Element::getRef(const XmlChar* tag_value) const {
+ return child(tag_value).attr < cpXmlChar > (Unicode_ref);
}
/// Add a new child to the DOM node
-Handle_t Element::addChild(const XmlChar* tag) const {
- Handle_t e = document().createElt(tag);
+Handle_t Element::addChild(const XmlChar* tag_value) const {
+ Handle_t e = document().createElt(tag_value);
m_element.append(e);
return e;
}
@@ -1047,18 +1047,18 @@ Handle_t Element::setChild(const XmlChar* t) const {
}
/// Add comment node to the element
-void Element::addComment(const char* text) const {
+void Element::addComment(const char* text_value) const {
#ifdef DD4HEP_USE_TINYXML
- _N(m_element)->appendChild(new TiXmlComment(text));
+ _N(m_element)->appendChild(new TiXmlComment(text_value));
#else
- _N(m_element)->appendChild(_D(document().m_doc)->createComment(Strng_t(text)));
+ _N(m_element)->appendChild(_D(document().m_doc)->createComment(Strng_t(text_value)));
#endif
}
/// Initializing constructor to create a new XMLElement and add it to the document.
-RefElement::RefElement(const Document& document, const XmlChar* type, const XmlChar* name)
- : Element(document, type) {
- m_name = name ? setAttr(_U(name), name) : 0;
+RefElement::RefElement(const Document& doc, const XmlChar* typ, const XmlChar* nam)
+ : Element(doc, typ) {
+ m_name = nam ? setAttr(_U(name), nam) : 0;
}
/// Construction from existing object handle
@@ -1095,14 +1095,14 @@ void RefElement::setName(const XmlChar* new_name) {
}
#ifndef DD4HEP_USE_TINYXML
-Collection_t::Collection_t(Handle_t element, const XmlChar* tag)
- : m_children(element, tag) {
+Collection_t::Collection_t(Handle_t element, const XmlChar* tag_value)
+ : m_children(element, tag_value) {
m_node = m_children.reset();
}
#endif
-Collection_t::Collection_t(Handle_t element, const char* tag)
- : m_children(element, Strng_t(tag)) {
+Collection_t::Collection_t(Handle_t element, const char* tag_value)
+ : m_children(element, Strng_t(tag_value)) {
m_node = m_children.reset();
}
diff --git a/DDCore/src/plugins/LCDDConverter.cpp b/DDCore/src/plugins/LCDDConverter.cpp
index 11da819ea36525181825c43c711e3c6948bd095e..0b5f83ce7c2e0c39042de98b9d155b838b88212c 100644
--- a/DDCore/src/plugins/LCDDConverter.cpp
+++ b/DDCore/src/plugins/LCDDConverter.cpp
@@ -365,7 +365,7 @@ xml_h LCDDConverter::handleSolid(const string& name, const TGeoShape* shape) con
solid.setAttr(_U(deltaphi), (s->GetPhi2() - s->GetPhi1()) * DEGREE_2_RAD);
solid.setAttr(_U(aunit), "rad");
solid.setAttr(_U(lunit), "mm");
- xml_elt_t zplane = xml_elt_t(geo.doc, _U(zplane));
+ zplane = xml_elt_t(geo.doc, _U(zplane));
zplane.setAttr(_U(rmin), s->GetRmin1() * CM_2_MM);
zplane.setAttr(_U(rmax), s->GetRmax1() * CM_2_MM);
zplane.setAttr(_U(z), -s->GetDz() * CM_2_MM);
@@ -520,8 +520,8 @@ xml_h LCDDConverter::handleSolid(const string& name, const TGeoShape* shape) con
TGeoMatrix& rinv = rm->Inverse();
XYZRotation rot = getXYZangles(rinv.GetRotationMatrix());
if ((rot.X() != 0.0) || (rot.Y() != 0.0) || (rot.Z() != 0.0)) {
- xml_ref_t rot = handleRotation(rnam + "rot", &rinv);
- solid.setRef(_U(rotationref), rot.name());
+ xml_ref_t xml_rot = handleRotation(rnam + "rot", &rinv);
+ solid.setRef(_U(rotationref), xml_rot.name());
}
}
}
@@ -635,7 +635,7 @@ xml_h LCDDConverter::handleVolume(const string& /* name */, Volume volume) const
geo.xmlVolumes[v] = vol;
const TObjArray* dau = ((TGeoVolume*) v)->GetNodes();
if (dau && dau->GetEntries() > 0) {
- for (Int_t i = 0, n = dau->GetEntries(); i < n; ++i) {
+ for (Int_t i = 0, n_dau = dau->GetEntries(); i < n_dau; ++i) {
TGeoNode* node = (TGeoNode*) dau->At(i);
handlePlacement(node->GetName(), node);
}
@@ -646,20 +646,20 @@ xml_h LCDDConverter::handleVolume(const string& /* name */, Volume volume) const
VisAttr vis = _v.visAttributes();
SensitiveDetector det = _v.sensitiveDetector();
if (det.isValid()) {
- xml_ref_t data = handleSensitive(det.name(), det);
- vol.setRef(_U(sdref), data.name());
+ xml_ref_t xml_data = handleSensitive(det.name(), det);
+ vol.setRef(_U(sdref), xml_data.name());
}
if (reg.isValid()) {
- xml_ref_t data = handleRegion(reg.name(), reg);
- vol.setRef(_U(regionref), data.name());
+ xml_ref_t xml_data = handleRegion(reg.name(), reg);
+ vol.setRef(_U(regionref), xml_data.name());
}
if (lim.isValid()) {
- xml_ref_t data = handleLimitSet(lim.name(), lim);
- vol.setRef(_U(limitsetref), data.name());
+ xml_ref_t xml_data = handleLimitSet(lim.name(), lim);
+ vol.setRef(_U(limitsetref), xml_data.name());
}
if (vis.isValid()) {
- xml_ref_t data = handleVis(vis.name(), vis);
- vol.setRef(_U(visref), data.name());
+ xml_ref_t xml_data = handleVis(vis.name(), vis);
+ vol.setRef(_U(visref), xml_data.name());
}
}
}
@@ -678,8 +678,8 @@ xml_h LCDDConverter::handleVolumeVis(const string& /* name */, const TGeoVolume*
if (vis.isValid()) {
geo.doc_structure.append(vol = xml_elt_t(geo.doc, _U(volume)));
vol.setAttr(_U(name), v->GetName());
- xml_ref_t data = handleVis(vis.name(), vis);
- vol.setRef(_U(visref), data.name());
+ xml_ref_t xml_data = handleVis(vis.name(), vis);
+ vol.setRef(_U(visref), xml_data.name());
geo.xmlVolumes[v] = vol;
}
}
diff --git a/DDCore/src/plugins/VolumeMgrTest.cpp b/DDCore/src/plugins/VolumeMgrTest.cpp
index 8b98b2d68cd042c50b33a816ff1c44854a6409cf..a4052cf6aff661d8c9d0f6687e7ab58d15f3578d 100644
--- a/DDCore/src/plugins/VolumeMgrTest.cpp
+++ b/DDCore/src/plugins/VolumeMgrTest.cpp
@@ -170,8 +170,8 @@ void VolIDTest::walk(DetElement e, VolIDs ids, size_t depth, size_t mx_depth) c
/// Action routine to execute the test
long VolIDTest::run(LCDD& lcdd,int argc,char** argv) {
cout << "++ Processing plugin...CLICSid_VolMgrTest..." << endl;
- for(int i=1; i<argc;++i) {
- string name = argv[i]+1;
+ for(int iarg=1; iarg<argc;++iarg) {
+ string name = argv[iarg]+1;
if ( name == "all" || name == "All" || name == "ALL" ) {
const DetElement::Children& children = lcdd.world().children();
for (DetElement::Children::const_iterator i=children.begin(); i!=children.end(); ++i) {
diff --git a/DDEve/lcio/LCIOEventHandler.cpp b/DDEve/lcio/LCIOEventHandler.cpp
index bfee6b19f5036c7f9b58306670a07da3bed0e67f..39a448aa77d01c0b864415c71ffd5bb336bf1154 100644
--- a/DDEve/lcio/LCIOEventHandler.cpp
+++ b/DDEve/lcio/LCIOEventHandler.cpp
@@ -99,9 +99,9 @@ EventHandler::CollectionType LCIOEventHandler::collectionType(const std::string&
/// Call functor on hit collection
size_t LCIOEventHandler::collectionLoop(const std::string& collection, DDEveHitActor& actor) {
- Branches::const_iterator i = m_branches.find(collection);
- if ( i != m_branches.end() ) {
- LCCollection* c = (*i).second;
+ Branches::const_iterator ibr = m_branches.find(collection);
+ if ( ibr != m_branches.end() ) {
+ LCCollection* c = (*ibr).second;
if ( c ) {
DDEveHit hit;
int n = c->getNumberOfElements();
@@ -120,9 +120,9 @@ size_t LCIOEventHandler::collectionLoop(const std::string& collection, DDEveHitA
/// Loop over collection and extract particle data
size_t LCIOEventHandler::collectionLoop(const std::string& collection, DDEveParticleActor& actor) {
- Branches::const_iterator i = m_branches.find(collection);
- if ( i != m_branches.end() ) {
- LCCollection* c = (*i).second;
+ Branches::const_iterator ibr = m_branches.find(collection);
+ if ( ibr != m_branches.end() ) {
+ LCCollection* c = (*ibr).second;
if ( c ) {
DDEveParticle part;
int n = c->getNumberOfElements();
diff --git a/DDEve/src/Calo2DProjection.cpp b/DDEve/src/Calo2DProjection.cpp
index 78c155895393158724bd9b9f3aec644454f11ee0..1897425b9b25aadff6938f233ea52e436a5cd854 100644
--- a/DDEve/src/Calo2DProjection.cpp
+++ b/DDEve/src/Calo2DProjection.cpp
@@ -26,8 +26,8 @@ ClassImp(Calo2DProjection)
DECLARE_VIEW_FACTORY(Calo2DProjection)
/// Initializing constructor
-Calo2DProjection::Calo2DProjection(Display* eve, const std::string& name)
-: Projection(eve, name)
+Calo2DProjection::Calo2DProjection(Display* eve, const std::string& nam)
+: Projection(eve, nam)
{
InstanceCount::increment(this);
}
diff --git a/DDEve/src/Calo3DProjection.cpp b/DDEve/src/Calo3DProjection.cpp
index d00a9c38ec4953d8114be0dfc1fd4df8167dac95..3b59a009a78c1045505b6bf3ca8becb838df3392 100644
--- a/DDEve/src/Calo3DProjection.cpp
+++ b/DDEve/src/Calo3DProjection.cpp
@@ -18,8 +18,8 @@ ClassImp(Calo3DProjection)
DECLARE_VIEW_FACTORY(Calo3DProjection)
/// Initializing constructor
-Calo3DProjection::Calo3DProjection(Display* eve, const std::string& name)
-: View(eve, name)
+Calo3DProjection::Calo3DProjection(Display* eve, const std::string& nam)
+: View(eve, nam)
{
InstanceCount::increment(this);
}
diff --git a/DDEve/src/CaloLego.cpp b/DDEve/src/CaloLego.cpp
index 9c9c17c91f4811fddf0be370c9cad4a0bd50569e..af7ad3dca733aece91394aa663adb4d51e7fa0f4 100644
--- a/DDEve/src/CaloLego.cpp
+++ b/DDEve/src/CaloLego.cpp
@@ -31,8 +31,8 @@ ClassImp(CaloLego)
DECLARE_VIEW_FACTORY(CaloLego)
/// Initializing constructor
-CaloLego::CaloLego(Display* eve, const std::string& name)
-: View(eve, name)
+CaloLego::CaloLego(Display* eve, const std::string& nam)
+: View(eve, nam)
{
InstanceCount::increment(this);
}
diff --git a/DDEve/src/DDG4EventHandler.cpp b/DDEve/src/DDG4EventHandler.cpp
index d32b3f1183727c39f13704fa2377e0fdea0ead7c..768fe9d70a5631460e20e6333f1713510a8ed2ee 100644
--- a/DDEve/src/DDG4EventHandler.cpp
+++ b/DDEve/src/DDG4EventHandler.cpp
@@ -116,16 +116,16 @@ size_t DDG4EventHandler::collectionLoop(const std::string& collection, DDEveHitA
typedef std::vector<void*> _P;
Branches::const_iterator i = m_branches.find(collection);
if ( i != m_branches.end() ) {
- const _P* data = (_P*)(*i).second.second;
- if ( data ) {
+ const _P* data_ptr = (_P*)(*i).second.second;
+ if ( data_ptr ) {
DDEveHit hit;
- actor.setSize(data->size());
- for(_P::const_iterator i=data->begin(); i!=data->end(); ++i) {
- if ( (*m_simhitConverter)(*i,&hit) ) {
+ actor.setSize(data_ptr->size());
+ for(_P::const_iterator j=data_ptr->begin(); j!=data_ptr->end(); ++j) {
+ if ( (*m_simhitConverter)(*j,&hit) ) {
actor(hit);
}
}
- return data->size();
+ return data_ptr->size();
}
}
return 0;
@@ -136,16 +136,16 @@ size_t DDG4EventHandler::collectionLoop(const std::string& collection, DDEvePart
typedef std::vector<void*> _P;
Branches::const_iterator i = m_branches.find(collection);
if ( i != m_branches.end() ) {
- const _P* data = (_P*)(*i).second.second;
- if ( data ) {
+ const _P* data_ptr = (_P*)(*i).second.second;
+ if ( data_ptr ) {
DDEveParticle part;
- actor.setSize(data->size());
- for(_P::const_iterator i=data->begin(); i!=data->end(); ++i) {
- if ( (*m_particleConverter)(*i,&part) ) {
+ actor.setSize(data_ptr->size());
+ for(_P::const_iterator j=data_ptr->begin(); j!=data_ptr->end(); ++j) {
+ if ( (*m_particleConverter)(*j,&part) ) {
actor(part);
}
}
- return data->size();
+ return data_ptr->size();
}
}
return 0;
@@ -170,8 +170,8 @@ Int_t DDG4EventHandler::ReadEvent(Long64_t event_number) {
printout(ERROR,"DDG4EventHandler","+++ ReadEvent: Read %d bytes of event data for entry:%d",nbytes,event_number);
for(Branches::const_iterator i=m_branches.begin(); i != m_branches.end(); ++i) {
TBranch* b = (*i).second.first;
- std::vector<void*>* data = *(std::vector<void*>**)b->GetAddress();
- m_data[b->GetClassName()].push_back(make_pair(b->GetName(),data->size()));
+ std::vector<void*>* ptr_data = *(std::vector<void*>**)b->GetAddress();
+ m_data[b->GetClassName()].push_back(make_pair(b->GetName(),ptr_data->size()));
}
m_hasEvent = true;
return nbytes;
diff --git a/DDEve/src/Display.cpp b/DDEve/src/Display.cpp
index 90bbe52c7abd76dbeb2f4d3da2a356a884cae33f..e8e95cdca04d17b4c6d5b9e29de1c446ccf87d45 100644
--- a/DDEve/src/Display.cpp
+++ b/DDEve/src/Display.cpp
@@ -372,8 +372,8 @@ void Display::OnNewEvent(EventHandler* handler ) {
printout(ERROR,"EventHandler","+++ Display new event.....");
manager().GetEventScene()->DestroyElements();
- for(Types::const_iterator i=types.begin(); i!=types.end(); ++i) {
- const Collections& colls = (*i).second;
+ for(Types::const_iterator ityp=types.begin(); ityp!=types.end(); ++ityp) {
+ const Collections& colls = (*ityp).second;
for(Collections::const_iterator j=colls.begin(); j!=colls.end(); ++j) {
size_t len = (*j).second;
const char* nam = (*j).first;
diff --git a/DDEve/src/EveShapeContextMenu.cpp b/DDEve/src/EveShapeContextMenu.cpp
index 3c04214ff3822661bced23ce9ce2f96365be7d2f..202797703335379b6950dbe1c7ca2e51d54b837c 100644
--- a/DDEve/src/EveShapeContextMenu.cpp
+++ b/DDEve/src/EveShapeContextMenu.cpp
@@ -29,8 +29,8 @@ EveShapeContextMenu& EveShapeContextMenu::install(Display* m) {
}
/// Initializing constructor
-EveShapeContextMenu::EveShapeContextMenu(Display* display)
- : EveUserContextMenu(display)
+EveShapeContextMenu::EveShapeContextMenu(Display* disp)
+ : EveUserContextMenu(disp)
{
InstallGeometryContextMenu(TEveGeoShape::Class());
}
diff --git a/DDEve/src/FrameControl.cpp b/DDEve/src/FrameControl.cpp
index ded0848b2a9a0a3cdb99afc6aceb148adec98a08..4481c54c2bd4fde06d1f275850ad094d6452809f 100644
--- a/DDEve/src/FrameControl.cpp
+++ b/DDEve/src/FrameControl.cpp
@@ -24,8 +24,8 @@ using namespace DD4hep;
ClassImp(FrameControl)
/// Standard constructor
-FrameControl::FrameControl(TGClient* client, const std::string& name, unsigned int width, unsigned int height)
-: TGMainFrame(client->GetRoot(), width, height), m_client(client), m_frame(0)
+FrameControl::FrameControl(TGClient* cl, const std::string& name, unsigned int width, unsigned int height)
+: TGMainFrame(cl->GetRoot(), width, height), m_client(cl), m_frame(0)
{
SetWindowName(name.c_str());
SetCleanup(kDeepCleanup);
diff --git a/DDEve/src/MultiView.cpp b/DDEve/src/MultiView.cpp
index b2ee83ff2f6667a4febc30ee3075228682bc83bf..d9e2866bf8e6503679dd9c4bd6403c4a9e7dc1c5 100644
--- a/DDEve/src/MultiView.cpp
+++ b/DDEve/src/MultiView.cpp
@@ -31,7 +31,7 @@ static void _build(Display* display, View* v, TEveWindowSlot* slot) {
}
/// Initializing constructor
-MultiView::MultiView(Display* eve, const string& name) : View(eve, name)
+MultiView::MultiView(Display* eve, const string& nam) : View(eve, nam)
{
}
diff --git a/DDEve/src/Projection.cpp b/DDEve/src/Projection.cpp
index d4ec4293b827648d98a9dc2e747cd100e6f8ee10..dcaee9203a1acbdf0f04498878f9bf31c8cc02ec 100644
--- a/DDEve/src/Projection.cpp
+++ b/DDEve/src/Projection.cpp
@@ -23,8 +23,8 @@ using namespace std;
using namespace DD4hep;
/// Initializing constructor
-Projection::Projection(Display* eve, const string& name)
- : View(eve, name), m_projMgr(0), m_axis(0)
+Projection::Projection(Display* eve, const string& nam)
+ : View(eve, nam), m_projMgr(0), m_axis(0)
{
}
diff --git a/DDEve/src/RhoPhiProjection.cpp b/DDEve/src/RhoPhiProjection.cpp
index f0b7c27e4df542c788c9266bb4df42a6647441a7..7931a0f60d276b64b8805e799f94253261f50d66 100644
--- a/DDEve/src/RhoPhiProjection.cpp
+++ b/DDEve/src/RhoPhiProjection.cpp
@@ -17,8 +17,8 @@ ClassImp(RhoPhiProjection)
DECLARE_VIEW_FACTORY(RhoPhiProjection)
/// Initializing constructor
-RhoPhiProjection::RhoPhiProjection(Display* eve, const std::string& name)
- : Projection(eve, name)
+RhoPhiProjection::RhoPhiProjection(Display* eve, const std::string& nam)
+ : Projection(eve, nam)
{
}
diff --git a/DDEve/src/RhoZProjection.cpp b/DDEve/src/RhoZProjection.cpp
index 4019ea80ed86df5cd477c32c91f5d2c565e5e9e1..b3a002af55a3d963e1adab13cb5d25ad970e9e91 100644
--- a/DDEve/src/RhoZProjection.cpp
+++ b/DDEve/src/RhoZProjection.cpp
@@ -18,8 +18,8 @@ ClassImp(RhoZProjection)
DECLARE_VIEW_FACTORY(RhoZProjection)
/// Initializing constructor
-RhoZProjection::RhoZProjection(Display* eve, const std::string& name)
- : Projection(eve, name)
+RhoZProjection::RhoZProjection(Display* eve, const std::string& nam)
+ : Projection(eve, nam)
{
}
diff --git a/DDEve/src/View.cpp b/DDEve/src/View.cpp
index 4967ada7599740ea666c2dc6a12c525feb525a52..865b3f7950c4f9525a39a77f587806ab8f735d3c 100644
--- a/DDEve/src/View.cpp
+++ b/DDEve/src/View.cpp
@@ -32,8 +32,8 @@ static inline typename T::const_iterator find(const T& c,const string& s) {
}
/// Initializing constructor
-View::View(Display* eve, const string& name)
- : m_eve(eve), m_view(0), m_geoScene(0), m_eveScene(0), m_global(0), m_name(name), m_showGlobal(false)
+View::View(Display* eve, const string& nam)
+ : m_eve(eve), m_view(0), m_geoScene(0), m_eveScene(0), m_global(0), m_name(nam), m_showGlobal(false)
{
m_config = m_eve->GetViewConfiguration(m_name);
InstanceCount::increment(this);
@@ -287,11 +287,11 @@ void View::ImportEvent(TEveElement* el) {
}
/// Access/Create a topic by name
-TEveElementList& View::GetGeoTopic(const string& name) {
- Topics::iterator i=m_geoTopics.find(name);
+TEveElementList& View::GetGeoTopic(const string& nam) {
+ Topics::iterator i=m_geoTopics.find(nam);
if ( i == m_geoTopics.end() ) {
- TEveElementList* topic = new ElementList(name.c_str(), name.c_str(), true, true);
- m_geoTopics[name] = topic;
+ TEveElementList* topic = new ElementList(nam.c_str(), nam.c_str(), true, true);
+ m_geoTopics[nam] = topic;
return *topic;
}
return *((*i).second);
@@ -308,9 +308,9 @@ View& View::CreateScenes() {
/// Create the event scene
View& View::CreateEventScene() {
if ( 0 == m_eveScene ) {
- string name = m_name+" - Event Data";
+ string nam = m_name+" - Event Data";
string tool = m_name+" - Scene holding projected event-data for the view.";
- m_eveScene = m_eve->manager().SpawnNewScene(name.c_str(), tool.c_str());
+ m_eveScene = m_eve->manager().SpawnNewScene(nam.c_str(), tool.c_str());
}
return *this;
}
@@ -318,9 +318,9 @@ View& View::CreateEventScene() {
/// Create the geometry scene
View& View::CreateGeoScene() {
if ( 0 == m_geoScene ) {
- string name = m_name+" - Geometry";
+ string nam = m_name+" - Geometry";
string tool = m_name+" - Scene holding projected geometry for the view.";
- m_geoScene = m_eve->manager().SpawnNewScene(name.c_str(), tool.c_str());
+ m_geoScene = m_eve->manager().SpawnNewScene(nam.c_str(), tool.c_str());
}
return *this;
}
diff --git a/DDEve/src/View3D.cpp b/DDEve/src/View3D.cpp
index 3075df79b28f3b3feb44bce8f3dd544d6b679a36..5a0e29a615b9b6106138b0d371a3ad6f918d2f82 100644
--- a/DDEve/src/View3D.cpp
+++ b/DDEve/src/View3D.cpp
@@ -17,7 +17,7 @@ ClassImp(View3D)
DECLARE_VIEW_FACTORY(View3D)
/// Initializing constructor
-View3D::View3D(Display* eve, const std::string& name) : View(eve, name)
+View3D::View3D(Display* eve, const std::string& nam) : View(eve, nam)
{
}
diff --git a/DDEve/src/ViewMenu.cpp b/DDEve/src/ViewMenu.cpp
index 017c9edb4b3b28936e1665962c3ad7eb86c7a6fc..9b77538dab72a106685a38d55e194866bd830b99 100644
--- a/DDEve/src/ViewMenu.cpp
+++ b/DDEve/src/ViewMenu.cpp
@@ -50,16 +50,16 @@ ViewMenu::~ViewMenu() {
/// Add the menu to the menu bar
void ViewMenu::Build(TGMenuBar* bar, int hints) {
pair<string,string>* p = 0;
- PopupMenu* menu = this;
- menu->AddEntry("3&D View", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__View3D","3D"));
- menu->AddEntry("Rho-&Z Projection", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__RhoZProjection","Rho-Z"));
- menu->AddEntry("Rho-&Phi Projection",this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__RhoPhiProjection","Rho-Phi"));
+ PopupMenu* view_menu = this;
+ view_menu->AddEntry("3&D View", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__View3D","3D"));
+ view_menu->AddEntry("Rho-&Z Projection", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__RhoZProjection","Rho-Z"));
+ view_menu->AddEntry("Rho-&Phi Projection",this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__RhoPhiProjection","Rho-Phi"));
const Display::ViewConfigurations& vc = m_display->viewConfigurations();
for(Display::ViewConfigurations::const_iterator i=vc.begin(); i!=vc.end(); ++i) {
const Display::ViewConfig& v = (*i).second;
- menu->AddEntry(v.name.c_str(), this, &ViewMenu::CreateView,p=new pair<string,string>("DD4hep__"+v.type,v.name));
+ view_menu->AddEntry(v.name.c_str(), this, &ViewMenu::CreateView,p=new pair<string,string>("DD4hep__"+v.type,v.name));
}
- bar->AddPopup(m_title.c_str(),*menu, new TGLayoutHints(hints, 0, 4, 0, 0));
+ bar->AddPopup(m_title.c_str(),*view_menu, new TGLayoutHints(hints, 0, 4, 0, 0));
}
/// Create a new generic view
diff --git a/UtilityApps/src/converter.cpp b/UtilityApps/src/converter.cpp
index fbd0a39aeb0fe6fe94b1dbec9cfa29b8a48759c0..52927190ca6c7c5be22e59c6457b517a63ddca84 100644
--- a/UtilityApps/src/converter.cpp
+++ b/UtilityApps/src/converter.cpp
@@ -79,8 +79,8 @@ int main(int argc,char** argv) {
LCDD& lcdd = dd4hep_instance();
// Load compact files
for(size_t i=0; i<geo_files.size(); ++i) {
- const char* argv[] = {geo_files[i], 0};
- run_plugin(lcdd,"DD4hepCompactLoader",1,(char**)argv);
+ const char* plugin_argv[] = {geo_files[i], 0};
+ run_plugin(lcdd,"DD4hepCompactLoader",1,(char**)plugin_argv);
}
// Create volume manager and populate it required
if ( volmgr ) run_plugin(lcdd,"DD4hepVolumeManager",0,0);
diff --git a/examples/ClientTests/src/FCC_HcalBarrel_geo.cpp b/examples/ClientTests/src/FCC_HcalBarrel_geo.cpp
index 8aebf909ce0c4aa9dbc15dfa000b730574f67ef2..571d2cc97718016aad3412f7e70787eff496aed9 100644
--- a/examples/ClientTests/src/FCC_HcalBarrel_geo.cpp
+++ b/examples/ClientTests/src/FCC_HcalBarrel_geo.cpp
@@ -141,7 +141,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
// Place the same layer around the beam axis phiBins times
Transform3D tr(RotationZYX(M_PI*0.5,M_PI*0.5,0),Translation3D(r,0,layer_pos_z));
- PlacedVolume pv = stave_vol.placeVolume(layer_vol,tr);
+ pv = stave_vol.placeVolume(layer_vol,tr);
pv.addPhysVolID("layer",layer_num);
r += dr;
cout << "+++ R=" << r << endl;
@@ -156,7 +156,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
//double pos_x = mod_x_off * cos(phi) - mod_y_off * sin(phi);
//double pos_y = mod_x_off * sin(phi) + mod_y_off * cos(phi);
Transform3D tr(RotationZYX(phi,0,0),Translation3D(0,0,0));
- PlacedVolume pv = calo_vol.placeVolume(stave_vol,tr);
+ pv = calo_vol.placeVolume(stave_vol,tr);
pv.addPhysVolID("stave",i+1);
}
diff --git a/examples/ClientTests/src/MaterialTester_geo.cpp b/examples/ClientTests/src/MaterialTester_geo.cpp
index 72a0ced02a37becb04d50a43532f6d0fa3796fc5..d8d7c428d9a69009d9cf142e3e8c0e2a88368780 100644
--- a/examples/ClientTests/src/MaterialTester_geo.cpp
+++ b/examples/ClientTests/src/MaterialTester_geo.cpp
@@ -17,8 +17,8 @@ using namespace std;
using namespace DD4hep;
using namespace DD4hep::Geometry;
-static Ref_t create_element(LCDD& lcdd, xml_h e, SensitiveDetector /* sens */) {
- xml_det_t x_det = e;
+static Ref_t create_element(LCDD& lcdd, xml_h xml_det, SensitiveDetector /* sens */) {
+ xml_det_t x_det = xml_det;
string det_name = x_det.nameStr();
Assembly assembly(det_name+"_assembly");
DetElement det(det_name,x_det.typeStr(), x_det.id());