diff --git a/RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc b/RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc deleted file mode 100644 index 2dcf6c90f3ffe..0000000000000 --- a/RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc +++ /dev/null @@ -1,70 +0,0 @@ -#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h" -#include "RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h" -#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h" -#include "Geometry/Records/interface/MTDTopologyRcd.h" -#include "Geometry/Records/interface/MTDDigiGeometryRecord.h" - -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Framework/interface/ESProducer.h" -#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" -#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include -#include - -class TrackerMTDRecoGeometryESProducer : public edm::ESProducer { -public: - TrackerMTDRecoGeometryESProducer(const edm::ParameterSet &p); - - std::unique_ptr produce(const TrackerRecoGeometryRecord &); - - static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); - -private: - edm::ESGetToken geomToken_; - edm::ESGetToken tTopToken_; - edm::ESGetToken mtdgeomToken_; - edm::ESGetToken mtdTopToken_; - bool usePhase2Stacks_; -}; - -using namespace edm; - -TrackerMTDRecoGeometryESProducer::TrackerMTDRecoGeometryESProducer(const edm::ParameterSet &p) - : usePhase2Stacks_(p.getParameter("usePhase2Stacks")) { - auto c = setWhatProduced(this); - - tTopToken_ = c.consumes(); - geomToken_ = c.consumes(edm::ESInputTag("", p.getUntrackedParameter("trackerGeometryLabel"))); - mtdgeomToken_ = c.consumes(); - mtdTopToken_ = c.consumes(); -} - -std::unique_ptr TrackerMTDRecoGeometryESProducer::produce( - const TrackerRecoGeometryRecord &iRecord) { - TrackerGeometry const &tG = iRecord.get(geomToken_); - MTDGeometry const &mG = iRecord.get(mtdgeomToken_); - - GeometricSearchTrackerBuilder builder; - return std::unique_ptr( - builder.build(tG.trackerDet(), &tG, &iRecord.get(tTopToken_), &mG, &iRecord.get(mtdTopToken_), usePhase2Stacks_)); -} - -void TrackerMTDRecoGeometryESProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) { - edm::ParameterSetDescription desc; - - desc.add("usePhase2Stacks", false); - desc.addUntracked("trackerGeometryLabel", ""); - descriptions.addDefault(desc); -} - -DEFINE_FWK_EVENTSETUP_MODULE(TrackerMTDRecoGeometryESProducer); diff --git a/RecoTracker/GeometryESProducer/python/TrackerMTDRecoGeometryESProducer_cfi.py b/RecoTracker/GeometryESProducer/python/TrackerMTDRecoGeometryESProducer_cfi.py deleted file mode 100644 index 2d8709b2618ae..0000000000000 --- a/RecoTracker/GeometryESProducer/python/TrackerMTDRecoGeometryESProducer_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -TrackerRecoGeometryESProducer = cms.ESProducer("TrackerMTDRecoGeometryESProducer", - usePhase2Stacks = cms.bool(False) -) - -from Configuration.ProcessModifiers.vectorHits_cff import vectorHits -vectorHits.toModify(TrackerRecoGeometryESProducer, usePhase2Stacks = True) diff --git a/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h b/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h index 7c7f764c34e41..89d99257f6683 100644 --- a/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h +++ b/RecoTracker/Record/interface/TrackerRecoGeometryRecord.h @@ -5,18 +5,11 @@ #include "FWCore/Framework/interface/DependentRecordImplementation.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/Records/interface/MTDGeometryRecord.h" -#include "Geometry/Records/interface/MTDDigiGeometryRecord.h" -#include "Geometry/Records/interface/MTDTopologyRcd.h" #include "FWCore/Utilities/interface/mplVector.h" -class TrackerRecoGeometryRecord - : public edm::eventsetup::DependentRecordImplementation > {}; +class TrackerRecoGeometryRecord : public edm::eventsetup::DependentRecordImplementation< + TrackerRecoGeometryRecord, + edm::mpl::Vector > {}; #endif diff --git a/RecoTracker/TkDetLayers/BuildFile.xml b/RecoTracker/TkDetLayers/BuildFile.xml index daee53060a497..ac0c879187f94 100644 --- a/RecoTracker/TkDetLayers/BuildFile.xml +++ b/RecoTracker/TkDetLayers/BuildFile.xml @@ -8,5 +8,4 @@ - diff --git a/RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h b/RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h index 53d41ae3b18f2..1f50c1c9dd766 100644 --- a/RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h +++ b/RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h @@ -4,7 +4,6 @@ #include "TrackingTools/DetLayers/interface/BarrelDetLayer.h" #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" #include "TrackingTools/DetLayers/interface/DetLayerGeometry.h" -#include "RecoMTD/DetLayers/interface/MTDDetLayerGeometry.h" class TrackerTopology; @@ -27,12 +26,6 @@ class GeometricSearchTracker : public DetLayerGeometry { ~GeometricSearchTracker() override __attribute__((cold)); - void addDetLayerGeometry(); - - void addMTDLayers(const std::vector& btl, - const std::vector& negEtl, - const std::vector& posEtl); - std::vector const& allLayers() const { return theAllLayers; } std::vector const& barrelLayers() const { return theBarrelLayers; } @@ -59,9 +52,6 @@ class GeometricSearchTracker : public DetLayerGeometry { /// obsolete method. Use idToLayer() instead. const DetLayer* detLayer(const DetId& id) const { return idToLayer(id); }; - //Need to make this pointer public so the tracker builder can build the MTD - MTDDetLayerGeometry* mtdDetLayerGeometry; - private: std::vector theAllLayers; std::vector theBarrelLayers; @@ -80,12 +70,6 @@ class GeometricSearchTracker : public DetLayerGeometry { std::vector thePosTidLayers; std::vector thePosTecLayers; - //MTD stuff - std::vector theBTLLayers; - std::vector theETLLayers; - std::vector theNegETLLayers; - std::vector thePosETLLayers; - const TrackerTopology* theTrkTopo; }; diff --git a/RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h b/RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h index 19c5077180d77..893f7fdf1b2b9 100644 --- a/RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h +++ b/RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h @@ -6,7 +6,6 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" class TrackerTopology; -class MTDTopology; /** GeometricSearchTrackerBuilder implementation * @@ -21,14 +20,6 @@ class GeometricSearchTrackerBuilder { const TrackerGeometry* theGeomDetGeometry, const TrackerTopology* tTopo, const bool usePhase2Stacks = false) __attribute__((cold)); - - //This constructor builds also the MTD geometry - GeometricSearchTracker* build(const GeometricDet* theGeometricTracker, - const TrackerGeometry* theGeomDetGeometry, - const TrackerTopology* tTopo, - const MTDGeometry* mtd, - const MTDTopology* mTopo, - const bool usePhase2Stacks = false) __attribute__((cold)); }; #endif diff --git a/RecoTracker/TkDetLayers/src/GeometricSearchTracker.cc b/RecoTracker/TkDetLayers/src/GeometricSearchTracker.cc index 49af2946cc83d..c9f19499957ac 100644 --- a/RecoTracker/TkDetLayers/src/GeometricSearchTracker.cc +++ b/RecoTracker/TkDetLayers/src/GeometricSearchTracker.cc @@ -122,57 +122,6 @@ const DetLayer* GeometricSearchTracker::idToLayer(const DetId& id) const { // throw(something); } return nullptr; //just to avoid compile warnings - } else if (id.det() == DetId::Forward && id.subdetId() == FastTime) { - //If it's MTD - return mtdDetLayerGeometry->idToLayer(id); } return nullptr; //just to avoid compile warnings } - -void GeometricSearchTracker::addDetLayerGeometry() { mtdDetLayerGeometry = new MTDDetLayerGeometry(); } - -void GeometricSearchTracker::addMTDLayers(const std::vector& btl, - const std::vector& negEtl, - const std::vector& posEtl) { - //Barrel - theBTLLayers.assign(btl.begin(), btl.end()); - theBarrelLayers.insert(theBarrelLayers.end(), theBTLLayers.begin(), theBTLLayers.end()); - //Endcap - theNegETLLayers.assign(negEtl.begin(), negEtl.end()); - thePosETLLayers.assign(posEtl.begin(), posEtl.end()); - theETLLayers.assign(negEtl.begin(), negEtl.end()); - theETLLayers.insert(theETLLayers.end(), posEtl.begin(), posEtl.end()); - theNegForwardLayers.insert(theNegForwardLayers.end(), theNegETLLayers.begin(), theNegETLLayers.end()); - thePosForwardLayers.insert(thePosForwardLayers.end(), thePosETLLayers.begin(), thePosETLLayers.end()); - //Reordering of tracker + MTD layers - theForwardLayers.clear(); - theAllLayers.clear(); - theForwardLayers.assign(theNegForwardLayers.begin(), theNegForwardLayers.end()); - theForwardLayers.insert(theForwardLayers.end(), thePosForwardLayers.begin(), thePosForwardLayers.end()); - theAllLayers.assign(theBarrelLayers.begin(), theBarrelLayers.end()); - theAllLayers.insert(theAllLayers.end(), theForwardLayers.begin(), theForwardLayers.end()); - - // number the layers - int sq = 0; - for (auto l : theAllLayers) - const_cast(*l).setSeqNum(sq++); - - edm::LogInfo("MTDDetLayers") << "------ GeometricSearchTracker+MTD constructed with: ------" - << "\n" - << "n pxlBarLayers: " << this->pixelBarrelLayers().size() << "\n" - << "n tibLayers: " << this->tibLayers().size() << "\n" - << "n tobLayers: " << this->tobLayers().size() << "\n" - << "n negPxlFwdLayers: " << this->negPixelForwardLayers().size() << "\n" - << "n posPxlFwdLayers: " << this->posPixelForwardLayers().size() << "\n" - << "n negTidLayers: " << this->negTidLayers().size() << "\n" - << "n posTidLayers: " << this->posTidLayers().size() << "\n" - << "n negTecLayers: " << this->negTecLayers().size() << "\n" - << "n posTecLayers: " << this->posTecLayers().size() << "\n" - << "n barreLayers: " << this->barrelLayers().size() << "\n" - << "n negforwardLayers: " << this->negForwardLayers().size() << "\n" - << "n posForwardLayers: " << this->posForwardLayers().size() << "\n" - << "n MTDbarrelLayers: " << this->theBTLLayers.size() << "\n" - << "n MTDnegLayers: " << this->theNegETLLayers.size() << "\n" - << "n MTDposLayers: " << this->thePosETLLayers.size() << "\n" - << "\nn Total : " << theAllLayers.size() << std::endl; -} diff --git a/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc b/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc index c8e9b11d940eb..6b2fd5a607634 100644 --- a/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc +++ b/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc @@ -13,7 +13,6 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h" using namespace std; @@ -178,42 +177,3 @@ GeometricSearchTracker *GeometricSearchTrackerBuilder::build(const GeometricDet thePosTECLayers, tTopo); } - -GeometricSearchTracker *GeometricSearchTrackerBuilder::build(const GeometricDet *theGeometricTracker, - const TrackerGeometry *theGeomDetGeometry, - const TrackerTopology *tTopo, - const MTDGeometry *mtd, - const MTDTopology *mTopo, - const bool usePhase2Stacks) { - //Tracker part - GeometricSearchTracker *theSearchTrack = this->build(theGeometricTracker, theGeomDetGeometry, tTopo, usePhase2Stacks); - - theSearchTrack->addDetLayerGeometry(); - theSearchTrack->mtdDetLayerGeometry->buildLayers(mtd, mTopo); - theSearchTrack->mtdDetLayerGeometry->sortLayers(); - - std::vector barrel; - for (auto &&e : theSearchTrack->mtdDetLayerGeometry->allBarrelLayers()) { - auto p = dynamic_cast(e); - if (p) { - barrel.push_back(p); - } - } - std::vector backward; - for (auto &&e : theSearchTrack->mtdDetLayerGeometry->allBackwardLayers()) { - auto p = dynamic_cast(e); - if (p) { - backward.push_back(p); - } - } - std::vector forward; - for (auto &&e : theSearchTrack->mtdDetLayerGeometry->allForwardLayers()) { - auto p = dynamic_cast(e); - if (p) { - forward.push_back(p); - } - } - //Include the MTD layers in the TrackerSearchGeometry - theSearchTrack->addMTDLayers(barrel, backward, forward); - return theSearchTrack; -} diff --git a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc index a914485c52fb4..557990490d63b 100644 --- a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc +++ b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc @@ -20,8 +20,6 @@ #include // user include files -#include "DataFormats/ForwardDetId/interface/BTLDetId.h" -#include "DataFormats/ForwardDetId/interface/ETLDetId.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "DataFormats/MuonDetId/interface/DTChamberId.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" @@ -74,12 +72,6 @@ void NavigationSchoolAnalyzer::print(std::ostream& os, const DetLayer* dl) { if (GeomDetEnumerators::isTracker(dl->subDetector())) { LorW = tTopo->layer(tag->geographicalId()); side = tTopo->side(tag->geographicalId()); - } else if (dl->subDetector() == GeomDetEnumerators::TimingEndcap) { - ETLDetId id(dl->basicComponents().front()->geographicalId().rawId()); - LorW = id.nDisc(); - //The MTD side returns 0 for the negative side and 1 for the positive side - //In order to be comp - side = id.mtdSide() + 1; } else { switch (dl->subDetector()) { case GeomDetEnumerators::DT: diff --git a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer_Phase2_cfg.py b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer_Phase2_cfg.py index b3b5e1415c67a..35f908e408e3d 100644 --- a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer_Phase2_cfg.py +++ b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer_Phase2_cfg.py @@ -26,11 +26,6 @@ #) -#This has to be modified in order to read the tracker + MTD structure -process.TrackerRecoGeometryESProducer = cms.ESProducer("TrackerMTDRecoGeometryESProducer", - usePhase2Stacks = cms.bool(False) -) - process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) )