Add MTDDigiGeometryRecord to MTDTopology, adapt all the rest

Author: fabiocos

Geometry/MTDGeometryBuilder/interface/MTDGeomBuilderFromGeometricTimingDet.h

@@ -9,13 +9,12 @@
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
 
 class MTDGeometry;
-class MTDTopology;
 class MTDGeomDetType;
 class PMTDParameters;
 
 class MTDGeomBuilderFromGeometricTimingDet {
 public:
-  MTDGeometry* build(const GeometricTimingDet* gd, const PMTDParameters& ptp, const MTDTopology* tTopo);
+  MTDGeometry* build(const GeometricTimingDet* gd, const PMTDParameters& ptp);
 
 private:
   void buildPixel(std::vector<const GeometricTimingDet*> const&,
@@ -28,7 +27,6 @@ class MTDGeomBuilderFromGeometricTimingDet {
                                                                         double scaleFactor = 1.) const;
 
   std::map<std::string, const MTDGeomDetType*> theMTDDetTypeMap;
-  const MTDTopology* theTopo;
 };
 
 #endif

Geometry/MTDGeometryBuilder/interface/MTDTopology.h

@@ -12,10 +12,19 @@
 
 class MTDTopology {
 public:
-  // number of logical rods, i.e. rows of sensor modules along eta/z in phi, and of modules per rod
-  static constexpr size_t nBTLphi = BTLDetId::HALF_ROD * BTLDetId::kModulesPerTrkV2;
-  static constexpr size_t nBTLeta =
-      2 * BTLDetId::kRUPerTypeV2 * BTLDetId::kCrystalTypes * BTLDetId::kModulesPerRUV2 / BTLDetId::kModulesPerTrkV2;
+  struct BTLLayout {
+    // number of logical rods, i.e. rows of sensor modules along eta/z in phi, and of modules per rod
+    static constexpr size_t nBTLphi_ = BTLDetId::HALF_ROD * BTLDetId::kModulesPerTrkV2;
+    static constexpr size_t nBTLeta_ =
+        2 * BTLDetId::kRUPerTypeV2 * BTLDetId::kCrystalTypes * BTLDetId::kModulesPerRUV2 / BTLDetId::kModulesPerTrkV2;
+    static constexpr size_t nBTLmodules_ = nBTLphi_ * nBTLeta_;
+
+    std::array<uint32_t, nBTLmodules_> btlDetId_;
+    std::array<uint32_t, nBTLmodules_> btlPhi_;
+    std::array<uint32_t, nBTLmodules_> btlEta_;
+  };
+
+  using BTLValues = BTLLayout;
 
   struct ETLfaceLayout {
     uint32_t idDiscSide_;  // disc face identifier
@@ -27,7 +36,7 @@ class MTDTopology {
 
   using ETLValues = std::vector<ETLfaceLayout>;
 
-  MTDTopology(const int& topologyMode, const ETLValues& etl);
+  MTDTopology(const int& topologyMode, const BTLValues& btl, const ETLValues& etl);
 
   int getMTDTopologyMode() const { return mtdTopologyMode_; }
 
@@ -54,6 +63,8 @@ class MTDTopology {
 private:
   const int mtdTopologyMode_;
 
+  const BTLValues btlVals_;
+
   const ETLValues etlVals_;
 
   static constexpr size_t failIndex_ =

Geometry/MTDGeometryBuilder/plugins/MTDDigiGeometryESModule.cc

@@ -8,8 +8,6 @@
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/PMTDParametersRcd.h"
 #include "CondFormats/GeometryObjects/interface/PMTDParameters.h"
-#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
-#include "Geometry/Records/interface/MTDTopologyRcd.h"
 
 // Alignments
 #include "CondFormats/Alignment/interface/Alignments.h"
@@ -45,7 +43,6 @@ class MTDDigiGeometryESModule : public edm::ESProducer {
   const std::string myLabel_;
 
   edm::ESGetToken<GeometricTimingDet, IdealGeometryRecord> geomTimingDetToken_;
-  edm::ESGetToken<MTDTopology, MTDTopologyRcd> mtdTopoToken_;
   edm::ESGetToken<PMTDParameters, PMTDParametersRcd> pmtdParamsToken_;
 
   //alignment
@@ -69,7 +66,6 @@ MTDDigiGeometryESModule::MTDDigiGeometryESModule(const edm::ParameterSet& p)
   auto cc = setWhatProduced(this);
   const edm::ESInputTag kEmpty;
   geomTimingDetToken_ = cc.consumesFrom<GeometricTimingDet, IdealGeometryRecord>(kEmpty);
-  mtdTopoToken_ = cc.consumesFrom<MTDTopology, MTDTopologyRcd>(kEmpty);
   pmtdParamsToken_ = cc.consumesFrom<PMTDParameters, PMTDParametersRcd>(kEmpty);
 
   {
@@ -109,12 +105,10 @@ std::unique_ptr<MTDGeometry> MTDDigiGeometryESModule::produce(const MTDDigiGeome
   //
   GeometricTimingDet const& gD = iRecord.get(geomTimingDetToken_);
 
-  MTDTopology const& tTopo = iRecord.get(mtdTopoToken_);
-
   PMTDParameters const& ptp = iRecord.get(pmtdParamsToken_);
 
   MTDGeomBuilderFromGeometricTimingDet builder;
-  std::unique_ptr<MTDGeometry> mtd(builder.build(&(gD), ptp, &tTopo));
+  std::unique_ptr<MTDGeometry> mtd(builder.build(&(gD), ptp));
 
   if (applyAlignment_) {
     // Since fake is fully working when checking for 'empty', we should get rid of applyAlignment_!

Geometry/MTDGeometryBuilder/plugins/MTDTopologyEP.cc

@@ -11,6 +11,8 @@
 #include "Geometry/Records/interface/MTDTopologyRcd.h"
 #include "CondFormats/GeometryObjects/interface/PMTDParameters.h"
 #include "Geometry/Records/interface/PMTDParametersRcd.h"
+#include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h"
+#include "Geometry/Records/interface/MTDDigiGeometryRecord.h"
 
 #include <memory>
 
@@ -25,13 +27,18 @@ class MTDTopologyEP : public edm::ESProducer {
   ReturnType produce(const MTDTopologyRcd&);
 
 private:
-  void fillParameters(const PMTDParameters&, int& mtdTopologyMode, MTDTopology::ETLValues&);
+  void fillBTLtopology(const MTDGeometry&, MTDTopology::BTLValues&) {};
+  void fillETLtopology(const PMTDParameters&, int& mtdTopologyMode, MTDTopology::ETLValues&);
 
-  const edm::ESGetToken<PMTDParameters, PMTDParametersRcd> token_;
+  edm::ESGetToken<MTDGeometry, MTDDigiGeometryRecord> mtdgeoToken_;
+  edm::ESGetToken<PMTDParameters, PMTDParametersRcd> mtdparToken_;
 };
 
-MTDTopologyEP::MTDTopologyEP(const edm::ParameterSet& conf)
-    : token_{setWhatProduced(this).consumesFrom<PMTDParameters, PMTDParametersRcd>(edm::ESInputTag())} {}
+MTDTopologyEP::MTDTopologyEP(const edm::ParameterSet& conf) {
+  auto cc = setWhatProduced(this);
+  mtdgeoToken_ = cc.consumesFrom<MTDGeometry, MTDDigiGeometryRecord>(edm::ESInputTag());
+  mtdparToken_ = cc.consumesFrom<PMTDParameters, PMTDParametersRcd>(edm::ESInputTag());
+}
 
 void MTDTopologyEP::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription ttc;
@@ -40,22 +47,19 @@ void MTDTopologyEP::fillDescriptions(edm::ConfigurationDescriptions& description
 
 MTDTopologyEP::ReturnType MTDTopologyEP::produce(const MTDTopologyRcd& iRecord) {
   int mtdTopologyMode;
+  MTDTopology::BTLValues btlVals;
   MTDTopology::ETLValues etlVals;
 
-  fillParameters(iRecord.get(token_), mtdTopologyMode, etlVals);
+  fillBTLtopology(iRecord.get(mtdgeoToken_), btlVals);
+
+  fillETLtopology(iRecord.get(mtdparToken_), mtdTopologyMode, etlVals);
 
-  return std::make_unique<MTDTopology>(mtdTopologyMode, etlVals);
+  return std::make_unique<MTDTopology>(mtdTopologyMode, btlVals, etlVals);
 }
 
-void MTDTopologyEP::fillParameters(const PMTDParameters& ptp, int& mtdTopologyMode, MTDTopology::ETLValues& etlVals) {
+void MTDTopologyEP::fillETLtopology(const PMTDParameters& ptp, int& mtdTopologyMode, MTDTopology::ETLValues& etlVals) {
   mtdTopologyMode = ptp.topologyMode_;
 
-  // for legacy geometry scenarios no topology informastion is stored, only for newer ETL 2-discs layout
-
-  if (mtdTopologyMode <= static_cast<int>(MTDTopologyMode::Mode::barphiflat)) {
-    return;
-  }
-
   // Check on the internal consistency of thr ETL layout information provided by parameters
 
   for (size_t it = 3; it <= 9; it++) {

Geometry/MTDGeometryBuilder/src/MTDGeomBuilderFromGeometricTimingDet.cc

@@ -5,8 +5,8 @@
 #include "Geometry/MTDGeometryBuilder/interface/MTDGeomDetUnit.h"
 #include "Geometry/MTDGeometryBuilder/interface/MTDPixelTopologyBuilder.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/ForwardDetId/interface/MTDDetId.h"
 #include "CondFormats/GeometryObjects/interface/PMTDParameters.h"
-#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
 #include "DataFormats/GeometrySurface/interface/MediumProperties.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
@@ -33,18 +33,13 @@ namespace {
   }
 }  // namespace
 
-MTDGeometry* MTDGeomBuilderFromGeometricTimingDet::build(const GeometricTimingDet* gd,
-                                                         const PMTDParameters& ptp,
-                                                         const MTDTopology* tTopo) {
+MTDGeometry* MTDGeomBuilderFromGeometricTimingDet::build(const GeometricTimingDet* gd, const PMTDParameters& ptp) {
   theMTDDetTypeMap.clear();
 
   MTDGeometry* tracker = new MTDGeometry(gd);
   std::vector<const GeometricTimingDet*> comp;
   gd->deepComponents(comp);
 
-  if (tTopo)
-    theTopo = tTopo;
-
   //define a vector which associate to the detid subdetector index -1 (from 0 to 5) the GeometridDet enumerator to be able to know which type of subdetector it is
 
   std::vector<GeometricTimingDet::GTDEnumType> gdsubdetmap(

Geometry/MTDGeometryBuilder/src/MTDTopology.cc

@@ -4,8 +4,8 @@
 
 #include <utility>
 
-MTDTopology::MTDTopology(const int& topologyMode, const ETLValues& etl)
-    : mtdTopologyMode_(topologyMode), etlVals_(etl) {}
+MTDTopology::MTDTopology(const int& topologyMode, const BTLValues& btl, const ETLValues& etl)
+    : mtdTopologyMode_(topologyMode), btlVals_(btl), etlVals_(etl) {}
 
 std::pair<uint32_t, uint32_t> MTDTopology::btlIndex(const uint32_t detId) {
   uint32_t iphi(0), ieta(0);

Geometry/Records/interface/MTDDigiGeometryRecord.h

@@ -8,7 +8,6 @@
 #include "CondFormats/AlignmentRecord/interface/MTDSurfaceDeformationRcd.h"
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "Geometry/Records/interface/MTDTopologyRcd.h"
 #include "Geometry/Records/interface/PMTDParametersRcd.h"
 #include "FWCore/Utilities/interface/mplVector.h"
 
@@ -19,7 +18,6 @@ class MTDDigiGeometryRecord
                                                                              MTDAlignmentErrorExtendedRcd,
                                                                              MTDSurfaceDeformationRcd,
                                                                              GlobalPositionRcd,
-                                                                             MTDTopologyRcd,
                                                                              PMTDParametersRcd> > {};
 
 #endif /* RECORDS_MTDDIGIGEOMETRYRECORD_H */

Geometry/Records/interface/MTDTopologyRcd.h

@@ -3,13 +3,13 @@
 
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 #include "FWCore/Framework/interface/DependentRecordImplementation.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/MTDDigiGeometryRecord.h"
 #include "Geometry/Records/interface/PMTDParametersRcd.h"
 #include "FWCore/Utilities/interface/mplVector.h"
 
 class MTDTopologyRcd
     : public edm::eventsetup::DependentRecordImplementation<MTDTopologyRcd,
-                                                            edm::mpl::Vector<IdealGeometryRecord, PMTDParametersRcd> > {
+                                                            edm::mpl::Vector<MTDDigiGeometryRecord, PMTDParametersRcd> > {
 };
 
 #endif

SimFastTiming/MtdAssociatorProducers/plugins/MtdRecoClusterToSimLayerClusterAssociatorByHitsProducer.cc

@@ -14,6 +14,8 @@
 #include "Geometry/MTDCommonData/interface/MTDTopologyMode.h"
 #include "Geometry/Records/interface/MTDDigiGeometryRecord.h"
 #include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h"
+#include "Geometry/Records/interface/MTDTopologyRcd.h"
+#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
 
 #include "MtdRecoClusterToSimLayerClusterAssociatorByHitsImpl.h"
 

SimGeneral/CaloAnalysis/plugins/MtdTruthAccumulator.cc

@@ -52,6 +52,7 @@
 
 #include "Geometry/MTDCommonData/interface/MTDTopologyMode.h"
 #include "Geometry/Records/interface/MTDDigiGeometryRecord.h"
+#include "Geometry/Records/interface/MTDTopologyRcd.h"
 #include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h"
 #include "Geometry/MTDGeometryBuilder/interface/MTDGeomUtil.h"
 #include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"