MTD geometry/reconstruction: define new ETL reco layer geometry, update LGAD pixel structure, activate workflows for scenarios D72 and D73

Configuration/Eras/python/Era_Phase2C11_etlV4_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
+from Configuration.Eras.Modifier_phase2_etlV4_cff import phase2_etlV4
+
+Phase2C11_etlV4 = cms.ModifierChain(Phase2C11, phase2_etlV4)

Configuration/Eras/python/Modifier_phase2_etlV4_cff.py

@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+phase2_etlV4 =  cms.Modifier()

Configuration/Geometry/python/dict2026Geometry.py

@@ -1186,7 +1186,7 @@
             'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
             'mtdGeometry.applyAlignment = cms.bool(False)'
         ],
-        "era" : "phase2_timing, phase2_timing_layer",
+        "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4",
     },
     "I13" : {
         1 : [
@@ -1214,7 +1214,7 @@
            'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
            'mtdGeometry.applyAlignment = cms.bool(False)'
            ],
-       "era" : "phase2_timing, phase2_timing_layer",
+       "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4",
     },
 }
 

Configuration/PyReleaseValidation/python/relval_2026.py

@@ -29,6 +29,8 @@
 numWFIB.extend([31834.0]) #2026D69
 numWFIB.extend([32234.0]) #2026D70
 numWFIB.extend([32634.0]) #2026D71
+numWFIB.extend([33034.0]) #2026D72
+numWFIB.extend([33434.0]) #2026D73
 numWFIB.extend([33834.0]) #2026D74
 
 for numWF in numWFIB:

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1020,14 +1020,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'Extended2026D72',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T21',
-        'Era' : 'Phase2C11',
+        'Era' : 'Phase2C11_etlV4',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D73' : {
         'Geom' : 'Extended2026D73',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T21',
-        'Era' : 'Phase2C11',
+        'Era' : 'Phase2C11_etlV4',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D74' : {

Configuration/StandardSequences/python/Eras.py

@@ -42,6 +42,7 @@ def __init__(self):
                  'Phase2C9_dd4hep',
                  'Phase2C10_dd4hep',
                  'Phase2C11_dd4hep',
+                 'Phase2C11_etlV4',
                  'Phase2C12_dd4hep',
                  'Phase2C11M9',
         ]

RecoTracker/TkDetLayers/src/BoundDiskSector.h → DataFormats/GeometrySurface/interface/BoundDiskSector.h

@@ -1,10 +1,9 @@
-#ifndef RecoTracker_TkDetLayers_BoundDiskSector_h
-#define RecoTracker_TkDetLayers_BoundDiskSector_h
+#ifndef DataFormats_GeometrySurface_BoundDiskSector_h
+#define DataFormats_GeometrySurface_BoundDiskSector_h
 
 #include "DataFormats/GeometrySurface/interface/Plane.h"
 #include "DiskSectorBounds.h"
 
-#pragma GCC visibility push(hidden)
 class BoundDiskSector final : public Plane {
 public:
   ~BoundDiskSector() override {}
@@ -19,5 +18,4 @@ class BoundDiskSector final : public Plane {
   DiskSectorBounds const& bounds() const { return static_cast<DiskSectorBounds const&>(Plane::bounds()); }
 };
 
-#pragma GCC visibility pop
 #endif

RecoTracker/TkDetLayers/src/DiskSectorBounds.h → DataFormats/GeometrySurface/interface/DiskSectorBounds.h

@@ -1,5 +1,5 @@
-#ifndef RecoTracker_TkDetLayers_DiskSectorBounds_h
-#define RecoTracker_TkDetLayers_DiskSectorBounds_h
+#ifndef DataFormats_GeometrySurface_DiskSectorBounds_h
+#define DataFormats_GeometrySurface_DiskSectorBounds_h
 
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometrySurface/interface/LocalError.h"
@@ -8,7 +8,6 @@
 #include <cmath>
 #include <cassert>
 
-#pragma GCC visibility push(hidden)
 class DiskSectorBounds final : public Bounds {
 public:
   DiskSectorBounds(float rmin, float rmax, float zmin, float zmax, float phiExt)
@@ -44,5 +43,4 @@ class DiskSectorBounds final : public Bounds {
   float theOffset;
 };
 
-#pragma GCC visibility pop
 #endif

RecoTracker/TkDetLayers/src/DiskSectorBounds.cc → DataFormats/GeometrySurface/src/DiskSectorBounds.cc

@@ -1,4 +1,4 @@
-#include "DiskSectorBounds.h"
+#include "DataFormats/GeometrySurface/interface/DiskSectorBounds.h"
 
 using namespace std;
 

Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml

@@ -9,7 +9,7 @@
     22, 24, 16, 10, 0x1, 0x3, 0x3F, 0x3F, 1, 16, 3, 1
   </Vector>
   <Vector name="ETL" type="numeric" nEntries="12">
-    22, 24, 16, 7, 0x1, 0x3, 0x3F, 0xFF, 24, 4, 2, 8
+    22, 24, 16, 7, 0x1, 0x3, 0x3F, 0xFF, 16, 16, 1, 2
   </Vector>
 
   </ConstantsSection>

Geometry/MTDGeometryBuilder/src/MTDTopologyBuilder.cc

@@ -1,8 +1,12 @@
+//#define EDM_ML_DEBUG
+
 // Make the change for "big" pixels. 3/06 d.k.
 #include "Geometry/MTDGeometryBuilder/interface/MTDTopologyBuilder.h"
 #include "Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h"
 #include "DataFormats/GeometrySurface/interface/Bounds.h"
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
 MTDTopologyBuilder::MTDTopologyBuilder(void) {}
 
 PixelTopology* MTDTopologyBuilder::build(const Bounds* bs,
@@ -26,6 +30,19 @@ PixelTopology* MTDTopologyBuilder::build(const Bounds* bs,
   // 2 big pixels per ROC
   float pitchY = length / (ncols + pixelROCsInY * BIG_PIX_PER_ROC_Y);
 
+#ifdef EDM_ML_DEBUG
+  edm::LogInfo("MTDTopologyBuilder") << std::fixed << "Building topology for module of width(X) = " << std::setw(10)
+                                     << width << " length(Y) = " << std::setw(10) << length
+                                     << "\n Rows per ROC   = " << std::setw(10) << pixelROCRows
+                                     << " Cols per ROC   = " << std::setw(10) << pixelROCCols
+                                     << "\n ROCs in X      = " << std::setw(10) << pixelROCsInX
+                                     << " ROCs in Y      = " << std::setw(10) << pixelROCsInY
+                                     << "\n # pixel rows X = " << std::setw(10) << nrows
+                                     << " # pixel cols Y = " << std::setw(10) << ncols
+                                     << "\n pitch in X     = " << std::setw(10) << pitchX
+                                     << " # pitch in Y   = " << std::setw(10) << pitchY;
+#endif
+
   return (new RectangularMTDTopology(nrows,
                                      ncols,
                                      pitchX,

Geometry/MTDGeometryBuilder/test/MTDDigiGeometryAnalyzer.cc

@@ -59,6 +59,8 @@ void MTDDigiGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::Event
       << "Geometry node for MTDGeom is  " << &(*pDD) << "\n"
       << " # detectors = " << pDD->detUnits().size() << "\n"
       << " # types     = " << pDD->detTypes().size() << "\n"
+      << " # BTL dets  = " << pDD->detsBTL().size() << "\n"
+      << " # ETL dets  = " << pDD->detsETL().size() << "\n"
       << " # layers " << pDD->geomDetSubDetector(1) << "  = " << pDD->numberOfLayers(1) << "\n"
       << " # layers " << pDD->geomDetSubDetector(2) << "  = " << pDD->numberOfLayers(2) << "\n";
   sunitt << std::fixed << std::setw(7) << pDD->detUnits().size() << std::setw(7) << pDD->detTypes().size() << "\n";

RecoLocalFastTime/FTLClusterizer/src/MTDThresholdClusterizer.cc

@@ -211,7 +211,7 @@ void MTDThresholdClusterizer::copy_to_buffer(RecHitIterator itr, const MTDGeomet
   if (mtdId.mtdSubDetector() == MTDDetId::BTL) {
     subDet = GeomDetEnumerators::barrel;
     BTLDetId id = itr->id();
-    DetId geoId = id.geographicalId((BTLDetId::CrysLayout)topo->getMTDTopologyMode());
+    DetId geoId = id.geographicalId(MTDTopologyMode::crysLayoutFromTopoMode(topo->getMTDTopologyMode()));
     const auto& det = geom->idToDet(geoId);
     const ProxyMTDTopology& topoproxy = static_cast<const ProxyMTDTopology&>(det->topology());
     const RectangularMTDTopology& topol = static_cast<const RectangularMTDTopology&>(topoproxy.specificTopology());

RecoLocalFastTime/FTLRecProducers/python/mtdRecHits_cfi.py

@@ -13,6 +13,8 @@
     calibrationConstant = cms.double(0.085), # MeV/MIP
 )
 
+from Configuration.Eras.Modifier_phase2_etlV4_cff import phase2_etlV4
+phase2_etlV4.toModify(_endcapAlgo, thresholdToKeep = 0.005, calibrationConstant = 0.001 )
 
 mtdRecHits = cms.EDProducer(
     "MTDRecHitProducer",

RecoMTD/DetLayers/interface/MTDDetLayerGeometry.h

@@ -1,5 +1,5 @@
-#ifndef DetLayers_MTDDetLayerGeometry_h
-#define DetLayers_MTDDetLayerGeometry_h
+#ifndef RecoMTD_DetLayers_MTDDetLayerGeometry_h
+#define RecoMTD_DetLayers_MTDDetLayerGeometry_h
 
 /** \class MTDDetLayerGeometry
  *

RecoMTD/DetLayers/interface/MTDDetRing.h

@@ -1,5 +1,5 @@
-#ifndef DetLayers_MTDDetRing_H
-#define DetLayers_MTDDetRing_H
+#ifndef RecoMTD_DetLayers_MTDDetRing_H
+#define RecoMTD_DetLayers_MTDDetRing_H
 
 /** \class MTDDetRing
  *  A ring of periodic, possibly overlapping vertical detectors.

RecoMTD/DetLayers/interface/MTDDetSector.h

@@ -0,0 +1,77 @@
+#ifndef RecoMTD_DetLayers_MTDDetSector_H
+#define RecoMTD_DetLayers_MTDDetSector_H
+
+#include "TrackingTools/DetLayers/interface/GeometricSearchDet.h"
+#include "DataFormats/GeometrySurface/interface/BoundDiskSector.h"
+
+#include <ostream>
+
+class GeomDet;
+
+class MTDDetSector : public GeometricSearchDet {
+public:
+  using GeometricSearchDet::GeometricSearchDet;
+
+  /// Construct from iterators on GeomDet*
+  MTDDetSector(std::vector<const GeomDet*>::const_iterator first, std::vector<const GeomDet*>::const_iterator last);
+
+  /// Construct from a vector of GeomDet*
+  MTDDetSector(const std::vector<const GeomDet*>& dets);
+
+  ~MTDDetSector() override{};
+
+  // GeometricSearchDet structure
+
+  const std::vector<const GeomDet*>& basicComponents() const override { return theDets; }
+
+  const BoundSurface& surface() const final { return *theDiskS; }
+
+  const std::vector<const GeometricSearchDet*>& components() const override;
+
+  std::pair<bool, TrajectoryStateOnSurface> compatible(const TrajectoryStateOnSurface& ts,
+                                                       const Propagator& prop,
+                                                       const MeasurementEstimator& est) const override;
+
+  std::vector<DetWithState> compatibleDets(const TrajectoryStateOnSurface& startingState,
+                                           const Propagator& prop,
+                                           const MeasurementEstimator& est) const override;
+
+  void compatibleDetsV(const TrajectoryStateOnSurface& startingState,
+                       const Propagator& prop,
+                       const MeasurementEstimator& est,
+                       std::vector<DetWithState>& result) const override;
+
+  std::vector<DetGroup> groupedCompatibleDets(const TrajectoryStateOnSurface& startingState,
+                                              const Propagator& prop,
+                                              const MeasurementEstimator& est) const override;
+
+  // GeometricSearchDet extension
+
+  const BoundDiskSector& specificSurface() const { return *theDiskS; }
+
+protected:
+  void setDisk(BoundDiskSector* diskS) { theDiskS = diskS; }
+
+  bool add(size_t idet,
+           std::vector<DetWithState>& result,
+           const TrajectoryStateOnSurface& tsos,
+           const Propagator& prop,
+           const MeasurementEstimator& est) const;
+
+private:
+  ReferenceCountingPointer<BoundDiskSector> theDiskS;
+  std::vector<const GeomDet*> theDets;
+
+  // Window of detid ordered modules around that closest to the track extrapolation on the sector surface
+  // needed to limit the size of the vector of distances to sort
+  // value 50 based on the possible mismatch of module number between adjacent
+  // modules, due to left-right type imparity
+
+  static constexpr size_t detsRange = 50;
+
+  void init();
+};
+
+std::ostream& operator<<(std::ostream&, const MTDDetSector&);
+
+#endif

RecoMTD/DetLayers/interface/MTDDetTray.h

@@ -1,5 +1,5 @@
-#ifndef DetLayers_MTDDetTray_H
-#define DetLayers_MTDDetTray_H
+#ifndef RecoMTD_DetLayers_MTDDetTray_H
+#define RecoMTD_DetLayers_MTDDetTray_H
 
 /** \class MTDDetTray
  *  A tray of aligned equal-sized non-overlapping detectors.  

RecoMTD/DetLayers/interface/MTDRingForwardDoubleLayer.h

@@ -1,5 +1,5 @@
-#ifndef DetLayers_MTDRingForwardDoubleLayer_H
-#define DetLayers_MTDRingForwardDoubleLayer_H
+#ifndef RecoMTD_DetLayers_MTDRingForwardDoubleLayer_H
+#define RecoMTD_DetLayers_MTDRingForwardDoubleLayer_H
 
 /** \class MTDRingForwardDoubleLayer
  *  A plane composed two layers of disks. The Endcap Timing Layer.

RecoMTD/DetLayers/interface/MTDRingForwardLayer.h

@@ -1,5 +1,5 @@
-#ifndef DetLayers_MTDRingForwardLayer_H
-#define DetLayers_MTDRingForwardLayer_H
+#ifndef RecoMTD_DetLayers_MTDRingForwardLayer_H
+#define RecoMTD_DetLayers_MTDRingForwardLayer_H
 
 /** \class MTDRingForwardLayer
  *  A plane composed of disks (MTDRingForwardDisk). Represents ETL.

RecoMTD/DetLayers/interface/MTDSectorForwardDoubleLayer.h

@@ -0,0 +1,65 @@
+#ifndef RecoMTD_DetLayers_MTDSectorForwardDoubleLayer_H
+#define RecoMTD_DetLayers_MTDSectorForwardDoubleLayer_H
+
+#include "TrackingTools/DetLayers/interface/ForwardDetLayer.h"
+#include "Utilities/BinningTools/interface/BaseBinFinder.h"
+#include "RecoMTD/DetLayers/interface/MTDSectorForwardLayer.h"
+
+class MTDDetSector;
+class GeomDet;
+
+class MTDSectorForwardDoubleLayer : public ForwardDetLayer {
+public:
+  /// Constructor, takes ownership of pointers
+  MTDSectorForwardDoubleLayer(const std::vector<const MTDDetSector*>& frontSectors,
+                              const std::vector<const MTDDetSector*>& backSectors);
+
+  ~MTDSectorForwardDoubleLayer() override {}
+
+  // GeometricSearchDet interface
+
+  const std::vector<const GeomDet*>& basicComponents() const override { return theBasicComponents; }
+
+  const std::vector<const GeometricSearchDet*>& components() const override { return theComponents; }
+
+  bool isInsideOut(const TrajectoryStateOnSurface& tsos) const;
+
+  // tries closest layer first
+  std::pair<bool, TrajectoryStateOnSurface> compatible(const TrajectoryStateOnSurface&,
+                                                       const Propagator&,
+                                                       const MeasurementEstimator&) const override;
+
+  std::vector<DetWithState> compatibleDets(const TrajectoryStateOnSurface& startingState,
+                                           const Propagator& prop,
+                                           const MeasurementEstimator& est) const override;
+
+  std::vector<DetGroup> groupedCompatibleDets(const TrajectoryStateOnSurface& startingState,
+                                              const Propagator& prop,
+                                              const MeasurementEstimator& est) const override;
+
+  // DetLayer interface
+  SubDetector subDetector() const override { return theBackLayer.subDetector(); }
+
+  // Extension of the interface
+
+  /// Return the vector of sectors.
+  virtual const std::vector<const MTDDetSector*>& sectors() const { return theSectors; }
+
+  bool isCrack(const GlobalPoint& gp) const;
+
+  const MTDSectorForwardLayer* frontLayer() const { return &theFrontLayer; }
+  const MTDSectorForwardLayer* backLayer() const { return &theBackLayer; }
+
+  void selfTest() const;
+
+protected:
+  BoundDisk* computeSurface() override;
+
+private:
+  MTDSectorForwardLayer theFrontLayer;
+  MTDSectorForwardLayer theBackLayer;
+  std::vector<const MTDDetSector*> theSectors;
+  std::vector<const GeometricSearchDet*> theComponents;  // duplication of the above
+  std::vector<const GeomDet*> theBasicComponents;        // All chambers
+};
+#endif