From 87ee0fc0b180adba388bbb7f684ef4e4a2fa776f Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Tue, 29 Oct 2013 17:27:11 +0100 Subject: [PATCH 1/2] Clean up errors reported by static analyser and fix configurations to run on auto conditions --- .../DTGeometry/test/DTGeometryAnalyzer.cc | 61 +++++++++++-------- .../test/testDTGeometryFromDB_cfg.py | 4 +- .../test/testDTGeometryFromLocalDB_cfg.py | 4 +- .../DTGeometry/test/testDTGeometry_cfg.py | 3 +- 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc b/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc index dfe23bd7c843f..f41047ad264c1 100644 --- a/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc +++ b/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc @@ -14,7 +14,6 @@ #include #include -//#include #include #include @@ -144,32 +143,40 @@ void DTGeometryAnalyzer::analyze( const edm::Event& iEvent, DTChamberId id(w,st,se); const DTChamber* ch = pDD->chamber(id); - if (!ch) cout << "ERROR ch not found " << id << endl; - if (id!=ch->id()) cout << "ERROR: got wrong chamber: Cerco camera " << id << " e trovo " << ch->id() << endl; - // test idToDet for chamber - const GeomDet* gdetc=pDD->idToDet(id); - assert(gdetc==ch); - - for (int sl=1; sl<= 3 ; ++sl) { - if (sl==2 && st==4) continue; - DTSuperLayerId slid(id,sl); - const DTSuperLayer* dtsl = pDD->superLayer(slid); - if (!dtsl) cout << "ERROR sl not found " << slid << endl; - if (slid!=dtsl->id()) cout << "ERROR: got wrong sl! Cerco sl " << slid << " e trovo " << dtsl->id() << endl; - // test idToDet for superLayer - const GeomDet* gdets=pDD->idToDet(slid); - assert(gdets==dtsl); - - for (int l=1; l<=4; ++l) { - DTLayerId lid(slid,l); - const DTLayer* lay = pDD->layer(lid); - if (!lay) cout << "ERROR lay not found " << lid << endl; - if (lid!=lay->id()) cout << "ERROR: got wrong layer Cerco lay " << lid << " e trovo " << lay->id() << endl; - // test idToDet for layer - const GeomDet* gdetl=pDD->idToDet(lid); - assert(gdetl==lay); - } - } + if (!ch) + cout << "ERROR ch not found " << id << endl; + else + { + if (id!=ch->id()) cout << "ERROR: got wrong chamber: Cerco camera " << id << " e trovo " << ch->id() << endl; + // test idToDet for chamber + const GeomDet* gdetc=pDD->idToDet(id); + assert(gdetc==ch); + + for (int sl=1; sl<= 3 ; ++sl) { + if (sl==2 && st==4) continue; + DTSuperLayerId slid(id,sl); + const DTSuperLayer* dtsl = pDD->superLayer(slid); + if (!dtsl) + cout << "ERROR sl not found " << slid << endl; + else + { + if (slid!=dtsl->id()) cout << "ERROR: got wrong sl! Cerco sl " << slid << " e trovo " << dtsl->id() << endl; + // test idToDet for superLayer + const GeomDet* gdets=pDD->idToDet(slid); + assert(gdets==dtsl); + + for (int l=1; l<=4; ++l) { + DTLayerId lid(slid,l); + const DTLayer* lay = pDD->layer(lid); + if (!lay) cout << "ERROR lay not found " << lid << endl; + if (lid!=lay->id()) cout << "ERROR: got wrong layer Cerco lay " << lid << " e trovo " << lay->id() << endl; + // test idToDet for layer + const GeomDet* gdetl=pDD->idToDet(lid); + assert(gdetl==lay); + } + } + } + } } } } diff --git a/Geometry/DTGeometry/test/testDTGeometryFromDB_cfg.py b/Geometry/DTGeometry/test/testDTGeometryFromDB_cfg.py index 16670fa22bfac..01f81bfae7385 100644 --- a/Geometry/DTGeometry/test/testDTGeometryFromDB_cfg.py +++ b/Geometry/DTGeometry/test/testDTGeometryFromDB_cfg.py @@ -4,7 +4,9 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("CondCore.DBCommon.CondDBSetup_cfi") process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.GlobalTag.globaltag = 'MC_31X_V8::All' +from Configuration.AlCa.autoCond import autoCond +process.GlobalTag.globaltag = autoCond['mc'] + process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( diff --git a/Geometry/DTGeometry/test/testDTGeometryFromLocalDB_cfg.py b/Geometry/DTGeometry/test/testDTGeometryFromLocalDB_cfg.py index 77be4983329b6..5d02782bef56c 100644 --- a/Geometry/DTGeometry/test/testDTGeometryFromLocalDB_cfg.py +++ b/Geometry/DTGeometry/test/testDTGeometryFromLocalDB_cfg.py @@ -4,7 +4,9 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("CondCore.DBCommon.CondDBSetup_cfi") process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.GlobalTag.globaltag = 'MC_31X_V8::All' +from Configuration.AlCa.autoCond import autoCond +process.GlobalTag.globaltag = autoCond['mc'] + process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( diff --git a/Geometry/DTGeometry/test/testDTGeometry_cfg.py b/Geometry/DTGeometry/test/testDTGeometry_cfg.py index cdf7c929b8009..193bd7cac8dda 100644 --- a/Geometry/DTGeometry/test/testDTGeometry_cfg.py +++ b/Geometry/DTGeometry/test/testDTGeometry_cfg.py @@ -5,8 +5,9 @@ process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load('Geometry.CommonDetUnit.globalTrackingGeometry_cfi') process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi') +from Configuration.AlCa.autoCond import autoCond +process.GlobalTag.globaltag = autoCond['mc'] -process.GlobalTag.globaltag = 'MC_31X_V8::All' process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi") process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource") From 3070aae8b69b42be2b1013ceb33e24ace4580c0e Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Wed, 30 Oct 2013 16:33:51 +0100 Subject: [PATCH 2/2] Fix errors reported by static analyzer --- Geometry/DTGeometry/interface/DTGeometry.h | 6 +++--- Geometry/DTGeometry/interface/DTLayerType.h | 3 --- Geometry/DTGeometry/src/DTLayerType.cc | 2 +- .../DTGeometryBuilder/src/DTGeometryBuilderFromCondDB.cc | 2 ++ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Geometry/DTGeometry/interface/DTGeometry.h b/Geometry/DTGeometry/interface/DTGeometry.h index fe3f4bfdaefed..d85d9b4e74ca1 100644 --- a/Geometry/DTGeometry/interface/DTGeometry.h +++ b/Geometry/DTGeometry/interface/DTGeometry.h @@ -117,9 +117,9 @@ class DTGeometry : public TrackingGeometry { // Replace local static with mutable members // to allow lazy evaluation if (ever) needed. - mutable DetTypeContainer theDetTypes; - mutable DetIdContainer theDetUnitIds; - mutable DetIdContainer theDetIds; + DetTypeContainer theDetTypes; + DetIdContainer theDetUnitIds; + DetIdContainer theDetIds; }; #endif diff --git a/Geometry/DTGeometry/interface/DTLayerType.h b/Geometry/DTGeometry/interface/DTLayerType.h index 02fb24d94317e..d9e63e2649a38 100644 --- a/Geometry/DTGeometry/interface/DTLayerType.h +++ b/Geometry/DTGeometry/interface/DTLayerType.h @@ -21,9 +21,6 @@ class DTLayerType : public GeomDetType { /* Operations */ virtual const Topology& topology() const; - - private: - }; #endif // DTLAYERTYPE_H diff --git a/Geometry/DTGeometry/src/DTLayerType.cc b/Geometry/DTGeometry/src/DTLayerType.cc index 427657b5b374d..4780338650e2b 100644 --- a/Geometry/DTGeometry/src/DTLayerType.cc +++ b/Geometry/DTGeometry/src/DTLayerType.cc @@ -18,7 +18,7 @@ DTLayerType::DTLayerType() : /* Operations */ const Topology& DTLayerType::topology() const { - static DTTopology result(0,0,0.); + static const DTTopology result(0,0,0.); return result; } diff --git a/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromCondDB.cc b/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromCondDB.cc index 3628292b84100..e3cbfa6a6db77 100644 --- a/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromCondDB.cc +++ b/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromCondDB.cc @@ -116,6 +116,7 @@ DTGeometryBuilderFromCondDB::buildSuperLayer(DTChamber* chamber, DTSuperLayer* slayer = new DTSuperLayer(slId, surf, chamber); // cout << "adding slayer " << slayer->id() << " to chamber "<< chamber->id() << endl; + assert(chamber); chamber->add(slayer); return slayer; } @@ -147,6 +148,7 @@ DTGeometryBuilderFromCondDB::buildLayer(DTSuperLayer* sl, DTLayer* layer = new DTLayer(layId, surf, topology, layerType, sl); // cout << "adding layer " << layer->id() << " to sl "<< sl->id() << endl; + assert(sl); sl->add(layer); return layer; }