upgrade EvtGen interface for v03.00.00 by kawaho · Pull Request #51029 · cms-sw/cmssw

kawaho · 2026-05-25T15:59:56Z

PR description:

Resolves #50935

This commits upgrade EvtGen interface to v03.00.00 in CMSSW, which

is now thread-safe, allowing multithreading in production
adds new final state photon radiation models in Sherpa/Photon++ and Vincia
includes new physics models and decay table implemented by Belle 2

This commit depends on a new cmssw external build cms-sw/cmsdist#10580

PR validation:

Tested by producing a small TTTo2L2Nu Pythia+EvtGen sample locally with multiple threads, using a similar the same fragment as 1 but with PythiaConcurrentHadronizerFilter.

One remaining issue is that the EvtGen interface now calls ThreadHandoff implemented for GEANT4 to ensure a stream started in a certain thread stays in the same thread. Shall we move ThreadHandoff under FWCore/Concurrency instead, so packages with similar concurrency implementation (one instance per thread/use of thread_local) can use the same module? @makortel @Dr15Jones, please advise.

cmsbuild · 2026-05-25T16:00:24Z

cms-bot internal usage

cmsbuild · 2026-05-25T16:02:07Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49473

ERROR: Build errors found during clang-tidy run.

src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
Suppressed 441 warnings (441 in non-user code).
--
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:35:40: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   35 |   void setSeed(unsigned long int seed) override;
      |                                        ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:338:29: error: no member named 'getSherpaPhotonsModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  338 |     radCorrEngine = genList.getSherpaPhotonsModel(1e-7, 1, 0);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:340:29: error: no member named 'getVinciaQEDModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  340 |     radCorrEngine = genList.getVinciaQEDModel(1.0e-7);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:534:24: error: non-const lvalue reference to type 'EvtDecayTable' cannot bind to a temporary of type 'EvtDecayTable *' [clang-diagnostic-error]
  534 |         EvtDecayTable& evtDecayTable = EvtDecayTable::getInstance();
      |                        ^               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppressed 1178 warnings (1174 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

makortel · 2026-05-26T17:35:40Z

 <use name="FWCore/Concurrency"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Framework"/>
+<use name="SimG4Core/Application"/>


(as I commented already in the earlier issue) I think this dependence on SimG4Core should be avoided. I opened #51041 to move the ThreadHandoff to FWCore/Utilities.

thanks, merged

cmsbuild · 2026-05-26T18:27:05Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49482

ERROR: Build errors found during clang-tidy run.

src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
Suppressed 441 warnings (441 in non-user code).
--
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:35:40: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   35 |   void setSeed(unsigned long int seed) override;
      |                                        ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:338:29: error: no member named 'getSherpaPhotonsModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  338 |     radCorrEngine = genList.getSherpaPhotonsModel(1e-7, 1, 0);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:340:29: error: no member named 'getVinciaQEDModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  340 |     radCorrEngine = genList.getVinciaQEDModel(1.0e-7);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:534:24: error: non-const lvalue reference to type 'EvtDecayTable' cannot bind to a temporary of type 'EvtDecayTable *' [clang-diagnostic-error]
  534 |         EvtDecayTable& evtDecayTable = EvtDecayTable::getInstance();
      |                        ^               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppressed 1178 warnings (1174 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

cmsbuild · 2026-05-26T18:31:18Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49483

ERROR: Build errors found during clang-tidy run.

src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
Suppressed 441 warnings (441 in non-user code).
--
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:35:40: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   35 |   void setSeed(unsigned long int seed) override;
      |                                        ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:338:29: error: no member named 'getSherpaPhotonsModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  338 |     radCorrEngine = genList.getSherpaPhotonsModel(1e-7, 1, 0);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:340:29: error: no member named 'getVinciaQEDModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  340 |     radCorrEngine = genList.getVinciaQEDModel(1.0e-7);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:534:24: error: non-const lvalue reference to type 'EvtDecayTable' cannot bind to a temporary of type 'EvtDecayTable *' [clang-diagnostic-error]
  534 |         EvtDecayTable& evtDecayTable = EvtDecayTable::getInstance();
      |                        ^               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppressed 1178 warnings (1174 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

kawaho · 2026-05-26T18:55:48Z

Please undo the merge. A better workflow is to wait for #51041 to be merged first, and then rebase on top of an IB that contains it.

Right...will do

cmsbuild · 2026-05-27T04:21:22Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49486

ERROR: Build errors found during clang-tidy run.

src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
Suppressed 441 warnings (441 in non-user code).
--
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:35:40: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   35 |   void setSeed(unsigned long int seed) override;
      |                                        ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:338:29: error: no member named 'getSherpaPhotonsModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  338 |     radCorrEngine = genList.getSherpaPhotonsModel(1e-7, 1, 0);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:340:29: error: no member named 'getVinciaQEDModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  340 |     radCorrEngine = genList.getVinciaQEDModel(1.0e-7);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:534:24: error: non-const lvalue reference to type 'EvtDecayTable' cannot bind to a temporary of type 'EvtDecayTable *' [clang-diagnostic-error]
  534 |         EvtDecayTable& evtDecayTable = EvtDecayTable::getInstance();
      |                        ^               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppressed 1178 warnings (1174 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

smuzaffar · 2026-05-28T10:38:09Z

@kawaho , please update this PR to avoid SimG4Core/Application in GeneratorInterface/ExternalDecays/BuildFile.xml) file and include FWCore/Utilities/interface/ThreadHandoff.h instead of SimG4Core/Application/interface/ThreadHandoff.h in GeneratorInterface/ExternalDecays/interface/EvtGenThreadOwner.h . Once these changes are done then we can start the PR tests again

makortel · 2026-05-28T14:16:03Z

#51041 is now merged and available in IBs since CMSSW_17_0_X_2026-05-27-2300.

cmsbuild · 2026-05-28T17:19:06Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49555

ERROR: Build errors found during clang-tidy run.

src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
Suppressed 441 warnings (441 in non-user code).
--
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:35:40: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   35 |   void setSeed(unsigned long int seed) override;
      |                                        ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:338:29: error: no member named 'getSherpaPhotonsModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  338 |     radCorrEngine = genList.getSherpaPhotonsModel(1e-7, 1, 0);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:340:29: error: no member named 'getVinciaQEDModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  340 |     radCorrEngine = genList.getVinciaQEDModel(1.0e-7);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:534:24: error: non-const lvalue reference to type 'EvtDecayTable' cannot bind to a temporary of type 'EvtDecayTable *' [clang-diagnostic-error]
  534 |         EvtDecayTable& evtDecayTable = EvtDecayTable::getInstance();
      |                        ^               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppressed 1178 warnings (1174 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

cmsbuild · 2026-05-29T21:23:38Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49582

ERROR: Build errors found during clang-tidy run.

      |                                      ^~~~~~~~
Suppressed 441 warnings (441 in non-user code).
--
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:35:40: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   35 |   void setSeed(unsigned long int seed) override;
      |                                        ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/interface/myEvtRandomEngine.h:37:38: error: only virtual member functions can be marked 'override' [clang-diagnostic-error]
   37 |   unsigned long int lastSeed() const override;
      |                                      ^~~~~~~~
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:63:14: warning: use nullptr [modernize-use-nullptr]
--
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:348:29: error: no member named 'getSherpaPhotonsModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  348 |     radCorrEngine = genList.getSherpaPhotonsModel(1e-7, 1, 0);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:350:29: error: no member named 'getVinciaQEDModel' in 'EvtExternalGenList' [clang-diagnostic-error]
  350 |     radCorrEngine = genList.getVinciaQEDModel(1.0e-7);
      |                     ~~~~~~~ ^
src/GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc:544:24: error: non-const lvalue reference to type 'EvtDecayTable' cannot bind to a temporary of type 'EvtDecayTable *' [clang-diagnostic-error]
  544 |         EvtDecayTable& evtDecayTable = EvtDecayTable::getInstance();
      |                        ^               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppressed 1178 warnings (1174 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

smuzaffar · 2026-05-29T22:15:22Z

code-checks with cms.week1.PR_fc95d40b/100.0-b40a4405c86ba87a5ae00696120942d1

cmsbuild · 2026-05-29T22:22:33Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49583

Found files with invalid states:
- GeneratorInterface/Pythia8Interface/interface/Pythia8EvtGenPatched.h:
  - Added: 5d91b5b
  - Modified: 8a34914
  - Deleted: a6dfc85

Code check has found code style and quality issues which could be resolved by applying following patch(s)

code-checks:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49583/code-checks.patch
e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49583/code-checks.patch | patch -p1
You can also run scram build code-checks to apply code checks directly
code-format:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49583/code-format.patch
e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-51029/49583/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

Ka Wa Ho added 5 commits May 15, 2026 16:46

minimal changes to make it compile

5d91b5b

move to thread_local

8a34914

Apply ThreadHandoff to ConcurrentExternalDecayDriver

72ed0d7

move pythia patch to cmsdist

a6dfc85

bump to EvtGen v3.0.0; enable fsr options

4dcf499

cmsbuild added this to the CMSSW_17_0_X milestone May 25, 2026

cmsbuild added generators-pending pending-signatures tests-pending orp-pending code-checks-pending labels May 25, 2026

kawaho mentioned this pull request May 25, 2026

Testing thread-safe EvtGen v3.0.0-beta1 in CMSSW #50935

Closed

cmsbuild added code-checks-rejected and removed code-checks-pending labels May 25, 2026

akritkbehera mentioned this pull request May 25, 2026

Upgrade EvtGen to v03.00.00 cms-sw/cmsdist#10580

Open

makortel reviewed May 26, 2026

View reviewed changes

cmsbuild added simulation-pending core-pending code-checks-pending and removed code-checks-rejected labels May 26, 2026

cmsbuild added code-checks-rejected code-checks-pending and removed code-checks-pending code-checks-rejected labels May 26, 2026

cmsbuild added code-checks-rejected and removed code-checks-pending labels May 26, 2026

kawaho force-pushed the EvtGev3 branch from 2d42378 to 4dcf499 Compare May 26, 2026 19:02

cmsbuild removed simulation-pending core-pending labels May 26, 2026

add fsr models to evtgen tests

d66589b

cmsbuild added code-checks-pending and removed code-checks-rejected labels May 27, 2026

cmsbuild added code-checks-rejected and removed code-checks-pending labels May 27, 2026

ThreadHandoff.h is moved to FWCore/Utilities

150b0c7

cmsbuild added code-checks-pending and removed code-checks-rejected labels May 28, 2026

cmsbuild added code-checks-rejected and removed code-checks-pending labels May 28, 2026

add dummy MPI initialize

ba5de48

cmsbuild added code-checks-pending and removed code-checks-rejected labels May 29, 2026

cmsbuild added code-checks-rejected and removed code-checks-pending labels May 29, 2026

cmsbuild added code-checks-pending and removed code-checks-rejected labels May 29, 2026

cmsbuild added code-checks-rejected and removed code-checks-pending labels May 29, 2026

Conversation

kawaho commented May 25, 2026

PR description:

PR validation:

Uh oh!

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

Uh oh!

Uh oh!

cmsbuild commented May 25, 2026

Uh oh!

makortel May 26, 2026

Choose a reason for hiding this comment

Uh oh!

kawaho May 26, 2026

Choose a reason for hiding this comment

Uh oh!

cmsbuild commented May 26, 2026

Uh oh!

cmsbuild commented May 26, 2026

Uh oh!

kawaho commented May 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmsbuild commented May 27, 2026

Uh oh!

smuzaffar commented May 28, 2026

Uh oh!

makortel commented May 28, 2026

Uh oh!

cmsbuild commented May 28, 2026

Uh oh!

cmsbuild commented May 29, 2026

Uh oh!

smuzaffar commented May 29, 2026

Uh oh!

cmsbuild commented May 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cmsbuild commented May 25, 2026 •

edited

Loading

kawaho commented May 26, 2026 •

edited

Loading