[EVO] fix merge conflicts 2026/04/30

Configuration/PyReleaseValidation/python/relval_nano.py

@@ -405,6 +405,9 @@ def next(self, index: int = None) -> None:
 steps['BTVNANO_mc15.0'] = merge([{'-s': 'NANO:@BTV,DQM:@nanoAODDQM', '-n': '1000'},
                                  steps['NANO_mc15.0']])
 
+steps['EXONANO_mc15.0'] = merge([{'-s': 'PAT,NANO:@EXO', '-n': '1000'},
+                                 steps['NANO_mc15.0']])
+
 steps['lepTrackInfoNANO_mc15.0'] = merge([{'-s': 'NANO:@LepTrackInfo,DQM:@nanoAODDQM', '-n': '1000'},
                                           steps['NANO_mc15.0']])
 
@@ -422,10 +425,14 @@ def next(self, index: int = None) -> None:
 
 # ====== DATA ======
 lumis_Run2025C = {392175: [[95, 542]]}
+lumis_Run2025C_Muon0 = {392997: [[146, 202]]}
 
 steps['JetMET1_Run2025C_MINIAOD_150X'] = {'INPUT': InputInfo(
     location='STD', ls=lumis_Run2025C, dataSet='/JetMET1/Run2025C-PromptReco-v1/MINIAOD')}
 
+steps['Muon0_Run2025C_AOD_150X'] = {'INPUT': InputInfo(
+    location='STD',ls=lumis_Run2025C_Muon0, dataSet='/Muon0/Run2025C-PromptReco-v1/AOD')}
+
 steps['ScoutingPFRun3_Run2025C_HLTSCOUT_150X'] = {'INPUT': InputInfo(location='STD', ls=lumis_Run2025C,
                                                          dataSet='/ScoutingPFRun3/Run2025C-v1/HLTSCOUT')}
 
@@ -455,6 +462,9 @@ def next(self, index: int = None) -> None:
 steps['BTVNANO_data15.0'] = merge([{'-s': 'NANO:@BTV,DQM:@nanoAODDQM', '-n': '1000'},
                                    steps['NANO_data15.0']])
 
+steps['EXONANO_data15.0'] = merge([{'-s': 'PAT,NANO:@EXO', '-n': '1000'},
+                                   steps['NANO_data15.0']])
+
 steps['lepTrackInfoNANO_data15.0'] = merge([{'-s': 'NANO:@LepTrackInfo,DQM:@nanoAODDQM', '-n': '1000'},
                                            steps['NANO_data15.0']])
 
@@ -650,6 +660,7 @@ def next(self, index: int = None) -> None:
 #workflows[_wfn()] = ['ScoutingNANOmc150X', ['TTbar_13p6_Summer24_MINIAOD_150X', 'scoutingNANO_mc15.0']] COMMENT: reads old format file
 #workflows[_wfn()] = ['ScoutingNANOwithPromptmc150X', ['TTbar_13p6_Summer24_MINIAOD_150X', 'scoutingNANO_withPrompt_mc15.0']] COMMENT: reads old format file
 #workflows[_wfn()] = ['BPHNANOmc150X', ['TTbar_13p6_Summer24_MINIAOD_150X', 'BPHNANO_mc15.0']] COMMENT: reads old format file
+#workflows[_wfn()] = ['EXONANOmc150X', ['TTbar_13p6_Summer24_AOD_140X', 'EXONANO_mc15.0']] COMMENT: reads old format file
 
 # POG/PAG custom NANOs, data
 _wfn.subnext()
@@ -663,6 +674,7 @@ def next(self, index: int = None) -> None:
 _wfn() #workflows[_wfn()] = ['ScoutingNANOmonitordata150Xrun3', ['ScoutingPFMonitor_Run2025C_MINIAOD_150X', 'scoutingNANO_monitor_data15.0']]  # noqa COMMENT: reads old format file
 _wfn() #workflows[_wfn()] = ['ScoutingNANOmonitorWithPromptdata150Xrun3', ['ScoutingPFMonitor_Run2025C_MINIAOD_150X', 'scoutingNANO_monitorWithPrompt_data15.0']]  # noqa COMMENT: reads old format file
 _wfn() #workflows[_wfn()] = ['BPHNANOdata150Xrun3', ['JetMET1_Run2025C_MINIAOD_150X', 'BPHNANO_data15.0']] COMMENT: reads old format file
+_wfn() #workflows[_wfn()] = ['EXONANOdata150Xrun3', ['Muon0_Run2025C_AOD_150X', 'EXONANO_data15.0']] COMMENT: reads old format file
 workflows[_wfn()] = ['L1ScoutingNANOdata150Xrun3', ['L1Scouting2025RAW15.0', 'l1ScoutingNANO_data15.0']]
 workflows[_wfn()] = ['L1ScoutingSelectionNANOdata150Xrun3', ['L1ScoutingSelection2025RAW15.0', 'l1ScoutingSelectionNANO_data15.0']]
 

DQM/DTMonitorClient/BuildFile.xml

@@ -11,6 +11,5 @@
 <use name="CalibMuon/DTCalibration"/>
 <use name="DQM/DTMonitorModule"/>
 <use name="CondFormats/RunInfo"/>
-<use name="PhysicsTools/TensorFlow"/>
 <use name="boost"/>
 <use name="rootgraphics"/>

DQM/HLTEvF/plugins/HLTObjectMonitor.cc

@@ -220,7 +220,7 @@ HLTObjectMonitor::HLTObjectMonitor(const edm::ParameterSet& iConfig)
   //now do what ever initialization is needed
   debugPrint = false;
 
-  topDirectoryName = "HLT/ObjectMonitor";
+  topDirectoryName = iConfig.getUntrackedParameter<string>("topFolderName");
   mainShifterFolder = topDirectoryName + "/MainShifter";
   backupFolder = topDirectoryName + "/Backup";
 
@@ -866,6 +866,7 @@ double HLTObjectMonitor::get_wall_time() {
 void HLTObjectMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<std::string>("processName", "HLT");
+  desc.addUntracked<std::string>("topFolderName", "HLT/ObjectMonitor");
 
   auto addPSet = [](edm::ParameterSetDescription& desc, const std::string& name) {
     edm::ParameterSetDescription pset;

DQM/Integration/python/clients/ngt_dqm_sourceclient-live_cfg.py

@@ -15,7 +15,7 @@
 if unitTest:
   process.load("DQM.Integration.config.unitteststreamerinputsource_cfi")
   from DQM.Integration.config.unitteststreamerinputsource_cfi import options
-  process.source.streamLabel = 'streamDQMOnlineScouting' # in test mode use DQMOnlineScouting streamer
+  process.source.streamLabel = "streamDQMTestDataScouting"
 else:
   # for live online DQM in P5
   process.load("DQM.Integration.config.inputsource_cfi")
@@ -105,6 +105,13 @@
 process.dqmHLTFiltersDQMonitor.folderName = "NGT/Filters"
 process.dqmHLTFiltersDQMonitor.lightMonitor = True
 
+# Object Monitoring
+process.load("DQM.HLTEvF.FourVectorHLT_cfi")
+process.hltResults.topFolderName = cms.untracked.string("NGT/FourVectorHLT")
+
+process.load("DQM.HLTEvF.HLTObjectMonitor_cfi")
+process.hltObjectMonitor.topFolderName = cms.untracked.string("NGT/ObjectMonitor")
+
 process.p = cms.Path(process.dqmcommon *
                      process.hltOnlineBeamSpot *
                      process.ScoutingTrackMonitorOnline *
@@ -114,6 +121,8 @@
                      process.ScoutingDileptonMonitorOnline *
                      process.ScoutingMuonPropertiesMonitorOnline *
                      process.ScoutingPi0MonitorOnline *
+                     process.hltResults *
+                     process.hltObjectMonitor *
                      process.dqmHLTFiltersDQMonitor)
 
 ### process customizations included here

DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py

@@ -10,7 +10,7 @@
 # step3_pre4_inDQM.root - input for the next step in the DQM sequence, harvestingstep_phase2tk_cfg.py
 
 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
-# with command line options: step3 --conditions auto:phase2_realistic_T21 -s RAW2DIGI,L1Reco,RECO,RECOSIM,VALIDATION:@phase2Validation,DQM:@phase2 --datatier DQMIO -n 10 --geometry Extended2026D98 --era Phase2C11M9 --eventcontent DQM --no_exec
+# with command line options: step3 --conditions auto:phase2_realistic_T21 -s RAW2DIGI,L1Reco,RECO,RECOSIM,VALIDATION:@phase2Validation,DQM:@phase2 --datatier DQMIO -n 10 --geometry Extended2026D110 --era Phase2C11M9 --eventcontent DQM --no_exec
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
@@ -41,7 +41,7 @@
 
 # Input source
 process.source = cms.Source("PoolSource",
-    fileNames = cms.untracked.vstring('/store/relval/CMSSW_14_0_0_pre2/RelValTTbar_14TeV/GEN-SIM-DIGI-RAW/PU_133X_mcRun4_realistic_v1_STD_2026D98_PU200_RV229-v1/2580000/0b2b0b0b-f312-48a8-9d46-ccbadc69bbfd.root'),
+    fileNames = cms.untracked.vstring('/store/relval/CMSSW_15_0_0/RelValTTbar_14TeV/GEN-SIM-RECO/PU_141X_mcRun4_realistic_v3_STD_Run4D110_PU-v3/2580000/01972f5c-64f5-4fea-890d-ffa3bb070b77.root'),
     secondaryFileNames = cms.untracked.vstring()
 )
 

DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py

@@ -9,7 +9,7 @@
 # DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root - for local visualization of histograms
 
 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
-# with command line options: step4 --conditions auto:phase2_realistic_T21 -s HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM --scenario pp --filetype DQM --geometry ExtendedRun4D98 --era Phase2C11M9 --mc -n -1 --no_exec
+# with command line options: step4 --conditions auto:phase2_realistic_T21 -s HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM --scenario pp --filetype DQM --geometry ExtendedRun4D110 --era Phase2C11M9 --mc -n -1 --no_exec
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
@@ -27,6 +27,7 @@
 process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff')
 process.load('Configuration.StandardSequences.Harvesting_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+#process.load('Validation.SiTrackerPhase2V.Phase2OTEffClient_cff')
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(8000),
@@ -88,5 +89,5 @@
 process.dqmsave_step = cms.Path(process.DQMSaver)
 
 # Schedule definition
-#process.schedule = cms.Schedule(process.trackerphase2ValidationHarvesting_step,process.dqmsave_step)
-process.schedule = cms.Schedule(process.dqmsave_step)
+#process.schedule = cms.Schedule(process.trackerphase2ValidationHarvesting_step, process.dqmsave_step)
+process.schedule = cms.Schedule(process.dqmsave_step)

DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py

@@ -395,10 +395,13 @@ def _copyIfExists(mod, pset, name):
 from Configuration.ProcessModifiers.seedingDeepCore_cff import seedingDeepCore
 seedingDeepCore.toReplaceWith(TrackSeedMonSequence,_seedingDeepCore_TrackSeedMonSequence)
 
+from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
 from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
 trackingLST.toModify(locals()["TrackSeedMonhighPtTripletStep"],
     SeedProducer = "lstInputProducer"
 )
+_LST_TrackSeedMonSequence = TrackSeedMonSequence.copyAndExclude([locals()["TrackSeedMoninitialStep"]])
+(seedingLST | trackingLST).toReplaceWith(TrackSeedMonSequence, _LST_TrackSeedMonSequence)
 
 TrackingDQMSourceTier0 += TrackSeedMonSequence
 

FastSimulation/Tracking/plugins/FastTrackerRecHitMaskFromSeedProducer.cc

@@ -0,0 +1,93 @@
+// system includes
+#include <memory>
+
+// framework stuff
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+
+// data formats
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h"
+#include "DataFormats/TrackerRecHit2D/interface/FastTrackerRecHitCollection.h"
+#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
+
+class FastTrackerRecHitMaskFromSeedProducer : public edm::global::EDProducer<> {
+public:
+  explicit FastTrackerRecHitMaskFromSeedProducer(const edm::ParameterSet&);
+
+  ~FastTrackerRecHitMaskFromSeedProducer() override {}
+
+  void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  // an alias
+  using QualityMaskCollection = std::vector<unsigned char>;
+
+  // tokens
+  edm::EDGetTokenT<TrajectorySeedCollection> trajectories_;
+
+  edm::EDGetTokenT<FastTrackerRecHitCollection> recHits_;
+
+  edm::EDGetTokenT<std::vector<bool> > oldHitMaskToken_;
+
+  edm::EDPutTokenT<std::vector<bool> > collectedHits_;
+};
+
+FastTrackerRecHitMaskFromSeedProducer::FastTrackerRecHitMaskFromSeedProducer(const edm::ParameterSet& iConfig)
+    : trajectories_(consumes(iConfig.getParameter<edm::InputTag>("trajectories"))),
+      recHits_(consumes(iConfig.getParameter<edm::InputTag>("recHits"))),
+      collectedHits_(produces()) {
+  auto const& oldHitRemovalInfo = iConfig.getParameter<edm::InputTag>("oldHitRemovalInfo");
+  if (!oldHitRemovalInfo.label().empty()) {
+    oldHitMaskToken_ = consumes<std::vector<bool> >(oldHitRemovalInfo);
+  }
+}
+
+void FastTrackerRecHitMaskFromSeedProducer::produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const {
+  // the product
+
+  std::vector<bool> collectedHits;
+
+  // input
+
+  auto const& recHits = iEvent.get(recHits_);
+
+  if (!oldHitMaskToken_.isUninitialized()) {
+    auto const& oldHitMasks = iEvent.get(oldHitMaskToken_);
+    collectedHits.insert(collectedHits.begin(), oldHitMasks.begin(), oldHitMasks.end());
+  }
+  collectedHits.resize(recHits.size(), false);
+
+  auto const& seeds = iEvent.get(trajectories_);
+
+  // loop over seed tracks and mask hits
+  for (auto const& seed : seeds) {
+    for (auto const& hit : seed.recHits()) {
+      if (!hit.isValid())
+        continue;
+      const FastTrackerRecHit& fasthit = static_cast<const FastTrackerRecHit&>(hit);
+      // note: for matched hits nIds() returns 2, otherwise 1
+      for (unsigned id_index = 0; id_index < fasthit.nIds(); id_index++) {
+        collectedHits[unsigned(fasthit.id(id_index))] = true;
+      }
+    }
+  }
+
+  iEvent.emplace(collectedHits_, std::move(collectedHits));
+}
+
+void FastTrackerRecHitMaskFromSeedProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("trajectories", edm::InputTag("initialStepSeeds"));
+  desc.add<edm::InputTag>("recHits", edm::InputTag("fastTrackerRecHits"));
+  desc.add<edm::InputTag>("oldHitRemovalInfo", edm::InputTag(""));
+  descriptions.addWithDefaultLabel(desc);
+}
+
+DEFINE_FWK_MODULE(FastTrackerRecHitMaskFromSeedProducer);

FastSimulation/Tracking/python/FastTrackerRecHitMaskFromSeedProducer_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+from FastSimulation.Tracking.fastTrackerRecHitMaskFromSeedProducer_cfi import fastTrackerRecHitMaskFromSeedProducer
+
+def maskProducerFromSeedClusterRemover(seedClusterRemover):
+    maskProducer = fastTrackerRecHitMaskFromSeedProducer.clone(
+        trajectories = seedClusterRemover.trajectories,
+        )
+    if(hasattr(seedClusterRemover,"oldClusterRemovalInfo")):
+        maskProducer.oldHitRemovalInfo = cms.InputTag(seedClusterRemover.oldClusterRemovalInfo.getModuleLabel().replace("Clusters","Masks"))
+    return maskProducer

HeterogeneousCore/MPICore/python/configuration_splitter/editor_functions.py

@@ -39,6 +39,9 @@ def create_remote_process(local_process, modules_to_run, remote_process_name, lo
         setattr(remote_process, module, getattr(local_process, module).clone())
     for module in local_process.es_producers.keys():
         setattr(remote_process, module, getattr(local_process, module).clone())
+
+    if hasattr(local_process, "MessageLogger"):
+        remote_process.MessageLogger = local_process.MessageLogger.clone()
 
     remote_process.load("HeterogeneousCore.MPIServices.MPIService_cfi")
     remote_process.MPIService.pmix_server_uri = "file:server.uri"

HeterogeneousCore/MPICore/python/configuration_splitter/split_remote.py

@@ -42,8 +42,8 @@ def split_remote(local_process, args, cpp_names_of_the_products):
     controller_name = add_controller_to_local(local_process, args.remote_process_name)
     remote_process = create_remote_process(local_process, modules_to_offload, args.remote_process_name, local_process.name_())
 
-    mpi_path_modules_local = [controller_name]
-    mpi_path_modules_remote = []
+    mpi_path_modules_local = [[controller_name] for _ in range(len(groups))]
+    mpi_path_modules_remote = [[] for _ in range(len(groups))]
 
     instance = 1
 
@@ -65,7 +65,6 @@ def split_remote(local_process, args, cpp_names_of_the_products):
 
     # send the data needed by offloaded modules from local to remote
     remote_filters_by_group = [[] for _ in range(len(groups))]
-    local_sender_by_group = [[] for _ in range(len(groups))]
     for local_dependency, group_indices in producer_to_groups.items():
         first_dependency_in_a_group = [groups[i][0] for i in group_indices]
         capture_name = f"activityCaptureBefore{local_dependency.title()}"
@@ -89,15 +88,13 @@ def split_remote(local_process, args, cpp_names_of_the_products):
         # create filter for the path state
         filter_name = f"activityFilterAfter{local_dependency.title()}"
         add_activity_filter(remote_process, local_dependency, filter_name)
+        setattr(remote_process, local_dependency, receiver)
         for group_idx in group_indices:
             remote_filters_by_group[group_idx].append(filter_name)
-            local_sender_by_group[group_idx].append(sender_name)
-
-        setattr(remote_process, local_dependency, receiver)
+            mpi_path_modules_local[group_idx].append(sender_name)
+            mpi_path_modules_remote[group_idx].append(local_dependency)
 
         instance += 1
-        mpi_path_modules_local.append(sender_name)
-        mpi_path_modules_remote.append(local_dependency)
 
         # Handle the case when onle local product is needed by multiple remote groups
         # For sending from local process - if data is needed by multiple paths, insert additional path state capture and additional sender per group
@@ -130,11 +127,10 @@ def split_remote(local_process, args, cpp_names_of_the_products):
                 filter_name = f"activityFilterBefore{args.remote_process_name.title()}Group{group_idx}"
                 add_activity_filter(remote_process, receiver_name, filter_name)
                 remote_filters_by_group[group_idx].append(filter_name)
-                local_sender_by_group[group_idx].append(sender_name)
 
                 instance += 1
-                mpi_path_modules_local.append(sender_name)
-                mpi_path_modules_remote.append(receiver_name)
+                mpi_path_modules_local[group_idx].append(sender_name)
+                mpi_path_modules_remote[group_idx].append(receiver_name)
 
 
     per_group_remote_captures = [[] for _ in range(len(groups))]
@@ -148,18 +144,23 @@ def split_remote(local_process, args, cpp_names_of_the_products):
         setattr(remote_process, remote_capture_name, cms.EDProducer("PathStateCapture"))
         per_group_remote_captures[group_idx].append(remote_capture_name)
 
+        if len(mpi_path_modules_remote[group_idx]) != 0:
+            sender_upstream = mpi_path_modules_remote[group_idx][-1]
+        else:
+            sender_upstream = "source"
+
         sender = create_group_sender(
             group=group,
             all_products=cpp_names_of_the_products,
             instance=instance,
-            upstream_module=mpi_path_modules_remote[0],
+            upstream_module=sender_upstream,
             path_state_capture=remote_capture_name,
         )
         sender_name = f"mpiSender{args.remote_process_name.title()}Group{group_idx}"
         setattr(remote_process, sender_name, sender)
 
-        if len(local_sender_by_group[group_idx]) != 0:
-            receiver_upstream = local_sender_by_group[group_idx][-1]
+        if len(mpi_path_modules_local[group_idx]) != 0:
+            receiver_upstream = mpi_path_modules_local[group_idx][-1]
         else:
             receiver_upstream = controller_name
 
@@ -180,8 +181,8 @@ def split_remote(local_process, args, cpp_names_of_the_products):
         add_activity_filter(local_process, receiver_name, filter_name)
         insert_modules_before(local_process, getattr(local_process, group[0]), getattr(local_process, filter_name))
 
-        mpi_path_modules_remote.append(sender_name)
-        mpi_path_modules_local.append(receiver_name)
+        mpi_path_modules_remote[group_idx].append(sender_name)
+        mpi_path_modules_local[group_idx].append(receiver_name)
 
 
         for i, offloaded_module in enumerate(group):
@@ -198,9 +199,9 @@ def split_remote(local_process, args, cpp_names_of_the_products):
         delattr(local_process, product)        
 
     # add all needed paths to the process and schedule them
-    make_new_path(local_process, f"Offload{args.remote_process_name.title()}", mpi_path_modules_local)
-    make_new_path(remote_process, "MPIPath", mpi_path_modules_remote)
     for i, group in enumerate(groups):
+        make_new_path(local_process, f"Offload{args.remote_process_name.title()}Group{i}", mpi_path_modules_local[i])
+        make_new_path(remote_process, f"MPIPathGroup{i}", mpi_path_modules_remote[i])
         make_new_path(remote_process, args.remote_process_name.title()+"RemoteOffloadedSequence"+str(i), remote_filters_by_group[i]+group+per_group_remote_captures[i])
 
     if args.verbose: