Merge pull request #5 from cms-sw/CMSSW_7_5_X

PRToFixMess_RPC4RE11Geometry_PR

Author: pietverwilligen

DQM/Integration/scripts/dqmdata_cleaner.py

@@ -214,6 +214,8 @@ void LogMessageMonitor::bookHistograms(DQMStore::IBooker & ibooker,
 
    histname = pluginsMonName_+"ErrorsVsModules";
    CategoriesVsModules = ibooker.book2D(histname, histname, nModules, 0., double(nModules), nCategories, 0., double(nCategories) );
+   CategoriesVsModules->getTH1()->GetXaxis()->SetNoAlphanumeric();
+   CategoriesVsModules->getTH1()->GetYaxis()->SetNoAlphanumeric();
    CategoriesVsModules->setAxisTitle("modules",1);
    for (size_t imodule = 0; imodule < nModules; imodule++)
      CategoriesVsModules->setBinLabel(imodule+1,modules_vector_[imodule],1);

DQM/TrackingMonitor/src/LogMessageMonitor.cc

@@ -7,32 +7,26 @@
 #include <map>
 
 //! analagous to geant4/source/global/HEPGeometry/include/geomdefs.hh
-namespace DDI
-{
-  enum DDAxes {x, y, z, rho, radial3D, phi, undefined};
-};
+
+enum class DDAxes {x, y, z, rho, radial3D, phi, undefined};
 
 class AxesNames
 {  
  public:
   AxesNames();
   ~AxesNames();
 
-  const std::string name( const DDI::DDAxes& s );
-  
-  DDI::DDAxes index(const std::string & s);
+  const std::string name( const DDAxes& s );
 
  private:
-  std::map<std::string, DDI::DDAxes> axesmap_;
+  std::map<std::string, DDAxes> axesmap_;
 };
 
 class DDAxesNames : public DDI::Singleton<AxesNames>
 {
  public:
 
-  static const std::string name( const DDI::DDAxes& s );
-  
-  static DDI::DDAxes index( const std::string & s );
+  static const std::string name( const DDAxes& s );
 };	   
 
 #endif // DDAxes_h

DetectorDescription/Core/interface/DDAxes.h

@@ -85,7 +85,7 @@ class DDDivision : public DDBase<DDName, DDI::Division*>
    */
   DDDivision(const DDName & name,
              const DDLogicalPart & parent,
-	     const DDI::DDAxes axis,
+	     const DDAxes axis,
 	     const int nReplicas,
 	     const double width,
 	     const double offset );
@@ -96,7 +96,7 @@ class DDDivision : public DDBase<DDName, DDI::Division*>
    */
   DDDivision(const DDName & name,
 	     const DDLogicalPart & parent,
-	     const DDI::DDAxes axis,
+	     const DDAxes axis,
 	     const int nReplicas,
 	     const double offset );
 
@@ -105,13 +105,13 @@ class DDDivision : public DDBase<DDName, DDI::Division*>
    */
   DDDivision(const DDName & name,
              const DDLogicalPart & parent,
-	     const DDI::DDAxes axis,
+	     const DDAxes axis,
 	     const double width,
 	     const double offset );
 
   //  virtual ~G4PVDivision();
 
-  DDI::DDAxes axis() const;
+  DDAxes axis() const;
   int nReplicas() const;
   double width() const;
   double offset() const;

DetectorDescription/Core/interface/DDDivision.h

@@ -1,40 +1,24 @@
 #include "DetectorDescription/Core/interface/DDAxes.h"
 
-using namespace DDI;
-
 AxesNames::AxesNames()
-  : axesmap_{{"x", x }, {"y", y}, {"z", z}, {"rho", rho}, {"radial3D", radial3D}, {"phi", phi}, {"undefined", undefined }}
+  : axesmap_{{"x", DDAxes::x }, {"y", DDAxes::y}, {"z", DDAxes::z}, {"rho", DDAxes::rho}, {"radial3D", DDAxes::radial3D}, {"phi", DDAxes::phi}, {"undefined", DDAxes::undefined }}
 {}
 
 AxesNames::~AxesNames() { }
 
 const std::string
 AxesNames::name(const DDAxes& s) 
 {
-  std::map<std::string, DDAxes>::const_iterator it;
-
-  for(it = axesmap_.begin(); it != axesmap_.end(); ++it)
+  for( const auto& it : axesmap_ )
   {
-    if(it->second == s)
-      break;
+    if( it.second == s )
+      return it.first;
   }
-  return it->first;
-}
-
-DDAxes
-AxesNames::index(const std::string & s)
-{
-  return axesmap_[s];
+  return "undefined";
 }
 
 const std::string
 DDAxesNames::name(const DDAxes& s) 
 {
   return instance().name(s);
 }
-
-DDAxes
-DDAxesNames::index(const std::string & s) 
-{
-  return instance().index(s);
-}