Merge pull request #9294 from ianna/dd-algorithm-cleanup

DD Algorithm Cleanup
cms-sw · May 27, 2015 · ec68465 · ec68465
2 parents d22966f + 5d94dd9
commit ec68465
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 40 deletions.
diff --git a/DetectorDescription/Algorithm/BuildFile.xml b/DetectorDescription/Algorithm/BuildFile.xml
@@ -1,10 +1,7 @@
 <use   name="DetectorDescription/Base"/>
 <use   name="DetectorDescription/Core"/>
-<use   name="DetectorDescription/ExprAlgo"/>
 <use   name="FWCore/PluginManager"/>
 <use   name="clhep"/>
 <export>
   <lib   name="1"/>
 </export>
-
-###<!--- flags   CXXFLAGS="-DEDM_ML_DEBUG"/>
diff --git a/DetectorDescription/Algorithm/interface/DDAlgorithmFactory.h b/DetectorDescription/Algorithm/interface/DDAlgorithmFactory.h
@@ -1,21 +1,9 @@
 #ifndef DD_ALGO_PLUGIN_DD_ALGORITHM_FACTORY_H
 # define DD_ALGO_PLUGIN_DD_ALGORITHM_FACTORY_H
 
-//<<<<<< INCLUDES                                                       >>>>>>
-
 #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
-//<<<<<< PUBLIC DEFINES                                                 >>>>>>
-//<<<<<< PUBLIC CONSTANTS                                               >>>>>>
-//<<<<<< PUBLIC TYPES                                                   >>>>>>
-//<<<<<< PUBLIC VARIABLES                                               >>>>>>
-//<<<<<< PUBLIC FUNCTIONS                                               >>>>>>
-//<<<<<< CLASS DECLARATIONS                                             >>>>>>
-
 typedef edmplugin::PluginFactory<DDAlgorithm *(void)> DDAlgorithmFactory;
 
-//<<<<<< INLINE PUBLIC FUNCTIONS                                        >>>>>>
-//<<<<<< INLINE MEMBER FUNCTIONS                                        >>>>>>
-
 #endif // DD_ALGO_PLUGIN_DD_ALGORITHM_FACTORY_H
diff --git a/DetectorDescription/Algorithm/src/DDAlgorithmFactory.cc b/DetectorDescription/Algorithm/src/DDAlgorithmFactory.cc
@@ -1,27 +1,3 @@
-//<<<<<< INCLUDES                                                       >>>>>>
-
-//#include "Utilities/Configuration/interface/Architecture.h"
 #include "DetectorDescription/Algorithm/interface/DDAlgorithmFactory.h"
 
-//<<<<<< PRIVATE DEFINES                                                >>>>>>
-//<<<<<< PRIVATE CONSTANTS                                              >>>>>>
-//<<<<<< PRIVATE TYPES                                                  >>>>>>
-//<<<<<< PRIVATE VARIABLE DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC VARIABLE DEFINITIONS                                    >>>>>>
-//<<<<<< CLASS STRUCTURE INITIALIZATION                                 >>>>>>
-
-// DDAlgorithmFactory DDAlgorithmFactory::s_instance;
-
-//<<<<<< PRIVATE FUNCTION DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC FUNCTION DEFINITIONS                                    >>>>>>
-//<<<<<< MEMBER FUNCTION DEFINITIONS                                    >>>>>>
-
-// DDAlgorithmFactory::DDAlgorithmFactory (void)
-//     : seal::PluginFactory<DDAlgorithm *(void)> ("DDAlgorithm")
-// {}
-
-// DDAlgorithmFactory *
-// DDAlgorithmFactory::get (void)
-// { return &s_instance; }
-
 EDM_REGISTER_PLUGINFACTORY(DDAlgorithmFactory,"DDAlgorithm"); 
diff --git a/DetectorDescription/Algorithm/src/DDAngular.cc b/DetectorDescription/Algorithm/src/DDAngular.cc
@@ -84,7 +84,6 @@ DDAngular::initialize( const DDNumericArguments & nArgs,
   }
 
   m_idNameSpace = DDCurrentNamespace::ns();
-//   m_childName   = sArgs["ChildName"]; 
   m_childNmNs 	= DDSplit( sArgs["ChildName"] );
   if( m_childNmNs.second.empty())
     m_childNmNs.second = DDCurrentNamespace::ns();