done?

drkovalskyi · May 6, 2014 · 45f239c · 45f239c
1 parent 2b575b9
commit 45f239c
Show file tree

Hide file tree

Showing 50 changed files with 110 additions and 110 deletions.
diff --git a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc
@@ -54,7 +54,7 @@ void testSiStripHashedDetId::initialize( const edm::EventSetup& setup ) {
   dets.reserve(16000);
   TrackerGeometry::DetUnitContainer::const_iterator iter = geom->detUnits().begin();
   for( ; iter != geom->detUnits().end(); ++iter ) {
-    const StripGeomDetUnit* strip = dynamic_cast<StripGeomDetUnit*>(*iter);
+    const auto strip = dynamic_cast<const StripGeomDetUnit*>(*iter);
     if( strip ) {
       dets.push_back( (strip->geographicalId()).rawId() );
     }

diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer2.cc b/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer2.cc
@@ -118,7 +118,7 @@ void CSCIndexerAnalyzer2::analyze( const edm::Event& iEvent, const edm::EventSet
   for( CSCGeometry::DetUnitContainer::const_iterator it = pDD->detUnits().begin(); it != pDD->detUnits().end(); ++it ){
 
     // Check each DetUnit really is a CSC layer
-    CSCLayer* layer = dynamic_cast<CSCLayer*>( *it );
+    auto layer = dynamic_cast<const CSCLayer*>( *it );
 
     if( layer ) {
       ++icountAll; // how many layers we see

diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc
@@ -54,7 +54,7 @@ void SiPixelDetInfoFileWriter::beginRun(const edm::Run &run , const edm::EventSe
 
     for(TrackerGeometry::DetUnitContainer::const_iterator it = pDD->detUnits().begin(); it != pDD->detUnits().end(); it++){
 
-      const PixelGeomDetUnit* mit = dynamic_cast<PixelGeomDetUnit*>(*it);
+      const PixelGeomDetUnit* mit = dynamic_cast<PixelGeomDetUnit const *>(*it);
 
       if(mit!=0){
 	nPixelDets++;

diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
@@ -231,7 +231,7 @@ SiStripGainFromCalibTree::algoBeginJob(const edm::EventSetup& iSetup)
 
    edm::ESHandle<TrackerGeometry> tkGeom;
    iSetup.get<TrackerDigiGeometryRecord>().get( tkGeom );
-   vector<GeomDet*> Det = tkGeom->dets();
+   auto const & Det = tkGeom->dets();
 
    edm::ESHandle<SiStripGain> gainHandle;
    iSetup.get<SiStripGainRcd>().get(gainHandle);

diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
@@ -487,7 +487,7 @@ SiStripGainFromData::algoBeginJob(const edm::EventSetup& iSetup)
 
    edm::ESHandle<TrackerGeometry> tkGeom;
    iSetup.get<TrackerDigiGeometryRecord>().get( tkGeom );
-   vector<GeomDet*> Det = tkGeom->dets();
+   auto const & Det = tkGeom->dets();
 
 
    edm::ESHandle<SiStripGain> gainHandle;
@@ -504,7 +504,7 @@ SiStripGainFromData::algoBeginJob(const edm::EventSetup& iSetup)
       if( SubDet == StripSubdetector::TIB ||  SubDet == StripSubdetector::TID ||
           SubDet == StripSubdetector::TOB ||  SubDet == StripSubdetector::TEC  ){
 
-          StripGeomDetUnit* DetUnit     = dynamic_cast<StripGeomDetUnit*> (Det[i]);
+          auto DetUnit     = dynamic_cast<StripGeomDetUnit const*> (Det[i]);
 	  if(!DetUnit)continue;
 
           const StripTopology& Topo     = DetUnit->specificTopology();	

diff --git a/CalibTracker/SiStripESProducers/plugins/geom/SiStripHashedDetIdESModule.cc b/CalibTracker/SiStripESProducers/plugins/geom/SiStripHashedDetIdESModule.cc
@@ -41,7 +41,7 @@ SiStripHashedDetId* SiStripHashedDetIdESModule::make( const SiStripHashedDetIdRc
 
   TrackerGeometry::DetUnitContainer::const_iterator iter = geom->detUnits().begin();
   for( ; iter != geom->detUnits().end(); ++iter ) {
-    const StripGeomDetUnit* strip = dynamic_cast<StripGeomDetUnit*>(*iter);
+    const auto strip = dynamic_cast<StripGeomDetUnit const*>(*iter);
     if ( strip ) { dets.push_back( (strip->geographicalId()).rawId() ); }
   }
   edm::LogVerbatim(mlDqmCommon_)

diff --git a/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc b/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc
@@ -48,7 +48,7 @@ void SiPixelTestSummary::analyze(const edm::Event& iEvent, const edm::EventSetup
   cout << " *** I have " << pDD->detTypes().size() <<" types"<<std::endl;
 
   for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
-    if(dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
+    if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=0){
       DetId detId = (*it)->geographicalId();
       a.add(detId); 
     }

diff --git a/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc b/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc
@@ -34,9 +34,9 @@ void SiStripDetVOffFakeBuilder::initialize( const edm::EventSetup& iSetup ) {
 
   for(TrackerGeometry::DetUnitContainer::const_iterator it = pDD->detUnits().begin(); it != pDD->detUnits().end(); it++){
 
-    if( dynamic_cast<StripGeomDetUnit*>((*it))!=0){
+    if( dynamic_cast<StripGeomDetUnit const*>((*it))!=0){
       uint32_t detid=((*it)->geographicalId()).rawId();            
-      const StripTopology& p = dynamic_cast<StripGeomDetUnit*>((*it))->specificTopology();
+      const StripTopology& p = dynamic_cast<StripGeomDetUnit const*>((*it))->specificTopology();
       unsigned short Nstrips = p.nstrips();
       if(Nstrips<1 || Nstrips>768 ) {
 	edm::LogError("SiStripDetVOffFakeBuilder")<<" Problem with Number of strips in detector.. "<< p.nstrips() <<" Exiting program"<<endl;

diff --git a/DQM/RPCMonitorClient/src/RPCDBPopConAnalyzer.cc b/DQM/RPCMonitorClient/src/RPCDBPopConAnalyzer.cc
@@ -66,8 +66,8 @@ class RPCDBPopConAnalyzer: public popcon::PopConAnalyzer<RPCDBHandler>
     rpcdqm::utils rpcUtils;
 
     for (TrackingGeometry::DetContainer::const_iterator it=rpcGeo->dets().begin();it<rpcGeo->dets().end();it++){
-      if(dynamic_cast< RPCChamber* >( *it ) != 0 ){
-        RPCChamber* ch = dynamic_cast< RPCChamber* >( *it );
+      if(dynamic_cast< const RPCChamber* >( *it ) != 0 ){
+        const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it );
         std::vector< const RPCRoll*> roles = (ch->rolls());
         for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){
 

diff --git a/DQM/RPCMonitorClient/src/RPCDqmClient.cc b/DQM/RPCMonitorClient/src/RPCDqmClient.cc
@@ -123,9 +123,9 @@ void  RPCDqmClient::getMonitorElements(const edm::Run& r, const edm::EventSetup&
 
   //loop on all geometry and get all histos
   for (TrackingGeometry::DetContainer::const_iterator it=rpcGeo->dets().begin();it<rpcGeo->dets().end();it++){
-    if( dynamic_cast< RPCChamber* >( *it ) != 0 ){
+    if( dynamic_cast< const RPCChamber* >( *it ) != 0 ){
 
-       RPCChamber* ch = dynamic_cast< RPCChamber* >( *it ); 
+       const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it ); 
        std::vector< const RPCRoll*> roles = (ch->rolls());
 
        //Loop on rolls in given chamber

diff --git a/DQM/RPCMonitorClient/src/RPCEfficiencySecond.cc b/DQM/RPCMonitorClient/src/RPCEfficiencySecond.cc
@@ -218,8 +218,8 @@ void RPCEfficiencySecond::endRun(const edm::Run& r, const edm::EventSetup& iSetu
 
 
 
-    if(dynamic_cast< RPCChamber* >( *it ) != 0 ){
-      RPCChamber* ch = dynamic_cast< RPCChamber* >( *it ); 
+    if(dynamic_cast< const RPCChamber* >( *it ) != 0 ){
+      const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it ); 
       std::vector< const RPCRoll*> roles = (ch->rolls());
       for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){
 	RPCDetId rpcId = (*r)->id();

diff --git a/DQM/RPCMonitorDigi/src/RPCEfficiency.cc b/DQM/RPCMonitorDigi/src/RPCEfficiency.cc
@@ -143,8 +143,8 @@ void RPCEfficiency::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const &
 
 
   for (TrackingGeometry::DetContainer::const_iterator it=rpcGeo->dets().begin();it<rpcGeo->dets().end();it++){
-    if(dynamic_cast< RPCChamber* >( *it ) != 0 ){
-      RPCChamber* ch = dynamic_cast< RPCChamber* >( *it ); 
+    if(dynamic_cast< const RPCChamber* >( *it ) != 0 ){
+      const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it ); 
       std::vector< const RPCRoll*> roles = (ch->rolls());
 
       for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){
@@ -193,9 +193,9 @@ void RPCEfficiency::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const &
   }
 
   for (TrackingGeometry::DetContainer::const_iterator it=rpcGeo->dets().begin();it<rpcGeo->dets().end();it++){
-    if( dynamic_cast< RPCChamber* >( *it ) != 0 ){
+    if( dynamic_cast< const RPCChamber* >( *it ) != 0 ){
 
-      RPCChamber* ch = dynamic_cast< RPCChamber* >( *it ); 
+      const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it ); 
       std::vector< const RPCRoll*> roles = (ch->rolls());
       for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){
 	RPCDetId rpcId = (*r)->id();

diff --git a/DQM/RPCMonitorDigi/src/RPCMonitorDigi.cc b/DQM/RPCMonitorDigi/src/RPCMonitorDigi.cc
@@ -61,8 +61,8 @@ void RPCMonitorDigi::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const
   //loop on geometry to book all MEs
   edm::LogInfo ("rpcmonitordigi") <<"[RPCMonitorDigi]: Booking histograms per roll. " ;
   for (TrackingGeometry::DetContainer::const_iterator it=rpcGeo->dets().begin();it<rpcGeo->dets().end();it++){
-    if(dynamic_cast< RPCChamber* >( *it ) != 0 ){
-      RPCChamber* ch = dynamic_cast< RPCChamber* >( *it ); 
+    if(dynamic_cast< const RPCChamber* >( *it ) != 0 ){
+      const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it ); 
       std::vector< const RPCRoll*> roles = (ch->rolls());
       if(useRollInfo_){
 	for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){

diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc
@@ -249,7 +249,7 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){
 
   for(TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
 
-    if(dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
+    if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=0){
 
       DetId detId = (*it)->geographicalId();
       const GeomDetUnit      * geoUnit = pDD->idToDetUnit( detId );

diff --git a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc
@@ -978,7 +978,7 @@ void SiPixelDigiSource::buildStructure(const edm::EventSetup& iSetup){
 
   for(TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
 
-    if(dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
+    if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=0){
 
       DetId detId = (*it)->geographicalId();
       const GeomDetUnit      * geoUnit = pDD->idToDetUnit( detId );

diff --git a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc
@@ -197,7 +197,7 @@ void SiPixelRecHitSource::buildStructure(const edm::EventSetup& iSetup){
 
   for(TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
 
-    if(dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
+    if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=0){
 
       DetId detId = (*it)->geographicalId();
       // const GeomDetUnit      * geoUnit = pDD->idToDetUnit( detId );

diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc
@@ -128,14 +128,14 @@ void SiPixelHitEfficiencySource::beginRun(const edm::Run& r, edm::EventSetup con
   // build theSiPixelStructure with the pixel barrel and endcap dets from TrackerGeometry
   for (TrackerGeometry::DetContainer::const_iterator pxb = TG->detsPXB().begin();  
        pxb!=TG->detsPXB().end(); pxb++) {
-    if (dynamic_cast<PixelGeomDetUnit*>((*pxb))!=0) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxb))!=0) {
       SiPixelHitEfficiencyModule* module = new SiPixelHitEfficiencyModule((*pxb)->geographicalId().rawId());
       theSiPixelStructure.insert(pair<uint32_t, SiPixelHitEfficiencyModule*>((*pxb)->geographicalId().rawId(), module));
     }
   }
   for (TrackerGeometry::DetContainer::const_iterator pxf = TG->detsPXF().begin(); 
        pxf!=TG->detsPXF().end(); pxf++) {
-    if (dynamic_cast<PixelGeomDetUnit*>((*pxf))!=0) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxf))!=0) {
       SiPixelHitEfficiencyModule* module = new SiPixelHitEfficiencyModule((*pxf)->geographicalId().rawId());
       theSiPixelStructure.insert(pair<uint32_t, SiPixelHitEfficiencyModule*>((*pxf)->geographicalId().rawId(), module));
     }

diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc
@@ -126,14 +126,14 @@ void SiPixelTrackResidualSource::beginRun(const edm::Run& r, edm::EventSetup con
   // build theSiPixelStructure with the pixel barrel and endcap dets from TrackerGeometry
   for (TrackerGeometry::DetContainer::const_iterator pxb = TG->detsPXB().begin();  
        pxb!=TG->detsPXB().end(); pxb++) {
-    if (dynamic_cast<PixelGeomDetUnit*>((*pxb))!=0) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxb))!=0) {
       SiPixelTrackResidualModule* module = new SiPixelTrackResidualModule((*pxb)->geographicalId().rawId());
       theSiPixelStructure.insert(pair<uint32_t, SiPixelTrackResidualModule*>((*pxb)->geographicalId().rawId(), module));
     }
   }
   for (TrackerGeometry::DetContainer::const_iterator pxf = TG->detsPXF().begin(); 
        pxf!=TG->detsPXF().end(); pxf++) {
-    if (dynamic_cast<PixelGeomDetUnit*>((*pxf))!=0) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxf))!=0) {
       SiPixelTrackResidualModule* module = new SiPixelTrackResidualModule((*pxf)->geographicalId().rawId());
       theSiPixelStructure.insert(pair<uint32_t, SiPixelTrackResidualModule*>((*pxf)->geographicalId().rawId(), module));
     }
@@ -1214,7 +1214,7 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
   if(debug_) std::cout << "clusters not on track: (size " << clustColl.size() << ") ";
 
   for(TrackerGeometry::DetContainer::const_iterator it = TG->dets().begin(); it != TG->dets().end(); it++){
-    //if(dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
+    //if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=0){
     DetId detId = (*it)->geographicalId();
     if(detId>=302055684 && detId<=352477708){ // make sure it's a Pixel module WITHOUT using dynamic_cast!  
       int nofclOnTrack = 0, nofclOffTrack=0; 

diff --git a/DataFormats/MuonDetId/test/CSCDetIdAnalyzer.cc b/DataFormats/MuonDetId/test/CSCDetIdAnalyzer.cc
@@ -92,7 +92,7 @@ void CSCDetIdAnalyzer::analyze( const edm::Event& iEvent, const edm::EventSetup&
    for( CSCGeometry::DetUnitContainer::const_iterator it = pDD->detUnits().begin(); it != pDD->detUnits().end(); ++it ){
 
      // Check each DetUnit really is a CSC layer
-     CSCLayer* layer = dynamic_cast<CSCLayer*>( *it );
+     auto layer = dynamic_cast<CSCLayer const*>( *it );
 
       if( layer ) {
         ++icountAll; // how many layers we see

diff --git a/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc b/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc
@@ -111,7 +111,7 @@ void PixelUnpackingRegions::initialize(const edm::EventSetup& es)
     phiFPIXp_.reserve(512);
     phiFPIXm_.reserve(512);
 
-    std::vector<GeomDet*>::const_iterator it = geom->dets().begin();
+    auto it = geom->dets().begin();
     for ( ; it != geom->dets().end(); ++it)
     {
       int subdet = (*it)->geographicalId().subdetId();

diff --git a/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc b/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc
@@ -294,10 +294,10 @@ FWTGeoRecoGeometryESProducer::addCSCGeometry( TGeoVolume* top, const std::string
   if(! m_geomRecord->slaveGeometry( CSCDetId()))
     throw cms::Exception( "FatalError" ) << "Cannnot find CSCGeometry\n";
 
-  const std::vector<GeomDet*>& cscGeom = m_geomRecord->slaveGeometry( CSCDetId())->dets();
-  for( std::vector<GeomDet*>::const_iterator it = cscGeom.begin(), itEnd = cscGeom.end(); it != itEnd; ++it )
+  auto const & cscGeom = m_geomRecord->slaveGeometry( CSCDetId())->dets();
+  for( auto  it = cscGeom.begin(), itEnd = cscGeom.end(); it != itEnd; ++it )
   {    
-    if( CSCChamber* chamber = dynamic_cast<CSCChamber*>(*it))
+    if( auto chamber = dynamic_cast<const CSCChamber*>(*it))
     {
       unsigned int rawid = chamber->geographicalId();
       std::stringstream s;
@@ -312,7 +312,7 @@ FWTGeoRecoGeometryESProducer::addCSCGeometry( TGeoVolume* top, const std::string
       p << path( top, iName, copy ) << "/" << name << "_" << copy;
       m_fwGeometry->idToName.insert( std::pair<unsigned int, FWTGeoRecoGeometry::Info>( rawid, FWTGeoRecoGeometry::Info( p.str())));
     }
-    else if( CSCLayer* layer = dynamic_cast<CSCLayer*>(*it))
+    else if( auto * layer = dynamic_cast<const CSCLayer*>(*it))
     {
       unsigned int rawid = layer->geographicalId();
       std::stringstream s;
@@ -351,12 +351,12 @@ FWTGeoRecoGeometryESProducer::addDTGeometry( TGeoVolume* top, const std::string&
   // DT chambers geometry
   //
   TGeoVolume *assembly = new TGeoVolumeAssembly( iName.c_str());
-  const std::vector<GeomDet*>& dtChamberGeom = m_geomRecord->slaveGeometry( DTChamberId())->dets();
-  for( std::vector<GeomDet*>::const_iterator it = dtChamberGeom.begin(),
+  auto const & dtChamberGeom = m_geomRecord->slaveGeometry( DTChamberId())->dets();
+  for( auto it = dtChamberGeom.begin(),
 					     end = dtChamberGeom.end(); 
        it != end; ++it )
   {
-    if( DTChamber* chamber = dynamic_cast< DTChamber *>(*it))
+    if( auto chamber = dynamic_cast< const DTChamber *>(*it))
     {      
       unsigned int rawid = chamber->geographicalId().rawId();
       std::stringstream s;
@@ -375,12 +375,12 @@ FWTGeoRecoGeometryESProducer::addDTGeometry( TGeoVolume* top, const std::string&
   top->AddNode( assembly, copy );
 
   // Fill in DT super layer parameters
-  const std::vector<GeomDet*>& dtSuperLayerGeom = m_geomRecord->slaveGeometry( DTLayerId())->dets();
-  for( std::vector<GeomDet*>::const_iterator it = dtSuperLayerGeom.begin(),
+  auto const & dtSuperLayerGeom = m_geomRecord->slaveGeometry( DTLayerId())->dets();
+  for( auto it = dtSuperLayerGeom.begin(),
 					    end = dtSuperLayerGeom.end(); 
        it != end; ++it )
   {
-    if( DTSuperLayer* superlayer = dynamic_cast<DTSuperLayer*>(*it))
+    if( auto * superlayer = dynamic_cast<const DTSuperLayer*>(*it))
     {
       unsigned int rawid = superlayer->id().rawId();
       std::stringstream s;
@@ -404,12 +404,12 @@ FWTGeoRecoGeometryESProducer::addDTGeometry( TGeoVolume* top, const std::string&
   }
 
   // Fill in DT layer parameters
-  const std::vector<GeomDet*>& dtLayerGeom = m_geomRecord->slaveGeometry( DTSuperLayerId())->dets();
-  for( std::vector<GeomDet*>::const_iterator it = dtLayerGeom.begin(),
+  auto const & dtLayerGeom = m_geomRecord->slaveGeometry( DTSuperLayerId())->dets();
+  for( auto it = dtLayerGeom.begin(),
 					    end = dtLayerGeom.end(); 
        it != end; ++it )
   {
-    if( DTLayer* layer = dynamic_cast<DTLayer*>(*it))
+    if(auto layer = dynamic_cast<const DTLayer*>(*it))
     {
       unsigned int rawid = layer->id().rawId();
       std::stringstream s;
@@ -455,7 +455,7 @@ FWTGeoRecoGeometryESProducer::addRPCGeometry( TGeoVolume* top, const std::string
 					     end = rpcGeom->rolls().end(); 
        it != end; ++it )
   {
-    RPCRoll* roll = (*it);
+    RPCRoll const* roll = (*it);
     if( roll )
     {
       unsigned int rawid = roll->geographicalId().rawId();

diff --git a/Geometry/CSCGeometry/test/stubs/CSCGeometryAnalyzer.cc b/Geometry/CSCGeometry/test/stubs/CSCGeometryAnalyzer.cc
@@ -87,7 +87,7 @@ void
 
      // Do we really have a CSC layer?
 
-     CSCLayer* layer = dynamic_cast<CSCLayer*>( *it );
+     auto layer = dynamic_cast<CSCLayer const*>( *it );
 
       if( layer ) {
         ++icount;

diff --git a/Geometry/CSCGeometry/test/stubs/CSCGeometryOfStrips.cc b/Geometry/CSCGeometry/test/stubs/CSCGeometryOfStrips.cc
@@ -70,7 +70,7 @@ void
    for( CSCGeometry::DetUnitContainer::const_iterator it = pDD->detUnits().begin(); it != pDD->detUnits().end(); ++it ){
      // Do we really have a CSC layer?
 
-     CSCLayer* layer = dynamic_cast<CSCLayer*>( *it );
+     auto layer = dynamic_cast<CSCLayer const*>( *it );
 
       if( layer ) {
         ++icount;

diff --git a/Geometry/CSCGeometry/test/stubs/CSCGeometryOfWires.cc b/Geometry/CSCGeometry/test/stubs/CSCGeometryOfWires.cc
@@ -76,7 +76,7 @@ void
 
      // Do we really have a CSC layer?
 
-     CSCLayer* layer = dynamic_cast<CSCLayer*>( *it );
+     auto layer = dynamic_cast<CSCLayer const*>( *it );
 
       if( layer ) {
         ++icount;

diff --git a/Geometry/RPCGeometry/test/RPCCSC.cc b/Geometry/RPCGeometry/test/RPCCSC.cc
@@ -145,8 +145,8 @@ RPCCSC::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup)
   const CSCGeometry* cscGeometry = (const CSCGeometry*)&*pCSCGeom;
 
   for (TrackingGeometry::DetContainer::const_iterator it=rpcGeometry->dets().begin();it<rpcGeometry->dets().end();it++){
-    if(dynamic_cast< RPCChamber* >( *it ) != 0 ){
-      RPCChamber* ch = dynamic_cast< RPCChamber* >( *it ); 
+    if(dynamic_cast< const RPCChamber* >( *it ) != 0 ){
+      const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it ); 
       std::vector< const RPCRoll*> roles = (ch->rolls());
       for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){
 	RPCDetId rpcId = (*r)->id();
@@ -186,8 +186,8 @@ RPCCSC::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup)
     }
   }
   for (TrackingGeometry::DetContainer::const_iterator it=rpcGeometry->dets().begin();it<rpcGeometry->dets().end();it++){
-    if( dynamic_cast< RPCChamber* >( *it ) != 0 ){
-      RPCChamber* ch = dynamic_cast< RPCChamber* >( *it );                                                                         std::vector< const RPCRoll*> roles = (ch->rolls());                                                                          for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){                              
+    if( dynamic_cast< const RPCChamber* >( *it ) != 0 ){
+      const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it );                                                                         std::vector< const RPCRoll*> roles = (ch->rolls());                                                                          for(std::vector<const RPCRoll*>::const_iterator r = roles.begin();r != roles.end(); ++r){                              
 	RPCDetId rpcId = (*r)->id();
 	int region = rpcId.region();                                        
 	if(region!=0 && (rpcId.ring()==2 || rpcId.ring()==3)){