[EVO] Fix merge conflict in GsfTracking classes_def.xml

CondFormats/EcalCorrections/interface/EcalShowerContainmentCorrections.h

@@ -39,8 +39,7 @@
 #include <map>
 
 #include <DataFormats/Math/interface/Point3D.h>
-
-class EBDetId;
+#include "DataFormats/EcalDetId/interface/EBDetIdFwd.h"
 
 class EcalShowerContainmentCorrections {
 public:

Configuration/AlCa/python/autoCond.py

@@ -31,12 +31,12 @@
     'run2_data_promptlike_hi'      :    '140X_dataRun2_PromptLike_HI_v1',
     # GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu
     'run2_hlt_relval'              :    '140X_dataRun2_HLT_relval_v1',
-    # GlobalTag for Run3 HLT: identical the online GT 150X_dataRun3_HLT_v1 but with snapshot at 2025-06-13 05:00:25 (UTC)
-    'run3_hlt'                     :    '150X_dataRun3_HLT_frozen250613_v1',
-    # GlobalTag for Run3 data relvals (express GT): same as 150X_dataRun3_Express_v1 but with snapshot at 2025-06-13 05:03:22 (UTC)
-    'run3_data_express'            :    '150X_dataRun3_Express_frozen250613_v1',
-    # GlobalTag for Run3 data relvals (prompt GT): same as 150X_dataRun3_Prompt_v1 but with snapshot at 2025-06-13 05:06:05 (UTC)
-    'run3_data_prompt'             :    '150X_dataRun3_Prompt_frozen250613_v1',
+    # GlobalTag for Run3 HLT: identical the online GT 160X_dataRun3_HLT_v1 but with snapshot at 2026-02-23 14:53:19 (UTC)
+    'run3_hlt'                     :    '160X_dataRun3_HLT_frozen260223_v1',
+    # GlobalTag for Run3 data relvals (express GT): same as 160X_dataRun3_Express_v1 but with snapshot at 2026-02-23 14:53:19 (UTC)
+    'run3_data_express'            :    '160X_dataRun3_Express_frozen260223_v1',
+    # GlobalTag for Run3 data relvals (prompt GT): same as 160X_dataRun3_Prompt_v1 but with snapshot at 2026-02-23 14:53:19 (UTC)
+    'run3_data_prompt'             :    '160X_dataRun3_Prompt_frozen260223_v1',
     # GlobalTag for Run3 offline data reprocessing - snapshot at 2025-11-11 14:11:48 (UTC)
     'run3_data'                    :    '150X_dataRun3_v6',
     # GlobalTag for Run3 offline data reprocessing with Prompt GT, currently for 2022FG - snapshot at 2024-05-31 08:53:25 (UTC)

Configuration/PyReleaseValidation/README.md

@@ -56,6 +56,7 @@ The offsets currently in use are:
 * 0.713: LST tracking (Phase-2 only), initialStep+HighPtTripletStep only, on GPU (if available), CPU vs. GPU
 * 0.75: HLT phase-2 timing menu
 * 0.7501: HLT phase-2 tracking-only menu
+* 0.7502: HLT phase-2 menu, with tracking ntuple
 * 0.751: HLT phase-2 timing menu Alpaka variant
 * 0.7511: HLT phase-2 timing menu, with PixelTracks CA Extension
 * 0.752: HLT phase-2 timing menu ticl_v5 variant

Configuration/PyReleaseValidation/python/relval_Run4.py

@@ -54,6 +54,7 @@
 
 # Phase-2 HLT tests
 numWFIB.extend([prefixDet+34.7501])# HLTTrackingOnly75e33
+numWFIB.extend([prefixDet+34.7502])# HLTTrackingNtuple75e33
 numWFIB.extend([prefixDet+34.751]) # HLTTiming75e33, alpaka
 numWFIB.extend([prefixDet+34.7511])# HLTTiming75e33, phase2CAExtension
 numWFIB.extend([prefixDet+34.752]) # HLTTiming75e33, ticl_v5

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1953,6 +1953,63 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '--eventcontent':'FEVTDEBUGHLT,DQMIO'
 }
 
+class UpgradeWorkflow_HLT75e33TrackingNtuple(UpgradeWorkflow):
+    def setup_(self, step, stepName, stepDict, k, properties):
+        # skip RECO, ALCA and HLT
+        if ('ALCA' in step) or ('Reco' in step) or ('HLT' in step):
+            stepDict[stepName][k] = None
+        elif 'DigiTrigger' in step:
+            # Add the aging customization
+            mergedStep = merge([self.step2, stepDict[step][k]])
+            if '--customise' in mergedStep:
+                mergedStep['--customise'] += ',SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
+            else:
+                mergedStep['--customise'] = 'SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000'
+            stepDict[stepName][k] = mergedStep
+        elif 'HARVEST' in step:
+                stepDict[stepName][k] = None
+        else:
+            stepDict[stepName][k] = merge([stepDict[step][k]])
+    def condition(self, fragment, stepList, key, hasHarvest):
+        fragments = ["TTbar_14","ZMM_14","ZEE_14","NuGun","SingleMu"]
+        return any(f in fragment for f in fragments) and 'Run4' in key
+
+upgradeWFs['HLTTrackingNtuple75e33'] = UpgradeWorkflow_HLT75e33TrackingNtuple(
+    steps = [
+        'Reco',
+        'RecoGlobal',
+        'RecoNano',
+        'DigiTrigger',
+        'ALCA',
+        'ALCAPhase2',
+        'RecoGlobalFakeHLT',
+        'HLT75e33',
+        'HARVESTGlobal',
+        'HARVESTGlobalFakeHLT',
+    ],
+    PU = [
+        'Reco',
+        'RecoGlobal',
+        'RecoNano',
+        'DigiTrigger',
+        'ALCA',
+        'ALCAPhase2',
+        'HARVESTGlobal',
+        'RecoGlobalFakeHLT',
+        'HLT75e33',
+        'HARVESTGlobal',
+        'HARVESTGlobalFakeHLT',
+    ],
+    suffix = '_HLT75e33TrackingNtuple',
+    offset = 0.7502,
+)
+upgradeWFs['HLTTrackingNtuple75e33'].step2 = {
+    '-s':'DIGI:pdigi_valid,DIGI2RAW,L1TrackTrigger,L1,L1P2GT,HLT:75e33,VALIDATION:@hltValidation',
+    '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
+    '--eventcontent':'FEVTDEBUGHLT,DQMIO',
+    '--customise' : 'Validation/RecoTrack/customiseTrackingNtuple.customiseTrackingNtupleHLT,Validation/RecoTrack/customiseTrackingNtuple.extendedContent'
+}
+
 upgradeWFs['HLTTiming75e33TiclV5'] = deepcopy(upgradeWFs['HLTTiming75e33'])
 upgradeWFs['HLTTiming75e33TiclV5'].suffix = '_HLT75e33TimingTiclV5'
 upgradeWFs['HLTTiming75e33TiclV5'].offset = 0.752

Configuration/PyReleaseValidation/scripts/runTheMatrix.py

@@ -160,6 +160,7 @@ def runSelected(opt):
 
         'ph2_hlt' : [prefixDet+34.75,    # HLT phase-2 timing menu
                      prefixDet+34.7501,  # HLT phase-2 tracking-only menu
+                     prefixDet+34.7502,  # HLT phase-2 tracking menu with tracking ntuple
                      prefixDet+34.751,   # HLT phase-2 timing menu Alpaka variant
                      prefixDet+34.7511,  # HLT phase-2 timing menu Phase2CAExtension variant
                      prefixDet+34.752,   # HLT phase-2 timing menu ticl_v5 variant

DQM/DTMonitorModule/interface/DTDataIntegrityTask.h

@@ -22,6 +22,7 @@
 #include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 
 #include "DataFormats/DTDigi/interface/DTuROSControlData.h"
+#include "DataFormats/DTDigi/interface/DTuROSFEDDataFwd.h"
 
 #include <fstream>
 #include <map>
@@ -36,7 +37,6 @@ namespace dtdi {
 }  // namespace dtdi
 
 class DTuROSROSData;
-class DTuROSFEDData;
 class DTTimeEvolutionHisto;
 
 class DTDataIntegrityTask : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<dtdi::LumiCache>> {

DataFormats/DTDigi/interface/DTuROSFEDDataFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_DTDigi_DTuROSFEDDataFwd_h
+#define DataFormats_DTDigi_DTuROSFEDDataFwd_h
+
+class DTuROSFEDData;
+
+#endif

DataFormats/EcalDetId/interface/EBDetIdFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_EcalDetId_EBDetIdFwd_h
+#define DataFormats_EcalDetId_EBDetIdFwd_h
+
+class EBDetId;
+
+#endif

DataFormats/EcalDetId/interface/EEDetIdFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_EcalDetId_EEDetIdFwd_h
+#define DataFormats_EcalDetId_EEDetIdFwd_h
+
+class EEDetId;
+
+#endif

DataFormats/HcalDigi/interface/HBHEDataFrameFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_HcalDigi_HBHEDataFrameFwd_h
+#define DataFormats_HcalDigi_HBHEDataFrameFwd_h
+
+class HBHEDataFrame;
+
+#endif

DataFormats/HcalDigi/interface/HFDataFrameFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_HcalDigi_HFDataFrameFwd_h
+#define DataFormats_HcalDigi_HFDataFrameFwd_h
+
+class HFDataFrame;
+
+#endif

DataFormats/HcalDigi/interface/HODataFrameFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_HcalDigi_HODataFrameFwd_h
+#define DataFormats_HcalDigi_HODataFrameFwd_h
+
+class HODataFrame;
+
+#endif

DataFormats/HcalDigi/interface/QIE10DataFrameFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_HcalDigi_QIE10DataFrameFwd_h
+#define DataFormats_HcalDigi_QIE10DataFrameFwd_h
+
+class QIE10DataFrame;
+
+#endif

DataFormats/HcalDigi/interface/QIE11DataFrameFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_HcalDigi_QIE11DataFrameFwd_h
+#define DataFormats_HcalDigi_QIE11DataFrameFwd_h
+
+class QIE11DataFrame;
+
+#endif

DataFormats/HcalDigi/interface/ZDCDataFrameFwd.h

@@ -0,0 +1,6 @@
+#ifndef DataFormats_HcalDigi_ZDCDataFrameFwd_h
+#define DataFormats_HcalDigi_ZDCDataFrameFwd_h
+
+class ZDCDataFrame;
+
+#endif

EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.h

@@ -18,6 +18,7 @@
 #include "CondFormats/DataRecord/interface/DTReadOutMappingRcd.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
+#include "DataFormats/DTDigi/interface/DTuROSFEDDataFwd.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
@@ -35,7 +36,6 @@
 #include <string>
 
 class DTReadOutMapping;
-class DTuROSFEDData;
 
 class DTuROSRawToDigi : public edm::stream::EDProducer<> {
 public:

Geometry/HGCalCommonData/interface/HGCalDDDConstants.h

@@ -186,6 +186,7 @@ class HGCalDDDConstants {
   inline bool v16OrLess() const { return (mode_ < HGCalGeometryMode::Hexagon8Cassette); }
   inline bool v17OrLess() const { return (mode_ < HGCalGeometryMode::Hexagon8CalibCell); }
   inline bool v18OrLess() const { return (mode_ < HGCalGeometryMode::Hexagon8FineCell); }
+  inline bool v18OrMore() const { return (mode_ >= HGCalGeometryMode::Hexagon8CalibCell); }
   inline unsigned int volumes() const { return hgpar_->moduleLayR_.size(); }
   inline bool waferExist(int layer, int waferU, int waferV) const { return hgpar_->waferExist(layer, waferU, waferV); }
   int waferFromCopy(int copy) const;

Geometry/HGCalGeometry/src/HGCalGeometry.cc

@@ -207,7 +207,7 @@ GlobalPoint HGCalGeometry::getPosition(const DetId& detid) const { return getPos
 
 GlobalPoint HGCalGeometry::getPosition(const DetId& detid, int overRideDebug) const {
   bool debug = ((overRideDebug % 10) > 0);
-  bool cog = m_topology.dddConstants().waferHexagon8Fine() ? true : false;
+  bool cog = m_topology.dddConstants().v18OrMore() ? true : false;
   if (((overRideDebug / 10) % 10) > 0) {
     if (cog)
       cog = false;

HLTriggerOffline/Scouting/plugins/ScoutingEGammaCollectionMonitoring.cc

@@ -182,7 +182,7 @@ void ScoutingEGammaCollectionMonitoring::analyze(edm::Event const& iEvent, edm::
       histos.patElectron.h1InvMassID->Fill(
           (patEls->ptrAt(tight_patElectron_index[0])->p4() + patEls->ptrAt(tight_patElectron_index[1])->p4()).mass());
     }
-  }
+  }  // if use useOfflineObject_
 
   edm::Handle<std::vector<Run3ScoutingElectron>> sctEls;
   iEvent.getByToken(scoutingElectronCollection_, sctEls);
@@ -281,11 +281,11 @@ void ScoutingEGammaCollectionMonitoring::analyze(edm::Event const& iEvent, edm::
 
     double invMass = (sctElCombined0 + sctElCombined1).mass();
     histos.sctElectron.h1InvMassID->Fill(invMass);
-    if (fabs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
-        fabs(sctEls->at(tight_sctElectron_index[1]).eta()) < scoutingDQMUtils::ELE_etaEB) {
+    if (std::abs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
+        std::abs(sctEls->at(tight_sctElectron_index[1]).eta()) < scoutingDQMUtils::ELE_etaEB) {
       histos.sctElectron.h1InvMassIDEBEB->Fill(invMass);
-    } else if (fabs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
-               fabs(sctEls->at(tight_sctElectron_index[1]).eta()) > scoutingDQMUtils::ELE_etaEB) {
+    } else if (std::abs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
+               std::abs(sctEls->at(tight_sctElectron_index[1]).eta()) > scoutingDQMUtils::ELE_etaEB) {
       histos.sctElectron.h1InvMassIDEBEE->Fill(invMass);
     } else {
       histos.sctElectron.h1InvMassIDEEEE->Fill(invMass);
@@ -295,11 +295,11 @@ void ScoutingEGammaCollectionMonitoring::analyze(edm::Event const& iEvent, edm::
     for (unsigned int i_selectTrig = 0; i_selectTrig < vtriggerSelection_.size(); i_selectTrig++) {
       if (vtrigger_result.at(i_selectTrig)) {
         histos.sctElectron.hInvMassID_passDST.at(i_selectTrig)[0]->Fill(invMass);
-        if (fabs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
-            fabs(sctEls->at(tight_sctElectron_index[1]).eta()) < scoutingDQMUtils::ELE_etaEB) {
+        if (std::abs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
+            std::abs(sctEls->at(tight_sctElectron_index[1]).eta()) < scoutingDQMUtils::ELE_etaEB) {
           histos.sctElectron.hInvMassIDEBEB_passDST.at(i_selectTrig)[0]->Fill(invMass);
-        } else if (fabs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
-                   fabs(sctEls->at(tight_sctElectron_index[1]).eta()) > scoutingDQMUtils::ELE_etaEB) {
+        } else if (std::abs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
+                   std::abs(sctEls->at(tight_sctElectron_index[1]).eta()) > scoutingDQMUtils::ELE_etaEB) {
           histos.sctElectron.hInvMassIDEBEE_passDST.at(i_selectTrig)[0]->Fill(invMass);
         } else {
           histos.sctElectron.hInvMassIDEEEE_passDST.at(i_selectTrig)[0]->Fill(invMass);
@@ -313,11 +313,11 @@ void ScoutingEGammaCollectionMonitoring::analyze(edm::Event const& iEvent, edm::
           l1GtUtils_->getPrescaleByName(l1seed, prescale);
           if (l1htbit == 1) {
             histos.sctElectron.hInvMassID_passDST.at(i_selectTrig)[i_l1seed + 1]->Fill(invMass);
-            if (fabs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
-                fabs(sctEls->at(tight_sctElectron_index[1]).eta()) < scoutingDQMUtils::ELE_etaEB) {
+            if (std::abs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
+                std::abs(sctEls->at(tight_sctElectron_index[1]).eta()) < scoutingDQMUtils::ELE_etaEB) {
               histos.sctElectron.hInvMassIDEBEB_passDST.at(i_selectTrig)[i_l1seed + 1]->Fill(invMass);
-            } else if (fabs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
-                       fabs(sctEls->at(tight_sctElectron_index[1]).eta()) > scoutingDQMUtils::ELE_etaEB) {
+            } else if (std::abs(sctEls->at(tight_sctElectron_index[0]).eta()) < scoutingDQMUtils::ELE_etaEB &&
+                       std::abs(sctEls->at(tight_sctElectron_index[1]).eta()) > scoutingDQMUtils::ELE_etaEB) {
               histos.sctElectron.hInvMassIDEBEE_passDST.at(i_selectTrig)[i_l1seed + 1]->Fill(invMass);
             } else {
               histos.sctElectron.hInvMassIDEEEE_passDST.at(i_selectTrig)[i_l1seed + 1]->Fill(invMass);
@@ -334,34 +334,39 @@ void ScoutingEGammaCollectionMonitoring::bookHistograms(DQMStore::IBooker& ibook
                                                         edm::EventSetup const& iSetup) {
   ibook.setCurrentFolder(outputInternalPath_);
 
-  // PAT Electron Total Summary
-  histos.patElectron.h1N = ibook.book1D("all_patElectron_electrons_N", "all_patElectron_electrons_N", 20, 0., 20.);
-  histos.patElectron.electrons.h1Pt =
-      ibook.book1D("all_patElectron_electrons_Pt", "all_patElectron_electrons_Pt", 5000, 0., 500.);
-  histos.patElectron.electrons.h1Eta =
-      ibook.book1D("all_patElectron_electrons_Eta", "all_patElectron_electrons_Eta", 1000, -5., 5.);
-  histos.patElectron.electrons.h1Phi =
-      ibook.book1D("all_patElectron_electrons_Phi", "all_patElectron_electrons_Phi", 660, -3.3, 3.3);
-
-  // Leading pT PAT Electron Summary
-  histos.patElectron.electron1.h1Pt = ibook.book1D("patElectron_leading_Pt", "patElectron_leading_Pt", 5000, 0., 500.);
-  histos.patElectron.electron1.h1Eta =
-      ibook.book1D("patElectron_leading_Eta", "patElectron_leading_Eta", 1000, -5., 5.);
-  histos.patElectron.electron1.h1Phi =
-      ibook.book1D("patElectron_leading_Phi", "patElectron_leading_Phi", 660, -3.3, 3.3);
-
-  // Subleading pT PAT Electron Summary
-  histos.patElectron.electron2.h1Pt =
-      ibook.book1D("patElectron_subleading_Pt", "patElectron_subleading_Pt", 5000, 0., 500.);
-  histos.patElectron.electron2.h1Eta =
-      ibook.book1D("patElectron_subleading_Eta", "patElectron_subleading_Eta", 1000, -5., 5.);
-  histos.patElectron.electron2.h1Phi =
-      ibook.book1D("patElectron_subleading_Phi", "patElectron_subleading_Phi", 660, -3.3, 3.3);
-
-  // Inv Mass PAT Electron Summary
-  histos.patElectron.h1InvMass12 = ibook.book1D("patElectron_E1E2_invMass", "patElectron_E1E2_invMass", 2000, 0., 200.);
-  histos.patElectron.h1InvMassID =
-      ibook.book1D("patElectron_appliedID_invMass", "patElectron_appliedID_invMass", 2000, 0., 200.);
+  if (useOfflineObject_) {
+    // PAT Electron Total Summary
+    histos.patElectron.h1N = ibook.book1D("all_patElectron_electrons_N", "all_patElectron_electrons_N", 20, 0., 20.);
+    histos.patElectron.electrons.h1Pt =
+        ibook.book1D("all_patElectron_electrons_Pt", "all_patElectron_electrons_Pt", 5000, 0., 500.);
+    histos.patElectron.electrons.h1Eta =
+        ibook.book1D("all_patElectron_electrons_Eta", "all_patElectron_electrons_Eta", 1000, -5., 5.);
+    histos.patElectron.electrons.h1Phi =
+        ibook.book1D("all_patElectron_electrons_Phi", "all_patElectron_electrons_Phi", 660, -3.3, 3.3);
+
+    // Leading pT PAT Electron Summary
+    histos.patElectron.electron1.h1Pt =
+        ibook.book1D("patElectron_leading_Pt", "patElectron_leading_Pt", 5000, 0., 500.);
+    histos.patElectron.electron1.h1Eta =
+        ibook.book1D("patElectron_leading_Eta", "patElectron_leading_Eta", 1000, -5., 5.);
+    histos.patElectron.electron1.h1Phi =
+        ibook.book1D("patElectron_leading_Phi", "patElectron_leading_Phi", 660, -3.3, 3.3);
+
+    // Subleading pT PAT Electron Summary
+    histos.patElectron.electron2.h1Pt =
+        ibook.book1D("patElectron_subleading_Pt", "patElectron_subleading_Pt", 5000, 0., 500.);
+    histos.patElectron.electron2.h1Eta =
+        ibook.book1D("patElectron_subleading_Eta", "patElectron_subleading_Eta", 1000, -5., 5.);
+    histos.patElectron.electron2.h1Phi =
+        ibook.book1D("patElectron_subleading_Phi", "patElectron_subleading_Phi", 660, -3.3, 3.3);
+
+    // Inv Mass PAT Electron Summary
+    histos.patElectron.h1InvMass12 =
+        ibook.book1D("patElectron_E1E2_invMass", "patElectron_E1E2_invMass", 2000, 0., 200.);
+    histos.patElectron.h1InvMassID =
+        ibook.book1D("patElectron_appliedID_invMass", "patElectron_appliedID_invMass", 2000, 0., 200.);
+  }
+
   // Scouting electron summary
   histos.sctElectron.h1N = ibook.book1D("all_sctElectron_electrons_N", "all_sctElectron_electrons_N", 20, 0., 20.);
   histos.sctElectron.electrons.h1Pt =