CAExtension rebase onto 15_1_0_pre4

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1978,7 +1978,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         else:
             stepDict[stepName][k] = merge([stepDict[step][k]])
     def condition(self, fragment, stepList, key, hasHarvest):
-        return fragment=="TTbar_14TeV" and 'Run4' in key
+        return (fragment=="TTbar_14TeV" or fragment=="SingleMuPt15Eta0p_0p4") and 'Run4' in key
 upgradeWFs['NGTScouting'] = UpgradeWorkflow_NGTScouting(
     steps = [
         'Reco',
@@ -2012,6 +2012,19 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '-s':'HARVESTING:@hltValidation'
 }
 
+upgradeWFs['NGTScoutingAlpaka'] = deepcopy(upgradeWFs['NGTScouting'])
+upgradeWFs['NGTScoutingAlpaka'].suffix = '_NGTScoutingAlpaka'
+upgradeWFs['NGTScoutingAlpaka'].offset = 0.771
+upgradeWFs['NGTScoutingAlpaka'].step2 = {
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,VALIDATION:@hltValidation',
+    '--procModifiers': 'alpaka',
+    '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
+    '--eventcontent':'FEVTDEBUGHLT,DQMIO'
+}
+upgradeWFs['NGTScoutingAlpaka'].step3 = {
+    '-s':'HARVESTING:@hltValidation'
+}
+
 class UpgradeWorkflow_L1Complete(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
         if 'Digi' in step and 'NoHLT' not in step:

DataFormats/SiPixelClusterSoA/interface/ClusteringConstants.h

@@ -23,7 +23,8 @@ namespace pixelClustering {
   constexpr uint16_t clusterThresholdPhase2OtherLayers = 4000;
 
   constexpr uint32_t maxNumDigis = 3 * 256 * 1024;  // @PU=200 µ=530k σ=50k this is >4σ away
-  constexpr uint16_t maxNumModules = 5000;          // This is an upperlimit taking into account D110 has 4000 modules
+  constexpr uint16_t maxNumModules =
+      5000 + 2872;  // This is an upperlimit taking into account D110 has 4000 modules + 3 layer of OT for CA Extension
 
   constexpr int32_t maxNumClustersPerModules = maxHitsInModule();
   constexpr uint16_t invalidModuleId = std::numeric_limits<uint16_t>::max() - 1;

DataFormats/TrackSoA/interface/alpaka/TrackUtilities.h

@@ -1,6 +1,8 @@
 #ifndef DataFormats_TrackSoA_interface_alpaka_TrackUtilities_h
 #define DataFormats_TrackSoA_interface_alpaka_TrackUtilities_h
 
+// MRMR #define NTUPLE_FIT_DEBUG // MRMR
+
 #include <algorithm>
 #include <cmath>
 #include <cstdint>

Geometry/CommonTopologies/interface/SimplePixelTopology.h

@@ -9,8 +9,8 @@
 namespace pixelTopology {
 
   constexpr auto maxNumberOfLadders = 160;
-  constexpr uint8_t maxLayers = 28;
-  constexpr uint8_t maxPairs = 64;
+  constexpr uint8_t maxLayers = 28 + 3;  // CA Extension to 3 OT barrel layers
+  constexpr uint8_t maxPairs = 64 + 64;  // CA
 
   // TODO
   // Once CUDA is dropped this could be wrapped in #ifdef CA_TRIPLETS_HOLE
@@ -216,7 +216,7 @@ namespace phase2PixelTopology {
   using pixelTopology::phi0p07;
   using pixelTopology::phi0p09;
 
-  constexpr uint32_t numberOfLayers = 28;
+  constexpr uint32_t numberOfLayers = 28 + 3;  // CA Extension with 3 barrel layers from OT
   constexpr int nPairs = 23 + 6 + 14 + 8 + 4;  // include far forward layer pairs
   constexpr uint16_t numberOfModules = 4000;
 
@@ -440,6 +440,10 @@ namespace pixelTopology {
     static constexpr inline uint16_t localY(uint16_t py) { return py; }
   };
 
+  struct Phase2OT : public Phase2 {
+    static constexpr uint32_t numberOfLayers = 28 + 3;  //OT Barrel Extension
+  };
+
   struct Phase1 {
     // types
     using hindex_type = uint32_t;  // FIXME from siPixelRecHitsHeterogeneousProduct

HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelRecHitsExtendedSoA_cfi.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+from RecoLocalTracker.SiPixelRecHits.SiPixelRecHitExtendedAlpaka_alpaka import SiPixelRecHitExtendedAlpaka_alpaka as _SiPixelRecHitExtendedAlpaka_alpaka
+
+hltPhase2PixelRecHitsExtendedSoA = _SiPixelRecHitExtendedAlpaka_alpaka()