Merge pull request #49000 from fabiocos/fc-rev33272

Reconstruction: remove RecoTracker dependency on MTD

Author: cmsbuild

RecoTracker/GeometryESProducer/plugins/TrackerMTDRecoGeometryESProducer.cc

@@ -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<TrackerRecoGeometryRecord,
-                                                            edm::mpl::Vector<TrackerTopologyRcd,
-                                                                             TrackerDigiGeometryRecord,
-                                                                             MTDGeometryRecord,
-                                                                             MTDTopologyRcd,
-                                                                             MTDDigiGeometryRecord> > {};
+class TrackerRecoGeometryRecord : public edm::eventsetup::DependentRecordImplementation<
+                                      TrackerRecoGeometryRecord,
+                                      edm::mpl::Vector<TrackerTopologyRcd, TrackerDigiGeometryRecord> > {};
 
 #endif

RecoTracker/GeometryESProducer/python/TrackerMTDRecoGeometryESProducer_cfi.py

@@ -8,5 +8,4 @@
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/SiPixelDetId"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="RecoMTD/DetLayers"/>
 <use name="FWCore/MessageLogger"/>

RecoTracker/Record/interface/TrackerRecoGeometryRecord.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<BarrelDetLayer const*>& btl,
-                    const std::vector<ForwardDetLayer const*>& negEtl,
-                    const std::vector<ForwardDetLayer const*>& posEtl);
-
   std::vector<DetLayer const*> const& allLayers() const { return theAllLayers; }
 
   std::vector<BarrelDetLayer const*> 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<DetLayer const*> theAllLayers;
   std::vector<BarrelDetLayer const*> theBarrelLayers;
@@ -80,12 +70,6 @@ class GeometricSearchTracker : public DetLayerGeometry {
   std::vector<ForwardDetLayer const*> thePosTidLayers;
   std::vector<ForwardDetLayer const*> thePosTecLayers;
 
-  //MTD stuff
-  std::vector<BarrelDetLayer const*> theBTLLayers;
-  std::vector<ForwardDetLayer const*> theETLLayers;
-  std::vector<ForwardDetLayer const*> theNegETLLayers;
-  std::vector<ForwardDetLayer const*> thePosETLLayers;
-
   const TrackerTopology* theTrkTopo;
 };
 

RecoTracker/TkDetLayers/BuildFile.xml

@@ -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

RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h

@@ -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<BarrelDetLayer const*>& btl,
-                                          const std::vector<ForwardDetLayer const*>& negEtl,
-                                          const std::vector<ForwardDetLayer const*>& 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<DetLayer&>(*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;
-}

RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h

@@ -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<const BarrelDetLayer *> barrel;
-  for (auto &&e : theSearchTrack->mtdDetLayerGeometry->allBarrelLayers()) {
-    auto p = dynamic_cast<const BarrelDetLayer *>(e);
-    if (p) {
-      barrel.push_back(p);
-    }
-  }
-  std::vector<const ForwardDetLayer *> backward;
-  for (auto &&e : theSearchTrack->mtdDetLayerGeometry->allBackwardLayers()) {
-    auto p = dynamic_cast<const ForwardDetLayer *>(e);
-    if (p) {
-      backward.push_back(p);
-    }
-  }
-  std::vector<const ForwardDetLayer *> forward;
-  for (auto &&e : theSearchTrack->mtdDetLayerGeometry->allForwardLayers()) {
-    auto p = dynamic_cast<const ForwardDetLayer *>(e);
-    if (p) {
-      forward.push_back(p);
-    }
-  }
-  //Include the MTD layers in the TrackerSearchGeometry
-  theSearchTrack->addMTDLayers(barrel, backward, forward);
-  return theSearchTrack;
-}

RecoTracker/TkDetLayers/src/GeometricSearchTracker.cc

@@ -20,8 +20,6 @@
 #include <memory>
 
 // 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:

RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc

@@ -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)
 )