Merge pull request #24313 from ianna/dd-name-cleanup

DD Name Cleanup

DetectorDescription/Core/interface/DDAlgorithmHandler.h

@@ -21,7 +21,7 @@ class DDAlgorithmHandler
   //! initializes the wrapped algorithm algo_ and does some pre- and post-processing
   /** pre- and postprocessing mainly covers exception handling,
       the algorithm object algo_ is fetched from the plugin-manager */
-  void initialize( const std::string & algoName,
+  void initialize( const DDName & algoName,
 		   const DDLogicalPart & parent,
 		   const DDNumericArguments & nArgs,
 		   const DDVectorArguments & vArgs,
@@ -34,8 +34,6 @@ class DDAlgorithmHandler
 
  private:
   std::unique_ptr<DDAlgorithm> algo_;   //!< the wrapped algorithm object
-  std::string algoname_; //!< name of the algorithm object
-  DDLogicalPart parent_; //!< parent logical part 
 };
 
 #endif //  DD_DDALGORITHMHANDLER_H

DetectorDescription/Core/interface/DDName.h

@@ -1,5 +1,5 @@
-#ifndef DDName_h
-#define DDName_h
+#ifndef DETECTOR_DESCRIPTION_CORE_DDNAME_H
+#define DETECTOR_DESCRIPTION_CORE_DDNAME_H
 
 #include <iosfwd>
 #include <map>
@@ -14,32 +14,23 @@ class DDCurrentNamespace;
 */
 class DDName
 {
-  friend class DStreamer; // intrusive!
-
 public:
 
-  typedef DDCurrentNamespace CNS;
-  typedef int id_type;
-  typedef std::map<std::pair<std::string,std::string>,id_type> Registry;
-  typedef std::vector<Registry::const_iterator> IdToName;
+  using id_type = int;
+  using Registry = std::map<std::pair<std::string, std::string>, id_type>;
+  using IdToName = std::vector<Registry::const_iterator>;
 
   //! Constructs a DDName with name \a name and assigns \a name to the namespace \a ns.
   DDName( const std::string & name,
-          const std::string & ns);
+          const std::string & ns );
 
   //! Creates a DDName with \a name in the current namespace defined in the singleton DDCurrentNamespace		
   DDName( const std::string & name );
   DDName( const char* name ); 
   DDName( const char* name, const char* ns );
-  // DDName(pair<int,int>);
-  DDName(id_type);
-  //! register pre-defined ids
-  static void defineId( const std::pair<std::string,std::string> &, id_type id);
 
   explicit DDName();
 
-  //! true, if a DDName with given name and namespace (ns) already is registerd, otherwise false
-  static bool exists(const std::string & name, const std::string & ns);
   //! Returns the \a name		
   const std::string & name() const;
 
@@ -51,44 +42,16 @@ class DDName
    */
   const std::string fullname() const { return ns() + ":" + name(); }
 
-  // DEPRECATED!!!
-  operator std::string() const { return ns() + ":" + name(); }
-
-  id_type id() const { return id_;}
-
   bool operator<(const DDName & rhs) const { return id_ < rhs.id_; }
   bool operator==(const DDName & rhs) const { return id_ == rhs.id_; }
 
 private:
+
   id_type id_;
 
-  static Registry::iterator registerName(const std::pair<std::string,std::string> & s);  
-};
-
-//! DDNameInterface provides a common interface to DDD entities
-/** DDLogicalPart, DDMaterial, DDSolids, ... all are uniquely identified by
-    their class and the value of their associated DDName. 
-    DDNameInterface provides read-access to their DDName.
-*/
-struct DDNameInterface
-{
-  virtual ~DDNameInterface() {}
-
-  //! Returns the \a name without the \a namespace
-  virtual const std::string & name() const=0;   // name without namespace
-
-  //! Return the \a namespace 
-  virtual const std::string & ns() const=0; // only the namespace 
-
-  //! Return the DDName
-  DDName ddname() const { return DDName(name(),ns()); } 
-
-  virtual operator bool() const=0;
-
-  //! \b don't \b use \b! 
-  virtual int id() const=0; // dont't know if usefull ...
+  static Registry::iterator registerName( const std::pair<std::string, std::string> & s );
 };
 
-std::ostream & operator<<(std::ostream & os, const DDName & n); 
+std::ostream & operator<<( std::ostream & os, const DDName & n ); 
 
 #endif

DetectorDescription/Core/src/DDAlgorithmHandler.cc

@@ -6,16 +6,15 @@
 class DDCompactView;
 
 void
-DDAlgorithmHandler::initialize( const std::string & algoName,
+DDAlgorithmHandler::initialize( const DDName & algoName,
 				const DDLogicalPart & parent,
 				const DDNumericArguments & nArgs,
 				const DDVectorArguments & vArgs,
 				const DDMapArguments & mArgs,
 				const DDStringArguments & sArgs,
 				const DDStringVectorArguments & svArgs )
 {
-  algoname_ = algoName;
-  algo_ = std::unique_ptr<DDAlgorithm>(DDAlgorithmFactory::get()->create( algoname_ ));
+  algo_ = std::unique_ptr<DDAlgorithm>(DDAlgorithmFactory::get()->create( algoName.fullname()));
   algo_->setParent( parent );
   algo_->initialize( nArgs, vArgs, mArgs, sArgs, svArgs );
 }