Skip to content

Commit

Permalink
Merge pull request #1233 from ianna/static-analyser-errors-cleanup
Browse files Browse the repository at this point in the history
Misc fixes -- Remove unused includes.
  • Loading branch information
ktf committed Oct 31, 2013
2 parents 004be44 + ed56216 commit ea1143a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
10 changes: 0 additions & 10 deletions CondTools/Geometry/plugins/PGeometricDetBuilder.cc
Expand Up @@ -17,8 +17,6 @@

#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

#include "Geometry/TrackerNumberingBuilder/interface/CmsTrackerStringToEnum.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include <iostream>
Expand Down Expand Up @@ -55,52 +53,44 @@ PGeometricDetBuilder::beginRun( const edm::Run&, edm::EventSetup const& es)
std::vector<const GeometricDet*>::const_iterator egit = tc.end();
int count=0;
int lev = 1;
// CmsTrackerStringToEnum ctste;
for (; git!= egit; ++git) { // one level below "tracker"
putOne(*git, pgd, lev);
std::vector<const GeometricDet*> inone = (*git)->components();
// << ctste.name((*git)->type())
// std::cout << lev << " type " << (*git)->type() << " " << int((*git)->geographicalId()) << std::endl; // << " has " << inone.size() << " components." << std::endl;
if ( inone.size() == 0 ) ++count;
std::vector<const GeometricDet*>::const_iterator git2 = inone.begin();
std::vector<const GeometricDet*>::const_iterator egit2 = inone.end();
++lev;
for (; git2 != egit2; ++git2) { // level 2
putOne(*git2, pgd, lev);
std::vector<const GeometricDet*> intwo= (*git2)->components();
// std::cout << lev << "\ttype " << (*git2)->type() << " " << int((*git2)->geographicalId()) << std::endl; // << " has " << intwo.size() << " components." << std::endl;
if ( intwo.size() == 0 ) ++count;
std::vector<const GeometricDet*>::const_iterator git3 = intwo.begin();
std::vector<const GeometricDet*>::const_iterator egit3 = intwo.end();
++lev;
for (; git3 != egit3; ++git3) { // level 3
putOne(*git3, pgd, lev);
std::vector<const GeometricDet*> inthree= (*git3)->components();
// std::cout << lev << "\t\ttype " << (*git3)->type() << " " << int((*git3)->geographicalId()) << std::endl; // << " has " << inthree.size() << " components." << std::endl;
if ( inthree.size() == 0 ) ++count;
std::vector<const GeometricDet*>::const_iterator git4 = inthree.begin();
std::vector<const GeometricDet*>::const_iterator egit4 = inthree.end();
++lev;
for (; git4 != egit4; ++git4) { //level 4
putOne(*git4, pgd, lev);
std::vector<const GeometricDet*> infour= (*git4)->components();
// std::cout << lev << "\t\t\ttype " << (*git4)->type() << " " << int((*git4)->geographicalId()) << std::endl; // << " has " << infour.size() << " components." << std::endl;
if ( infour.size() == 0 ) ++count;
std::vector<const GeometricDet*>::const_iterator git5 = infour.begin();
std::vector<const GeometricDet*>::const_iterator egit5 = infour.end();
++lev;
for (; git5 != egit5; ++git5) { // level 5
putOne(*git5, pgd, lev);
std::vector<const GeometricDet*> infive= (*git5)->components();
// std::cout << lev << "\t\t\t\ttype " << (*git5)->type() << " " << int((*git5)->geographicalId()) << std::endl; // << " has " << infive.size() << " components." << std::endl;
if ( infive.size() == 0 ) ++count;
std::vector<const GeometricDet*>::const_iterator git6 = infive.begin();
std::vector<const GeometricDet*>::const_iterator egit6 = infive.end();
++lev;
for (; git6 != egit6; ++git6) { //level 6
putOne(*git6, pgd, lev);
std::vector<const GeometricDet*> insix= (*git6)->components();
// std::cout << lev << "\t\t\t\t\ttype " << (*git6)->type() << " " << int((*git6)->geographicalId()) << std::endl; // << " has " << insix.size() << " components." << std::endl;
if ( insix.size() == 0 ) ++count;
} // level 6
--lev;
Expand Down
2 changes: 0 additions & 2 deletions CondTools/Geometry/plugins/PGeometricDetExtraBuilder.cc
Expand Up @@ -16,8 +16,6 @@

#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

#include "Geometry/TrackerNumberingBuilder/interface/CmsTrackerStringToEnum.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include <iostream>
Expand Down

0 comments on commit ea1143a

Please sign in to comment.