diff --git a/DDAlign/include/DDAlign/GlobalAlignmentStack.h b/DDAlign/include/DDAlign/GlobalAlignmentStack.h index 4b8dd9bd82e0957167dd73902b5e5f2217f8b1e9..75483b75f36565db075c050953f2bd713f72f6b0 100644 --- a/DDAlign/include/DDAlign/GlobalAlignmentStack.h +++ b/DDAlign/include/DDAlign/GlobalAlignmentStack.h @@ -86,7 +86,7 @@ namespace dd4hep { /// Check flag if the node location and all children should be reset bool resetChildren() const { return delta.checkFlag(RESET_CHILDREN); } - /// Set flag to reset the entry to it's ideal geometrical position + /// Set flag to reset the entry to its ideal geometrical position StackEntry& setReset(bool new_value=true); /// Set flag to reset the entry's children to their ideal geometrical position StackEntry& setResetChildren(bool new_value=true); diff --git a/DDAlign/src/GlobalAlignmentStack.cpp b/DDAlign/src/GlobalAlignmentStack.cpp index 5b88c51dead2c31a8e53c6a4cdeb98b3dcc943cc..aa166d88de25174d6353187b1f5f6dd21d4bd8b4 100644 --- a/DDAlign/src/GlobalAlignmentStack.cpp +++ b/DDAlign/src/GlobalAlignmentStack.cpp @@ -51,7 +51,7 @@ GlobalAlignmentStack::StackEntry::~StackEntry() { InstanceCount::decrement(this); } #if 0 -/// Set flag to reset the entry to it's ideal geometrical position +/// Set flag to reset the entry to its ideal geometrical position GlobalAlignmentStack::StackEntry& GlobalAlignmentStack::StackEntry::setReset(bool new_value) { new_value ? (delta.flags |= RESET_VALUE) : (delta.flags &= ~RESET_VALUE); return *this; diff --git a/DDCore/include/DD4hep/AlignmentData.h b/DDCore/include/DD4hep/AlignmentData.h index 4680bd3f33788f3ab987a330b4077606b342e25f..a0343a793d42768a894dc2a68d4d8fc2226ca9fe 100644 --- a/DDCore/include/DD4hep/AlignmentData.h +++ b/DDCore/include/DD4hep/AlignmentData.h @@ -85,7 +85,7 @@ namespace dd4hep { bool hasRotation() const { return checkFlag(HAVE_ROTATION); } /// Access flags: Check if the delta operation contains a pivot bool hasPivot() const { return checkFlag(HAVE_PIVOT); } - /// Compute the alignment delta for one detector element and it's alignment condition + /// Compute the alignment delta for one detector element and its alignment condition void computeMatrix(TGeoHMatrix& tr_delta) const; }; diff --git a/DDCore/include/DD4hep/DD4hepRootPersistency.h b/DDCore/include/DD4hep/DD4hepRootPersistency.h index c6e9db1b4f79e4327243f17b4c1c6071c8f24f69..45d047a02722dbb277e9cb95a5923d622001a8fd 100644 --- a/DDCore/include/DD4hep/DD4hepRootPersistency.h +++ b/DDCore/include/DD4hep/DD4hepRootPersistency.h @@ -79,7 +79,7 @@ public: const HandleMap& readouts() const { return m_data->m_readouts; } /// Accessor to the map of sub-detectors const HandleMap& detectors() const { return m_data->m_detectors; } - /// Retrieve a sensitive detector by it's name from the detector description + /// Retrieve a sensitive detector by its name from the detector description const HandleMap& sensitiveDetectors() const { return m_data->m_sensitive; } /// Accessor to the map of field entries, which together form the global field const HandleMap& fields() const { return m_data->m_fields; } diff --git a/DDCore/include/DD4hep/DetectorData.h b/DDCore/include/DD4hep/DetectorData.h index abb135c3add70c62d716a7450e93b7962d06ccde..5d0455d16364b020d7de57d8beb482612aec4d38 100644 --- a/DDCore/include/DD4hep/DetectorData.h +++ b/DDCore/include/DD4hep/DetectorData.h @@ -198,7 +198,7 @@ namespace dd4hep { const Detector::HandleMap& readouts() const { return m_readouts; } /// Accessor to the map of sub-detectors const Detector::HandleMap& detectors() const { return m_detectors; } - /// Retrieve a sensitive detector by it's name from the detector description + /// Retrieve a sensitive detector by its name from the detector description const Detector::HandleMap& sensitiveDetectors() const { return m_sensitive; } /// Accessor to the map of field entries, which together form the global field const Detector::HandleMap& fields() const { return m_fields; } diff --git a/DDCore/include/DD4hep/DetectorHelper.h b/DDCore/include/DD4hep/DetectorHelper.h index 5772d6a2400cd3b42d39aaf3d9f303f2634932ec..8efe0836d1339322d88ad42e3a2551befcfce9c0 100644 --- a/DDCore/include/DD4hep/DetectorHelper.h +++ b/DDCore/include/DD4hep/DetectorHelper.h @@ -47,9 +47,9 @@ namespace dd4hep { DetectorHelper& operator=(const DetectorHelper& c) = default; /// Access the sensitive detector of a given subdetector (if the sub-detector is sensitive!) SensitiveDetector sensitiveDetector(const std::string& detector) const; - /// Given a detector element, access it's sensitive detector (if the sub-detector is sensitive!) + /// Given a detector element, access its sensitive detector (if the sub-detector is sensitive!) SensitiveDetector sensitiveDetector(DetElement detector) const; - /// Find a detector element by it's system ID + /// Find a detector element by its system ID DetElement detectorByID(int id) const; /// Access an element from the element table by name Atom element(const std::string& name) const; diff --git a/DDCore/include/DD4hep/DetectorImp.h b/DDCore/include/DD4hep/DetectorImp.h index 82ee08b2b11f16b95e2383623bccceb5dcf563cd..175940116ba6868b12d74f5676ddf0796d577545 100644 --- a/DDCore/include/DD4hep/DetectorImp.h +++ b/DDCore/include/DD4hep/DetectorImp.h @@ -236,40 +236,40 @@ namespace dd4hep { /// Typed access to constants: double values virtual double constantAsDouble(const std::string& name) const override; - /// Retrieve a constant by it's name from the detector description + /// Retrieve a constant by its name from the detector description virtual Constant constant(const std::string& name) const override; - /// Retrieve a limitset by it's name from the detector description + /// Retrieve a limitset by its name from the detector description virtual LimitSet limitSet(const std::string& name) const override { return getRefChild(m_limits, name); } - /// Retrieve a visualization attribute by it's name from the detector description + /// Retrieve a visualization attribute by its name from the detector description virtual VisAttr visAttributes(const std::string& name) const override { return getRefChild(m_display, name, false); } - /// Retrieve a matrial by it's name from the detector description + /// Retrieve a matrial by its name from the detector description virtual Material material(const std::string& name) const override; - /// Retrieve a region object by it's name from the detector description + /// Retrieve a region object by its name from the detector description virtual Region region(const std::string& name) const override { return getRefChild(m_regions, name); } - /// Retrieve a id descriptor by it's name from the detector description + /// Retrieve a id descriptor by its name from the detector description virtual IDDescriptor idSpecification(const std::string& name) const override { return getRefChild(m_idDict, name); } - /// Retrieve a readout object by it's name from the detector description + /// Retrieve a readout object by its name from the detector description virtual Readout readout(const std::string& name) const override { return getRefChild(m_readouts, name); } - /// Retrieve a subdetector element by it's name from the detector description + /// Retrieve a subdetector element by its name from the detector description virtual DetElement detector(const std::string& name) const override; //{ return getRefChild(m_detectors, name); } - /// Retrieve a sensitive detector by it's name from the detector description + /// Retrieve a sensitive detector by its name from the detector description virtual SensitiveDetector sensitiveDetector(const std::string& name) const override { return getRefChild(m_sensitive, name, false); } - /// Retrieve a subdetector element by it's name from the detector description + /// Retrieve a subdetector element by its name from the detector description virtual CartesianField field(const std::string& name) const override { return getRefChild(m_fields, name, false); } @@ -298,7 +298,7 @@ namespace dd4hep { virtual const HandleMap& detectors() const override { return m_detectors; } - /// Retrieve a sensitive detector by it's name from the detector description + /// Retrieve a sensitive detector by its name from the detector description virtual const HandleMap& sensitiveDetectors() const override { return m_sensitive; } diff --git a/DDCore/include/DD4hep/DetectorTools.h b/DDCore/include/DD4hep/DetectorTools.h index 4bebdacfa336e9b54f93a0351bcd1dd8e9bdf2d0..bdf6670a41f59068a5bd83a7a4d2aad750443fe8 100644 --- a/DDCore/include/DD4hep/DetectorTools.h +++ b/DDCore/include/DD4hep/DetectorTools.h @@ -48,9 +48,9 @@ namespace dd4hep { /// Collect detector elements to the top detector element (world) void elementPath(DetElement elt, ElementPath& detectors); - /// Find DetElement as child of the top level volume by it's absolute path + /// Find DetElement as child of the top level volume by its absolute path DetElement findElement(const Detector& description, const std::string& path); - /// Find DetElement as child of a parent by it's relative or absolute path + /// Find DetElement as child of a parent by its relative or absolute path DetElement findDaughterElement(DetElement parent, const std::string& subpath); /// Find path between the child element and the parent element bool isParentElement(DetElement parent, DetElement child); diff --git a/DDCore/include/DD4hep/Factories.h b/DDCore/include/DD4hep/Factories.h index 92116429056e921cef0134dd5535ae69bc08abed..1fb780f15062002846e8b1d8d05ceefdc6c17297 100644 --- a/DDCore/include/DD4hep/Factories.h +++ b/DDCore/include/DD4hep/Factories.h @@ -112,7 +112,7 @@ namespace dd4hep { static Handle<NamedObject> create(Detector& description); }; - /// Create an arbitrary object from it's XML representation. + /// Create an arbitrary object from its XML representation. /** * * \author M.Frank @@ -138,7 +138,7 @@ namespace dd4hep { static Handle<TObject> create(Detector& description, xml::Handle_t e); }; - /// Read an arbitrary XML document and analyze it's content + /// Read an arbitrary XML document and analyze its content /** * * \author M.Frank @@ -151,7 +151,7 @@ namespace dd4hep { static long create(Detector& description, xml::Handle_t e); }; - /// Read an arbitrary XML document and analyze it's content + /// Read an arbitrary XML document and analyze its content /** * * \author M.Frank diff --git a/DDCore/include/JSON/Elements.h b/DDCore/include/JSON/Elements.h index 6e44fd4304cc0bfc8d9a54e3cd05cc7520480bd8..ec5e604186e12584b5cac08c57d788b76ec34aef 100644 --- a/DDCore/include/JSON/Elements.h +++ b/DDCore/include/JSON/Elements.h @@ -183,13 +183,13 @@ namespace dd4hep { template <class T> T attr(const Attribute a) const { return this->attr<T>(this->attr_name(a)); } - /// Access typed attribute value by it's unicode name + /// Access typed attribute value by its unicode name template <class T> T attr(const char* name) const; /*** DOM Element child handling */ /// Check the existence of a child with a given tag name bool hasChild(const char* tag) const; - /// Access a single child by it's tag name (unicode) + /// Access a single child by its tag name (unicode) Handle_t child(const char* tag, bool throw_exception = true) const; /// Access a group of children identified by the same tag name NodeList children(const char* tag) const; @@ -411,7 +411,7 @@ namespace dd4hep { /// Retrieve a collection of all attributes of this element std::vector<Attribute> attributes() const { return m_element.attributes(); } - /// Access single attribute by it's name + /// Access single attribute by its name Attribute getAttr(const char* name) const; /// Access child by tag name. Thow an exception if required in case the child is not present Handle_t child(const char* tag_value, bool except = true) const diff --git a/DDCore/include/Parsers/detail/ChildValue.h b/DDCore/include/Parsers/detail/ChildValue.h index 899e33ff2caa739a1e512e10eb4edf9ecb7bb9cc..4b2f31cc55f9a27f1b0ec506c347e8c798791fd4 100644 --- a/DDCore/include/Parsers/detail/ChildValue.h +++ b/DDCore/include/Parsers/detail/ChildValue.h @@ -37,7 +37,7 @@ namespace dd4hep { * very easy way. * - You may assign any xml handle to a childvalue object * - Any child with the name and the value attribute set may then be accessed - * by it's natural way. All possible child names are + * by its natural way. All possible child names are * reflected by the object's member functions. * * IMPORTANT NOTE: diff --git a/DDCore/include/Parsers/detail/Dimension.h b/DDCore/include/Parsers/detail/Dimension.h index ceed06f94872ffcc24f1a87c06402ef4aa3c925a..93fd227151e889d3ba4a33c6271a72cf1c46be49 100644 --- a/DDCore/include/Parsers/detail/Dimension.h +++ b/DDCore/include/Parsers/detail/Dimension.h @@ -34,7 +34,7 @@ namespace dd4hep { * very easy way. * - You may assign any xml handle to a dimension object * - Any attribute of this xml element may then be accessed - * by it's natural way. All possible attribute names are + * by its natural way. All possible attribute names are * reflected by the Dimension object's member functions. * - If an attribute is requested and not present, a exception * is thrown. diff --git a/DDCore/include/XML/XMLElements.h b/DDCore/include/XML/XMLElements.h index 727ecc32c8b692a9c75b26a894f4ea5dca106e3d..0ff0a951abd606134dfe290f16355b8e8bf7e96e 100644 --- a/DDCore/include/XML/XMLElements.h +++ b/DDCore/include/XML/XMLElements.h @@ -453,9 +453,9 @@ namespace dd4hep { void removeAttrs() const; /// Set attributes as in argument handle void setAttrs(Handle_t e) const; - /// Access typed attribute value by it's unicode name + /// Access typed attribute value by its unicode name template <class T> T attr(const XmlChar* name) const; - /// Access typed attribute value by it's unicode name. If not existing returns default value + /// Access typed attribute value by its unicode name. If not existing returns default value template <class T> T attr(const XmlChar* name, T default_value) const; /// Generic attribute setter with unicode value @@ -477,11 +477,11 @@ namespace dd4hep { bool hasAttr(const char* t) const { return hasAttr(Strng_t(t)); } - /// Access typed attribute value by it's name + /// Access typed attribute value by its name template <class T> T attr(const char* name) const { return this->attr<T>(Strng_t(name)); } - /// Access typed attribute value by it's name + /// Access typed attribute value by its name template <class T> T attr(const char* name, const T& default_value) const { Strng_t tag(name); return this->hasAttr(tag) ? this->attr<T>(tag) : default_value; @@ -499,13 +499,13 @@ namespace dd4hep { */ /// Check the existence of a child with a given tag name bool hasChild(const XmlChar* tag) const; - /// Access a single child by it's tag name (unicode) + /// Access a single child by its tag name (unicode) Handle_t child(const XmlChar* tag, bool throw_exception = true) const; /// Access a group of children identified by the same tag name NodeList children(const XmlChar* tag) const; /// Access the number of children of this DOM element with a given tag name size_t numChildren(const XmlChar* tag, bool throw_exception) const; - /// Remove a single child node identified by it's handle from the tree of the element + /// Remove a single child node identified by its handle from the tree of the element Handle_t remove(Handle_t e) const; /// Remove children with a given tag name from the DOM node void removeChildren(const XmlChar* tag) const; @@ -850,11 +850,11 @@ namespace dd4hep { return m_element.attr<T>(tag_value, default_value); } #ifndef __TIXML__ - /// Access typed attribute value by it's name + /// Access typed attribute value by its name template <class T> T attr(const char* name) const { return this->attr<T>(Strng_t(name)); } - /// Access typed attribute value by it's name + /// Access typed attribute value by its name template <class T> T attr(const char* name, T default_value) const { return this->attr<T>(Strng_t(name), default_value); } @@ -883,7 +883,7 @@ namespace dd4hep { std::vector<Attribute> attributes() const { return m_element.attributes(); } - /// Access single attribute by it's name + /// Access single attribute by its name Attribute getAttr(const XmlChar* name) const; /// Set single attribute template <class T> diff --git a/DDCore/src/AlignmentData.cpp b/DDCore/src/AlignmentData.cpp index e01746b498e0f198557f83d18844e0e6efc9c472..cdc3af51dac9fac77d62134c80ca5a7a84cb343d 100644 --- a/DDCore/src/AlignmentData.cpp +++ b/DDCore/src/AlignmentData.cpp @@ -55,7 +55,7 @@ void Delta::clear() { rotation = RotationZYX(); } -/// Compute the alignment delta for one detector element and it's alignment condition +/// Compute the alignment delta for one detector element and its alignment condition void Delta::computeMatrix(TGeoHMatrix& tr_delta) const { const Delta& delta = *this; const Position& pos = delta.translation; diff --git a/DDCore/src/DetectorHelper.cpp b/DDCore/src/DetectorHelper.cpp index a9bce443c2d166b34aa6800c76a1ef2f250259b3..e0cc6ed7dfbb10fb3d02140db7d2a0102e2e0054 100644 --- a/DDCore/src/DetectorHelper.cpp +++ b/DDCore/src/DetectorHelper.cpp @@ -27,7 +27,7 @@ SensitiveDetector DetectorHelper::sensitiveDetector(const std::string& detector) return sensitive; } -/// Given a detector element, access it's sensitive detector (if the sub-detector is sensitive!) +/// Given a detector element, access its sensitive detector (if the sub-detector is sensitive!) SensitiveDetector DetectorHelper::sensitiveDetector(DetElement detector) const { for(DetElement par = detector; par.isValid(); par = par.parent()) { if ( par.ptr() != ptr()->world().ptr() ) { @@ -45,7 +45,7 @@ SensitiveDetector DetectorHelper::sensitiveDetector(DetElement detector) const return SensitiveDetector(); } -/// Find a detector element by it's system ID +/// Find a detector element by its system ID DetElement DetectorHelper::detectorByID(int id) const { const Detector::HandleMap& detectors = ptr()->detectors(); for(const auto& det : detectors ) { diff --git a/DDCore/src/DetectorImp.cpp b/DDCore/src/DetectorImp.cpp index 34050cc9731795c00c9a8e9e51d30f9023d09d2c..03482a4266f2957840821604d83df0d70ea3127c 100644 --- a/DDCore/src/DetectorImp.cpp +++ b/DDCore/src/DetectorImp.cpp @@ -410,7 +410,7 @@ void DetectorImp::setStdConditions(const std::string& type) { } } -/// Retrieve a subdetector element by it's name from the detector description +/// Retrieve a subdetector element by its name from the detector description DetElement DetectorImp::detector(const std::string& name) const { HandleMap::const_iterator i = m_detectors.find(name); if (i != m_detectors.end()) { @@ -486,7 +486,7 @@ Detector& DetectorImp::addConstant(const Handle<NamedObject>& x) { return *this; } -/// Retrieve a constant by it's name from the detector description +/// Retrieve a constant by its name from the detector description Constant DetectorImp::constant(const string& name) const { if ( !m_inhibitConstants ) { return getRefChild(m_define, name); @@ -528,7 +528,7 @@ Detector& DetectorImp::addField(const Handle<NamedObject>& x) { return *this; } -/// Retrieve a matrial by it's name from the detector description +/// Retrieve a matrial by its name from the detector description Material DetectorImp::material(const string& name) const { TGeoMedium* mat = m_manager->GetMedium(name.c_str()); if (mat) { diff --git a/DDCore/src/DetectorTools.cpp b/DDCore/src/DetectorTools.cpp index 6c4eaad3096eff1875a7c78eff76e35e0598375d..61d84ec5b6d45142d188a2c62afab0c0533dfb0e 100644 --- a/DDCore/src/DetectorTools.cpp +++ b/DDCore/src/DetectorTools.cpp @@ -211,12 +211,12 @@ string detail::tools::elementPath(DetElement element) { return elementPath(nodes); } -/// Find DetElement as child of the top level volume by it's absolute path +/// Find DetElement as child of the top level volume by its absolute path DetElement detail::tools::findElement(const Detector& description, const string& path) { return findDaughterElement(description.world(),path); } -/// Find DetElement as child of a parent by it's relative or absolute path +/// Find DetElement as child of a parent by its relative or absolute path DetElement detail::tools::findDaughterElement(DetElement parent, const string& subpath) { if ( parent.isValid() ) { size_t idx = subpath.find('/',1); diff --git a/DDCore/src/JSON/Elements.cpp b/DDCore/src/JSON/Elements.cpp index a1fc7dfe0626009ce03033d67a2ccdf47af2603e..af5d417cc6dd9ab8989adb1ee8bfb63bc03ec48f 100644 --- a/DDCore/src/JSON/Elements.cpp +++ b/DDCore/src/JSON/Elements.cpp @@ -294,7 +294,7 @@ size_t Handle_t::numChildren(const char* t, bool throw_exception) const { throw runtime_error(msg); } -/// Remove a single child node identified by it's handle from the tree of the element +/// Remove a single child node identified by its handle from the tree of the element Handle_t Handle_t::child(const char* t, bool throw_exception) const { Elt_t e = node_first(m_node, t); if (e || !throw_exception) diff --git a/DDCore/src/XML/XMLElements.cpp b/DDCore/src/XML/XMLElements.cpp index 8e3422d022dcf0a48bc8d25fdc934a7066dea777..00663287c03eb447e29ae1d0c201d159a7af9a19 100644 --- a/DDCore/src/XML/XMLElements.cpp +++ b/DDCore/src/XML/XMLElements.cpp @@ -682,7 +682,7 @@ size_t Handle_t::numChildren(const XmlChar* t, bool throw_exception) const { throw runtime_error(msg); } -/// Remove a single child node identified by it's handle from the tree of the element +/// Remove a single child node identified by its handle from the tree of the element Handle_t Handle_t::child(const XmlChar* t, bool throw_exception) const { Elt_t e = node_first(m_node, t); if (e || !throw_exception) @@ -704,7 +704,7 @@ void Handle_t::append(Handle_t e) const { _N(m_node)->appendChild(_N(e.ptr())); } -/// Remove a single child node identified by it's handle from the tree of the element +/// Remove a single child node identified by its handle from the tree of the element Handle_t Handle_t::remove(Handle_t node) const { #ifdef DD4HEP_USE_TINYXML bool e = (m_node && node.ptr() ? _N(m_node)->RemoveChild(_N(node.ptr())) : false); diff --git a/DDCore/src/XML/tinyxml_inl.h b/DDCore/src/XML/tinyxml_inl.h index 18d21bf076b0aa07ff8ff38a7c819513cbc7e8f5..9091b07649e75ea110a805261d96e13160d1e557 100644 --- a/DDCore/src/XML/tinyxml_inl.h +++ b/DDCore/src/XML/tinyxml_inl.h @@ -977,7 +977,7 @@ bool TiXmlDocument::LoadFile( const char* _filename, TiXmlEncoding encoding ) // value = filename // in the STL case, cause the assignment method of the std::string to // be called. What is strange, is that the std::string had the same - // address as it's c_str() method, and so bad things happen. Looks + // address as its c_str() method, and so bad things happen. Looks // like a bug in the Microsoft STL implementation. // Add an extra string to avoid the crash. TIXML_STRING filename( _filename ); diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp index dc2661812777cac729b767ffabc226e9efd23f51..131ce83c0b7d2d8d52f2fbec320ad0cdc13a0db6 100644 --- a/DDCore/src/plugins/Compact2Objects.cpp +++ b/DDCore/src/plugins/Compact2Objects.cpp @@ -156,7 +156,7 @@ static Ref_t create_SolenoidField(Detector& description, xml_h e) { CartesianField obj; SolenoidField* ptr = new SolenoidField(); // - // This logic is a bit weird, but has it's origin in the compact syntax: + // This logic is a bit weird, but has its origin in the compact syntax: // If no "inner_radius" is given, the "outer_radius" IS the "inner_radius" // and the "outer_radius" is given by one side of the world volume's box // @@ -1165,7 +1165,7 @@ template <> void Converter<CartesianField>::operator()(xml_h e) const { msg = "created"; } type = field.type(); - // Now update the field structure with the generic part ie. set it's properties + // Now update the field structure with the generic part ie. set its properties CartesianField::Properties& prp = field.properties(); for ( xml_coll_t c(e, _U(properties)); c; ++c ) { string props_name = c.attr<string>(_U(name)); diff --git a/DDDetectors/doc/README.ExtensionPlugins b/DDDetectors/doc/README.ExtensionPlugins index 8b8eeed624d1eaf9683ca0285026ac94c85d0cfb..d671c5e534660d9ace2286d3a2a02e916b68c512 100644 --- a/DDDetectors/doc/README.ExtensionPlugins +++ b/DDDetectors/doc/README.ExtensionPlugins @@ -10,7 +10,7 @@ helper objects (in dd4hep speak these are called Views). Some default views are provided by this package for some of the detector constructors of the "default subdetector palette". We first show how to invoke these plugins in order to attach the required -extension object and then briefly discuss the plugin palette and it's +extension object and then briefly discuss the plugin palette and its applicability to the various detector constructor types. Invokation of Extension Plugins diff --git a/DDDigi/include/DDDigi/DigiContext.h b/DDDigi/include/DDDigi/DigiContext.h index c02fe59c8ff14f5d56ccf1d0509d374eaa18409c..cfbd7e2e9c5eafe96b8273e0eef41288cbb3cf88 100644 --- a/DDDigi/include/DDDigi/DigiContext.h +++ b/DDDigi/include/DDDigi/DigiContext.h @@ -52,7 +52,7 @@ namespace dd4hep { * e.g. references for histogramming, logging, data access etc. * * This way any experiment/user related data processing framework can exhibit - * it's essential tools to DDG4 actions. + * its essential tools to DDG4 actions. * * A possible specialized implementations would look like the following: * diff --git a/DDG4/include/DDG4/Geant4Context.h b/DDG4/include/DDG4/Geant4Context.h index 250c20ab7fc2498a6f5d96380c5fd418419d101f..4a0df776ee6b40b4bd3e740a8c9ef64b001c3b3a 100644 --- a/DDG4/include/DDG4/Geant4Context.h +++ b/DDG4/include/DDG4/Geant4Context.h @@ -170,7 +170,7 @@ namespace dd4hep { * e.g. references for histogramming, logging, data access etc. * * This way any experiment/user related data processing framework can exhibit - * it's essential tools to DDG4 actions. + * its essential tools to DDG4 actions. * * A possible specialized implementations would look like the following: * diff --git a/DDG4/include/DDG4/Geant4InputHandling.h b/DDG4/include/DDG4/Geant4InputHandling.h index 3dc40ee76842eb78a0f9c1ec243c0add9cadcaa9..3a889b6a5a0a44417e9dabce3c5d55612a2f95d4 100644 --- a/DDG4/include/DDG4/Geant4InputHandling.h +++ b/DDG4/include/DDG4/Geant4InputHandling.h @@ -35,10 +35,10 @@ namespace dd4hep { /** Helpers to import and export G4 records */ - /// Create a vertex object from it's G4 counterpart + /// Create a vertex object from its G4 counterpart Geant4Vertex* createPrimary(const G4PrimaryVertex* g4); - /// Create a particle object from it's G4 counterpart + /// Create a particle object from its G4 counterpart Geant4Particle* createPrimary(int particle_id, const Geant4Vertex* v, const G4PrimaryParticle* g4p); /// Create a DDG4 interaction record from a Geant4 interaction defined by a primary vertex diff --git a/DDG4/include/DDG4/Geant4Kernel.h b/DDG4/include/DDG4/Geant4Kernel.h index ec9cec0a263d2b491e13172e84d3b7016a3a802c..2736fd970c34c5413f113e79fa88e30634ab0389 100644 --- a/DDG4/include/DDG4/Geant4Kernel.h +++ b/DDG4/include/DDG4/Geant4Kernel.h @@ -279,7 +279,7 @@ namespace dd4hep { /** Geant4 Multi threading support */ /// Create identified worker instance virtual Geant4Kernel& createWorker(); - /// Access worker instance by it's identifier + /// Access worker instance by its identifier Geant4Kernel& worker(unsigned long thread_identifier, bool create_if=false); /// Access number of workers int numWorkers() const; diff --git a/DDG4/include/DDG4/Geant4ParticleGenerator.h b/DDG4/include/DDG4/Geant4ParticleGenerator.h index 52d69ee0e4889bacb3fcbbf2134ec27ea24164d8..44aa717080b077248b8c69146a22636f001d392d 100644 --- a/DDG4/include/DDG4/Geant4ParticleGenerator.h +++ b/DDG4/include/DDG4/Geant4ParticleGenerator.h @@ -67,7 +67,7 @@ namespace dd4hep { /// Print single particle interaction identified by its mask virtual void printInteraction(int mask) const; - /// Print single particle interaction identified by it's reference + /// Print single particle interaction identified by its reference virtual void printInteraction(Geant4PrimaryInteraction* inter) const; diff --git a/DDG4/include/DDG4/Geant4ParticleGun.h b/DDG4/include/DDG4/Geant4ParticleGun.h index ff633b08aea64b8895359154532eddb30f83e82b..f1c46625f149b37787859c281df76361e7415343 100644 --- a/DDG4/include/DDG4/Geant4ParticleGun.h +++ b/DDG4/include/DDG4/Geant4ParticleGun.h @@ -41,8 +41,8 @@ namespace dd4hep { * The particle gun is a input source like any other and participates * in the general input stage merging process like any other input * e.g. from file. Hence, there may be several particle guns present - * each generating it's own primary vertex. Use the mask property to - * ensure each gun generates it's own, well identified primary vertex. + * each generating its own primary vertex. Use the mask property to + * ensure each gun generates its own, well identified primary vertex. * * There is one 'user lazyness' support though: * If there is only one particle gun in use, the property 'Standalone', diff --git a/DDG4/include/DDG4/Geant4Primary.h b/DDG4/include/DDG4/Geant4Primary.h index 09ac6c333b03bd15709e9bfed5505c50481be2f8..cd80e972a250af2593b696938b48166bdbfd46ae 100644 --- a/DDG4/include/DDG4/Geant4Primary.h +++ b/DDG4/include/DDG4/Geant4Primary.h @@ -167,7 +167,7 @@ namespace dd4hep { virtual ~Geant4PrimaryEvent(); /// Add a new interaction object to the event void add(int id, Geant4PrimaryInteraction* interaction); - /// Retrieve an interaction by it's ID + /// Retrieve an interaction by its ID Geant4PrimaryInteraction* get(int id) const; /// Number of interaction contained in the primary event size_t size() const { return m_interactions.size(); } diff --git a/DDG4/src/Geant4Kernel.cpp b/DDG4/src/Geant4Kernel.cpp index b85a3fbfb7c197d8ad237cab69886a5e2743e267..f3bcc53909ad04413eca9640d57478f38313db02 100644 --- a/DDG4/src/Geant4Kernel.cpp +++ b/DDG4/src/Geant4Kernel.cpp @@ -189,7 +189,7 @@ Geant4Kernel& Geant4Kernel::createWorker() { throw runtime_error(format("Geant4Kernel", "DDG4: Only the master instance may create workers.")); } -/// Access worker instance by it's identifier +/// Access worker instance by its identifier Geant4Kernel& Geant4Kernel::worker(unsigned long identifier, bool create_if) { if ( Workers::iterator i=m_workers.find(identifier); i != m_workers.end() ) { return *((*i).second); diff --git a/DDG4/src/Geant4ParticleGenerator.cpp b/DDG4/src/Geant4ParticleGenerator.cpp index b847e41937b64c2a6f47264d924e2580e63feb29..76361b7d388361c95b3feaf6caeb0bd2db930697 100644 --- a/DDG4/src/Geant4ParticleGenerator.cpp +++ b/DDG4/src/Geant4ParticleGenerator.cpp @@ -61,7 +61,7 @@ void Geant4ParticleGenerator::getParticleMultiplicity(int& ) const { void Geant4ParticleGenerator::getVertexPosition(ROOT::Math::XYZVector& ) const { } -/// Print single particle interaction identified by it's mask +/// Print single particle interaction identified by its mask void Geant4ParticleGenerator::printInteraction(int mask) const { Geant4PrimaryEvent* prim = context()->event().extension<Geant4PrimaryEvent>(); if ( !prim ) { @@ -76,7 +76,7 @@ void Geant4ParticleGenerator::printInteraction(int mask) const { printInteraction(inter); } -/// Print single particle interaction identified by it's reference +/// Print single particle interaction identified by its reference void Geant4ParticleGenerator::printInteraction(Geant4PrimaryInteraction* inter) const { int count = 0; if ( !inter ) { diff --git a/DDG4/src/Geant4Primary.cpp b/DDG4/src/Geant4Primary.cpp index f18280377ea801ca258faa5d43f9feeccf56dc7f..50be9eb76ca6d864939fa0d3d6e578d32b3a5234 100644 --- a/DDG4/src/Geant4Primary.cpp +++ b/DDG4/src/Geant4Primary.cpp @@ -104,7 +104,7 @@ void Geant4PrimaryEvent::add(int id, Geant4PrimaryInteraction* interaction) { except("Geant4PrimaryEvent","+++ CANNOT add invalid Interaction!"); } -/// Retrieve an interaction by it's ID +/// Retrieve an interaction by its ID Geant4PrimaryEvent::Interaction* Geant4PrimaryEvent::get(int mask) const { Interactions::const_iterator i = m_interactions.find(mask); return (i != m_interactions.end()) ? (*i).second : 0; diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md index d468475c535dcc73f45db40b7a64fd9d5b9d1d03..bd2aade93a18009421d997a84140ccd99ee5ae69 100644 --- a/doc/ReleaseNotes.md +++ b/doc/ReleaseNotes.md @@ -1408,7 +1408,7 @@ ```cpp dd4hep::Volume trackers = dd4hep::Description::trackingVolume() ``` - - Although the concept is available in the DD4hep core, it's configuration from XML is only implemented for the compact notation. For details see the example `examples/ClientTests/compact/TrackingRegion.xml`. + - Although the concept is available in the DD4hep core, its configuration from XML is only implemented for the compact notation. For details see the example `examples/ClientTests/compact/TrackingRegion.xml`. - If the volume should be connected to the world: connected="true". This is useful for debugging because the volume can be visualized else if the volume is part of the parallelworld: connected="false". The volume is always connected to the top level. The anchor detector element defines the base transformation to place the volume within the (parallel) world. ```xml @@ -1747,7 +1747,7 @@ A user defined implementations must be specialized somewhere in a compilation unit of the user framework, not in a header file. The framework object could host e.g. references for histogramming, logging, data access etc. - This way any experiment/user related data processing framework can exhibit it's essential tools to `DDG4` actions. + This way any experiment/user related data processing framework can exhibit its essential tools to `DDG4` actions. A possible specialized implementations would look like the following: ```cpp diff --git a/doc/usermanuals/DD4hep/chapters/basics.tex b/doc/usermanuals/DD4hep/chapters/basics.tex index 3c8677c6425dda98e483fd6c75ab3a45631c3e67..981bd2c5db00e1742be4412450b0b5abd072ceba 100644 --- a/doc/usermanuals/DD4hep/chapters/basics.tex +++ b/doc/usermanuals/DD4hep/chapters/basics.tex @@ -297,7 +297,7 @@ The basic interface of the \texttt{XML::Element} class allows to access tags and bool hasAttr(const XmlChar* name) const; /// Retrieve a collection of all attributes of this DOM element std::vector<Attribute> attributes() const; - /// Access single attribute by it's name + /// Access single attribute by its name Attribute getAttr(const XmlChar* name) const; /// Access attribute with implicit return type conversion template <class T> T attr(const XmlChar* tag) const; @@ -345,29 +345,29 @@ class Detector { ///+++ Access to geometry and detector description objects - /// Retrieve a constant by it's name from the detector description + /// Retrieve a constant by its name from the detector description virtual Constant constant(const std::string& name) const = 0; - /// Retrieve a matrial by it's name from the detector description + /// Retrieve a matrial by its name from the detector description virtual Material material(const std::string& name) const = 0; - /// Retrieve a field component by it's name from the detector description + /// Retrieve a field component by its name from the detector description virtual DetElement detector(const std::string& name) const = 0; - /// Retrieve a sensitive detector by it's name from the detector description + /// Retrieve a sensitive detector by its name from the detector description virtual SensitiveDetector sensitiveDetector(const std::string& name) const = 0; - /// Retrieve a readout object by it's name from the detector description + /// Retrieve a readout object by its name from the detector description virtual Readout readout(const std::string& name) const = 0; - /// Retrieve a id descriptor by it's name from the detector description + /// Retrieve a id descriptor by its name from the detector description virtual IDDescriptor idSpecification(const std::string& name) const = 0; - /// Retrieve a subdetector element by it's name from the detector description + /// Retrieve a subdetector element by its name from the detector description virtual CartesianFieldfield(const std::string& name) const = 0; ///+++ Access to visualisation attributes and Geant4 processing hints - /// Retrieve a visualization attribute by it's name from the detector description + /// Retrieve a visualization attribute by its name from the detector description virtual VisAttr visAttributes(const std::string& name) const = 0; - /// Retrieve a region object by it's name from the detector description + /// Retrieve a region object by its name from the detector description virtual Region region(const std::string& name) const = 0; - /// Retrieve a limitset by it's name from the detector description + /// Retrieve a limitset by its name from the detector description virtual LimitSet limitSet(const std::string& name) const = 0; //... @@ -1400,7 +1400,7 @@ PlacedVolume placeVolume(const Volume& volume, const Transform3D& tr) const; For more details of the \texttt{Volume} and the \texttt{PlacedVolume} classes please see the header file \texttt{Volumes.h}. -One volume like construct is special: the assembly constructs. Assemblies are volumes without shapes. The ``assembly'' shape does not own a own surface by itself, but rather defines it's surface and +One volume like construct is special: the assembly constructs. Assemblies are volumes without shapes. The ``assembly'' shape does not own a own surface by itself, but rather defines its surface and bounding box from the contained children. In this corner also the implementation concepts between TGeo and Geant4 diverge. Whereas TGeo handles assemblies very similar to real volumes, in Geant4 assemblies are purely artificial and disappear at the very moment volumes are placed. \section{Detector Elements} @@ -1613,7 +1613,7 @@ Constant Electric or Magnetic Fields are defined as follows: <strength x="x-val" y="y-val" z="z-val"/> </field> \end{minted} -The {\texttt{field}} attribute accepts take the values {\texttt{[electric,magnetic]}} depending on it's nature. +The {\texttt{field}} attribute accepts take the values {\texttt{[electric,magnetic]}} depending on its nature. Magnetic Dipoles are defined as follows: \begin{minted}[frame=single,framesep=3pt,breaklines=true,tabsize=2,linenos,fontsize=\small]{c++} @@ -1810,7 +1810,7 @@ DECLARE_DETELEMENT(CylindricalEndcapCalorimeter,create_detector); 48 & It identify uniquely every slice within the layer an identifier (here the number of the created slice) is attached. This identifier must be present in the bitmap defined by the \texttt{IDDescriptor} of this subdetector.\\ 52-55 & Same as 46-48, but now the created layer volume is placed in the envelope of the entire subdetector.\\ 59 & Set envelope attributes.\\ -61 & Construct the main detector element of this subdetector.This will be the unique entry point to access any information of the subdetector. {\textbf{Note:}} the subdetector my consist of a hierarchy of detector elements.For example each layer could be described by it's own \texttt{DetElement} and alllayer-\texttt{DetElement} instances being children of the subdetector instance.\\ +61 & Construct the main detector element of this subdetector.This will be the unique entry point to access any information of the subdetector. {\textbf{Note:}} the subdetector my consist of a hierarchy of detector elements.For example each layer could be described by its own \texttt{DetElement} and alllayer-\texttt{DetElement} instances being children of the subdetector instance.\\ 62-62 & Place the subdetector envelope into its mother (typically the top level (world) volume).\\ 64-65 & Add the missing \texttt{IDDescriptor} identifiers to complete the bitmap.\\ 66 & Store the placement in the subdetector detector element in order to make it availible to later clients of this \texttt{DetElement}. \\ diff --git a/doc/usermanuals/DDG4/sections/Components.tex b/doc/usermanuals/DDG4/sections/Components.tex index 3fcbd78da16d6df99e8e4091375b2e4e3e31ec96..119b41ff313dc46c153691a81afc1d78a09ef145 100644 --- a/doc/usermanuals/DDG4/sections/Components.tex +++ b/doc/usermanuals/DDG4/sections/Components.tex @@ -454,8 +454,8 @@ detector to be simulated. The particle gun is a input source like any other and participates in the general input stage merging process like any other input e.g. from file. Hence, there may be several particle guns present -each generating it's own primary vertex. Use the mask property to -ensure each gun generates it's own, well identified primary vertex. +each generating its own primary vertex. Use the mask property to +ensure each gun generates its own, well identified primary vertex. \noindent There is one 'user lazyness' support though: diff --git a/doc/usermanuals/DDG4/sections/MT.tex b/doc/usermanuals/DDG4/sections/MT.tex index c03351f1719a89cacc37c7da1ec287ac808f13a3..47c051422c93fe8bd47714ae1ab664fa915e1d0c 100644 --- a/doc/usermanuals/DDG4/sections/MT.tex +++ b/doc/usermanuals/DDG4/sections/MT.tex @@ -113,7 +113,7 @@ The callbacks and the expected functionality are: %============================================================================= \noindent \DDG provides thread related context, which may be accessed or modified -by user code. This context, the {\tts{Geant4Context}} and it's sub-components, +by user code. This context, the {\tts{Geant4Context}} and its sub-components, as discussed in Section~\ref{sec:ddg4-implementation-higher-level-components} are available as separate instances for each event and as such also independently for each worker thread. Hence, no user level locking of the diff --git a/examples/DDDB/include/DDDB/DDDBDimension.h b/examples/DDDB/include/DDDB/DDDBDimension.h index e5df53dd27ef47c5ca5c042ef76550a8afeb894d..f5bedea23e69ffaa380f71b30d25e5476b268d4a 100644 --- a/examples/DDDB/include/DDDB/DDDBDimension.h +++ b/examples/DDDB/include/DDDB/DDDBDimension.h @@ -36,7 +36,7 @@ namespace dd4hep { * very easy way. * - You may assign any xml handle to a dimension object * - Any attribute of this xml element may then be accessed - * by it's natural way. All possible attribute names are + * by its natural way. All possible attribute names are * reflected by the Dimension object's member functions. * - If an attribute is requested and not present, a exception * is thrown. diff --git a/examples/DDDB/include/Detector/IDetService.h b/examples/DDDB/include/Detector/IDetService.h index 1daf8c186654712a62dc5d02d60acfc2f62bb809..4837c069a86ebc3954b62dcffa8b48c228825afa 100644 --- a/examples/DDDB/include/Detector/IDetService.h +++ b/examples/DDDB/include/Detector/IDetService.h @@ -65,7 +65,7 @@ namespace gaudi { /// Retrive existing and registered conditions content object by name virtual Content getContent(const std::string& name) = 0; - /// Add a condition address to the content. Condition is identified by it's global key + /// Add a condition address to the content. Condition is identified by its global key virtual void addContent(Content& content, Condition::key_type key, const std::string& address) = 0; diff --git a/examples/DDDB/src/plugins/DetService.cpp b/examples/DDDB/src/plugins/DetService.cpp index 2781be532ff9b207d095ea3883ada236eec447d3..9e54ffa1accc505fbeb8f5fec05c0f6791771be9 100644 --- a/examples/DDDB/src/plugins/DetService.cpp +++ b/examples/DDDB/src/plugins/DetService.cpp @@ -87,7 +87,7 @@ DetService::Content DetService::openContent(const string& nam) { return Content(); } -/// Add a condition address to the content. Condition is identified by it's global key +/// Add a condition address to the content. Condition is identified by its global key bool DetService::_addContent(Content& content, Condition::key_type key, const std::string& address) { @@ -103,7 +103,7 @@ bool DetService::_addContent(Content& content, return false; } -/// Add a condition address to the content. Condition is identified by it's global key +/// Add a condition address to the content. Condition is identified by its global key void DetService::addContent(Content& content, Condition::key_type key, const std::string& address) { diff --git a/examples/DDDB/src/plugins/DetService.h b/examples/DDDB/src/plugins/DetService.h index b517e5bec48a469df6164a20d071dcc8d2c0ce5f..b8d8522c495dd2d113da4fe0920b342cd95422ad 100644 --- a/examples/DDDB/src/plugins/DetService.h +++ b/examples/DDDB/src/plugins/DetService.h @@ -86,7 +86,7 @@ namespace gaudi { Slice _project(Content &content, Context *ctx, const IOVType *typ, EventStamp stamp); /// Remove content from cache bool _remove(CachedContents &cache, Content &content); - /// Add a condition address to the content. Condition is identified by it's global key + /// Add a condition address to the content. Condition is identified by its global key bool _addContent(Content &content, Condition::key_type key, const std::string &address); public: @@ -119,7 +119,7 @@ namespace gaudi { /// Open content creation context and copy items from registered object virtual Content getContent(const std::string &name) override; - /// Add a condition address to the content. Condition is identified by it's global key + /// Add a condition address to the content. Condition is identified by its global key virtual void addContent(Content &content, Condition::key_type key, const std::string &address) override;