Fix merge conflicts from CMSSW_17_0_X by Dr15Jones · Pull Request #50696 · cms-sw/cmssw

Dr15Jones · 2026-04-10T14:22:27Z

PR description:

This fixes merge conflicts with the main line.

PR validation:

CaloTruthAccumulator is updated to produce multiple SimCluster collections: - CaloParticle collection - SimCluster "CaloParticle" collection (same thing but in SimCluster dataformat, simplifies consumers) - SimCluster "legacy" collection (identical behaviour as SimCluster before this commit) - SimCluster "boundary" collection : creates a SimCluster for every SimTrack crossing calorimeter boundary (and having cumulative simhits from itself or its simtrack descendents). Can be used in replacement of "legacy" collection (the only difference is for primary photons that do not convert before boundary). - SimCluster "merged" collection : merges very collimated SimTrack into one SimCluster (only from same CaloParticle). For now it uses fastjet anti-kt with very small distance parameter (0.05) It also produces RefVector to map SimCluster to CaloParticle

…d at the end of each event

…new" (boundary, merged, CaloParticle-SimCluster) SimCluster collections

Elements are frequently inserted and erased to the map.

Produce multiple SimCluster collections in CaloTruthAccumulator

…cMonitor Speed up ModuleEventAllocMonitor

Dr15Jones · 2026-04-10T14:22:34Z

type evo

cmsbuild · 2026-04-10T14:22:57Z

cms-bot internal usage

cmsbuild · 2026-04-10T14:24:52Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50696/48957

ERROR: Build errors found during clang-tidy run.

src/SimDataFormats/CaloAnalysis/interface/SimCluster.h:288:1: error: extraneous closing brace ('}') [clang-diagnostic-error]
  288 | };
      | ^
Suppressed 534 warnings (534 in non-user code).
--
src/SimDataFormats/CaloAnalysis/interface/SimCluster.h:288:1: error: extraneous closing brace ('}') [clang-diagnostic-error]
  288 | };
      | ^
Suppressed 1893 warnings (1889 in non-user code, 4 NOLINT).
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:129: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

Dr15Jones · 2026-04-10T14:53:50Z

please test

cmsbuild · 2026-04-10T14:56:09Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50696/48960

cmsbuild · 2026-04-10T14:56:30Z

A new Pull Request was created by @Dr15Jones for CMSSW_17_0_EVOLUTION_X.

It involves the following packages:

PerfTools/AllocMonitor (core)
SimCalorimetry/Configuration (simulation)
SimDataFormats/CaloAnalysis (simulation)
SimGeneral/CaloAnalysis (simulation)
SimGeneral/MixingModule (simulation)

@Dr15Jones, @civanch, @kpedro88, @makortel, @mdhildreth, @smuzaffar can you please review it and eventually sign? Thanks.
@ReyerBand, @apsallid, @bsunanda, @denizsun, @fabiocos, @felicepantaleo, @makortel, @martinamalberti, @missirol, @mmusich, @rovere, @salimcerci, @sameasy, @slomeo, @thomreis, @wang0jin this is something you requested to watch as well.
@ftenchini, @mandrenguyen, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

cmsbuild · 2026-04-10T17:20:53Z

-1

Failed Tests: RelVals
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f8c8d5/52609/summary.html
COMMIT: b4e1d2c
CMSSW: CMSSW_17_0_EVOLUTION_X_2026-04-06-2300/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/50696/52609/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f8c8d5/52609/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f8c8d5/52609/git-merge-result

Static analyzer reported errors, please check

Failed RelVals

25202.0

----- Begin Fatal Exception 10-Apr-2026 18:51:54 CEST-----------------------
An exception of category 'DictionaryNotFound' occurred while
   [0] Constructing the EventProcessor
   [1] Constructing module: class=MixingModule label='mix'
   [2] Calling ProductRegistry::initializeLookupTables
Exception Message:
No data dictionary found for the following classes:

  GenEventInfoProduct
  edm::Wrapper<GenEventInfoProduct>
  edm::Wrapper<std::vector<PCaloHit> >
  edm::Wrapper<std::vector<PSimHit> >
  edm::Wrapper<std::vector<SimTrack> >
  edm::Wrapper<std::vector<reco::GenMET> >
  std::vector<PCaloHit>
  std::vector<PSimHit>
  std::vector<SimTrack>
  std::vector<reco::GenMET>

Most likely each dictionary was never generated, but it may
be that it was generated in the wrong package. Please add
(or move) the specification '<class name="whatever"/>' to
the appropriate classes_def.xml file along with any other
information needed there. For example, if this class has any
transient members, you need to specify them in classes_def.xml.
Also include the class header in classes.h

A type listed above might or might not be the same as a
type stored in the Event (or Lumi or Run). Instead it might
be the type of a data member, base class, wrapped type, or
other object needed by a stored type. Below is some additional
information which lists the stored types associated with the
types whose dictionaries were not found:

  GenEventInfoProduct (read from input)
  std::vector<PCaloHit> (read from input)
  std::vector<PSimHit> (read from input)
  std::vector<SimTrack> (read from input)
  std::vector<reco::GenMET> (read from input)

Missing dictionaries are associated with these branch names:

  GenEventInfoProduct_generator__SIM.
  PCaloHits_g4SimHits_CaloHitsTk_SIM.
  PCaloHits_g4SimHits_CastorBU_SIM.
  PCaloHits_g4SimHits_CastorFI_SIM.
  PCaloHits_g4SimHits_CastorPL_SIM.
  PCaloHits_g4SimHits_CastorTU_SIM.
  PCaloHits_g4SimHits_ChamberHits_SIM.
  PCaloHits_g4SimHits_EcalHitsEB_SIM.
  PCaloHits_g4SimHits_EcalHitsEE_SIM.
  PCaloHits_g4SimHits_EcalHitsES_SIM.
  PCaloHits_g4SimHits_EcalTBH4BeamHits_SIM.
  PCaloHits_g4SimHits_FibreHits_SIM.
  PCaloHits_g4SimHits_HFNoseHits_SIM.
  PCaloHits_g4SimHits_HGCHitsEE_SIM.
  PCaloHits_g4SimHits_HGCHitsHEback_SIM.
  PCaloHits_g4SimHits_HGCHitsHEfront_SIM.
  PCaloHits_g4SimHits_HcalHits_SIM.
  PCaloHits_g4SimHits_HcalTB06BeamHits_SIM.
  PCaloHits_g4SimHits_WedgeHits_SIM.
  PCaloHits_g4SimHits_ZDCHITS_SIM.
  PSimHits_g4SimHits_BCM1FHits_SIM.
  PSimHits_g4SimHits_BHMHits_SIM.
  PSimHits_g4SimHits_BSCHits_SIM.
  PSimHits_g4SimHits_FP420SI_SIM.
  PSimHits_g4SimHits_FastTimerHitsBarrel_SIM.
  PSimHits_g4SimHits_FastTimerHitsEndcap_SIM.
  PSimHits_g4SimHits_MuonCSCHits_SIM.
  PSimHits_g4SimHits_MuonDTHits_SIM.
  PSimHits_g4SimHits_MuonGEMHits_SIM.
  PSimHits_g4SimHits_MuonME0Hits_SIM.
  PSimHits_g4SimHits_MuonRPCHits_SIM.
  PSimHits_g4SimHits_PLTHits_SIM.
  PSimHits_g4SimHits_TotemHitsRP_SIM.
  PSimHits_g4SimHits_TotemHitsT1_SIM.
  PSimHits_g4SimHits_TotemHitsT2Gem_SIM.
  PSimHits_g4SimHits_TrackerHitsPixelBarrelHighTof_SIM.
  PSimHits_g4SimHits_TrackerHitsPixelBarrelLowTof_SIM.
  PSimHits_g4SimHits_TrackerHitsPixelEndcapHighTof_SIM.
  PSimHits_g4SimHits_TrackerHitsPixelEndcapLowTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTECHighTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTECLowTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTIBHighTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTIBLowTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTIDHighTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTIDLowTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTOBHighTof_SIM.
  PSimHits_g4SimHits_TrackerHitsTOBLowTof_SIM.
  SimTracks_g4SimHits__SIM.
  recoGenMETs_genMetCalo__SIM.
  recoGenMETs_genMetTrue__SIM.

If you do not need these branches and they are not produced
in the current process, an alternate solution to adding
dictionaries is to drop these branches on input using the
inputCommands parameter of the PoolSource.
----- End Fatal Exception -------------------------------------------------

2500.3001A fatal system signal has occurred: segmentation violation
14234.0

----- Begin Fatal Exception 10-Apr-2026 18:57:10 CEST-----------------------
An exception of category 'DictionaryNotFound' occurred while
   [0] Constructing the EventProcessor
   [1] Constructing module: class=MixingModule label='mix'
   [2] Calling ProductRegistry::initializeLookupTables
Exception Message:
No data dictionary found for the following classes:

  edm::HepMCProduct
  edm::Wrapper<edm::HepMCProduct>
  edm::Wrapper<std::vector<PCaloHit> >
  edm::Wrapper<std::vector<PSimHit> >
  edm::Wrapper<std::vector<SimTrack> >
  std::vector<PCaloHit>
  std::vector<PSimHit>
  std::vector<SimTrack>

Most likely each dictionary was never generated, but it may
be that it was generated in the wrong package. Please add
(or move) the specification '<class name="whatever"/>' to
the appropriate classes_def.xml file along with any other
information needed there. For example, if this class has any
transient members, you need to specify them in classes_def.xml.
Also include the class header in classes.h

A type listed above might or might not be the same as a
type stored in the Event (or Lumi or Run). Instead it might
be the type of a data member, base class, wrapped type, or
other object needed by a stored type. Below is some additional
information which lists the stored types associated with the
types whose dictionaries were not found:

  edm::HepMCProduct (read from input)
  std::vector<PCaloHit> (read from input)
  std::vector<PSimHit> (read from input)
  std::vector<SimTrack> (read from input)

Missing dictionaries are associated with these branch names:

  PCaloHits_fastSimProducer_EcalHitsEB_RECOBEFMIX.
  PCaloHits_fastSimProducer_EcalHitsEE_RECOBEFMIX.
  PCaloHits_fastSimProducer_EcalHitsES_RECOBEFMIX.
  PCaloHits_fastSimProducer_HcalHits_RECOBEFMIX.
  PSimHits_MuonSimHits_MuonCSCHits_RECOBEFMIX.
  PSimHits_MuonSimHits_MuonDTHits_RECOBEFMIX.
  PSimHits_MuonSimHits_MuonRPCHits_RECOBEFMIX.
  PSimHits_fastSimProducer_TrackerHits_RECOBEFMIX.
  SimTracks_fastSimProducer_MuonSimTracks_RECOBEFMIX.
  SimTracks_fastSimProducer__RECOBEFMIX.
  edmHepMCProduct_generatorSmeared__RECOBEFMIX.

If you do not need these branches and they are not produced
in the current process, an alternate solution to adding
dictionaries is to drop these branches on input using the
inputCommands parameter of the PoolSource.
----- End Fatal Exception -------------------------------------------------

Expand to see more relval errors ...

smuzaffar · 2026-04-11T06:22:44Z

this resolves merge conflicts for evo branch

tcuisset and others added 9 commits March 27, 2026 16:06

Use clear-and-minimize idiom to ensure memory from vectors is release…

423f5e6

…d at the end of each event

Add setting to toggle creation of legacy SimCluster and creation of "…

f669da1

…new" (boundary, merged, CaloParticle-SimCluster) SimCluster collections

Create a test for ModuleEventAllocMonitor

5f88538

Fix: normalize hit fractions for CaloParticle collection as well

86932cc

Replace sorted vector with unordered_map

2b97270

Elements are frequently inserted and erased to the map.

Aggregate per-module unordered_maps to one unordered_map

4cecc2d

Merge pull request cms-sw#50578 from tcuisset/caloTruth-pr1

d849504

Produce multiple SimCluster collections in CaloTruthAccumulator

Merge pull request cms-sw#50684 from makortel/optimizeModuleEventAllo…

f7e45ed

…cMonitor Speed up ModuleEventAllocMonitor

cmsbuild added simulation-pending core-pending pending-signatures tests-pending orp-pending code-checks-pending changes-dataformats evolution labels Apr 10, 2026

cmsbuild added code-checks-rejected and removed code-checks-pending labels Apr 10, 2026

Dr15Jones mentioned this pull request Apr 10, 2026

Forward porting for EVOLUTION branch failed #49906

Open

Merge CMSSW_17_0_X into CMSSW_17_0_EVOLUTION_X.

b4e1d2c

Dr15Jones force-pushed the evo_merge_2026_04_10 branch from 752373d to b4e1d2c Compare April 10, 2026 14:53

cmsbuild added tests-started code-checks-pending and removed tests-pending code-checks-rejected labels Apr 10, 2026

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 10, 2026

cmsbuild added tests-rejected and removed tests-started labels Apr 10, 2026

smuzaffar merged commit 665cf3c into cms-sw:CMSSW_17_0_EVOLUTION_X Apr 11, 2026
8 of 9 checks passed

Dr15Jones deleted the evo_merge_2026_04_10 branch May 18, 2026 14:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix merge conflicts from CMSSW_17_0_X#50696

Fix merge conflicts from CMSSW_17_0_X#50696
smuzaffar merged 10 commits into
cms-sw:CMSSW_17_0_EVOLUTION_Xfrom
Dr15Jones:evo_merge_2026_04_10

Dr15Jones commented Apr 10, 2026 •

edited

Loading

Uh oh!

Dr15Jones commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026 •

edited

Loading

Uh oh!

cmsbuild commented Apr 10, 2026

Uh oh!

Dr15Jones commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026

Uh oh!

smuzaffar commented Apr 11, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

Dr15Jones commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR description:

PR validation:

Uh oh!

Dr15Jones commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmsbuild commented Apr 10, 2026

Uh oh!

Dr15Jones commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026

Uh oh!

cmsbuild commented Apr 10, 2026

Failed RelVals

Uh oh!

smuzaffar commented Apr 11, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Dr15Jones commented Apr 10, 2026 •

edited

Loading

cmsbuild commented Apr 10, 2026 •

edited

Loading