Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Geant4 user actions and CMS mctruth handling clean-up #41181

Merged
merged 5 commits into from
Mar 26, 2023

Conversation

civanch
Copy link
Contributor

@civanch civanch commented Mar 24, 2023

PR description:

This PR include modifications intended to reduce dependencies between objects used at SIM step in run time. Also couple of values saved into persistent MC truth objects are fixed. This PR should be useful for R&D and upgrade developments. No change in mainstream WFs are expected.

PR validation:

private

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for: likely NO

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-41181/34865

  • This PR adds an extra 52KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @civanch (Vladimir Ivantchenko) for master.

It involves the following packages:

  • SimG4CMS/Calo (simulation)
  • SimG4Core/Application (simulation)
  • SimG4Core/Notification (simulation)

@cmsbuild, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@makortel, @felicepantaleo, @rovere, @bsunanda, @thomreis, @simonepigazzini, @fabiocos, @slomeo this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-41181/34868

  • This PR adds an extra 52KB to repository

@cmsbuild
Copy link
Contributor

Pull request #41181 was updated. @cmsbuild, @civanch, @mdhildreth can you please check and sign again.

@civanch
Copy link
Contributor Author

civanch commented Mar 24, 2023

please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19bd3a/31586/summary.html
COMMIT: da69d4f
CMSSW: CMSSW_13_1_X_2023-03-24-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/41181/31586/install.sh to create a dev area with all the needed externals and cmssw changes.

Build

I found compilation error when building:

>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4CMS/Forward/src/ZdcNumberingScheme.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4CMS/Forward/src/ZdcSD.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4CMS/Forward/src/ZdcShowerLibrary.cc
>> Compiling bigobj /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4CMS/Forward/src/BHMNumberingScheme.cc
>> Compiling bigobj /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4CMS/Forward/src/BHMSD.cc
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4CMS/Forward/src/TimingSD.cc:32:20: error: conflicting declaration 'const float invgev'
   32 | static const float invgev = 1.0 / CLHEP::GeV;
      |                    ^~~~~~
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4Core/SensitiveDetector/interface/SensitiveDetector.h:6,
                 from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4Core/SensitiveDetector/interface/SensitiveTkDetector.h:5,
                 from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-24-1100/src/SimG4CMS/Forward/interface/TimingSD.h:10,


@cmsbuild
Copy link
Contributor

Pull request #41181 was updated. @cmsbuild, @civanch, @mdhildreth can you please check and sign again.

@civanch
Copy link
Contributor Author

civanch commented Mar 24, 2023

please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19bd3a/31587/summary.html
COMMIT: 0ce793a
CMSSW: CMSSW_13_1_X_2023-03-24-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/41181/31587/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

  • 11834.13DAS Error
  • 11834.19DAS Error
  • 11834.21DAS Error
Expand to see more relval errors ...
  • 11834.24
  • 11834.99
  • 11846.0
  • 11846.19
  • 12034.0
  • 12434.0
  • 12634.0
  • 12634.99
  • 12834.0
  • 13034.0
  • 13034.99
  • 20834.0
  • 20834.103
  • 20834.21
  • 20834.5
  • 20834.501
  • 20834.502
  • 20834.75
  • 20834.76
  • 20834.9
  • 20896.0
  • 20900.0
  • 21034.114
  • 21034.21
  • 21034.99
  • 21034.9921
  • 21034.999
  • 250200.0
  • 250200.17
  • 250200.18
  • 250202.0
  • 250202.1
  • 250202.17
  • 250202.171
  • 250202.172
  • 250202.18
  • 250202.181
  • 250202.184
  • 250202.2
  • 250202.3
  • 250202.4
  • 250202.5
  • 250203.0
  • 250203.17
  • 250203.18
  • 250204.0
  • 250204.17
  • 250204.18
  • 250205.0
  • 250205.17
  • 250205.18
  • 250206.0
  • 250206.17
  • 250206.18
  • 250206.181
  • 250207.0
  • 250207.17
  • 250207.18
  • 250208.17
  • 250208.18
  • 500200.0
  • 500202.0
  • 500203.0
  • 500204.0
  • 500205.0
  • 500206.0
  • 500207.0
  • 2500.311
  • 2500.312
  • 2500.401
  • 2500.601

Comparison Summary

Summary:

  • You potentially removed 3 lines from the logs
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3554286
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3554263
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor Author

civanch commented Mar 25, 2023

please test

there were DAS errors

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19bd3a/31589/summary.html
COMMIT: 0ce793a
CMSSW: CMSSW_13_1_X_2023-03-24-2300/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/41181/31589/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially removed 6 lines from the logs
  • Reco comparison results: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3554286
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3554257
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor Author

civanch commented Mar 25, 2023

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

@perrotta
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit ccfa2f5 into cms-sw:master Mar 26, 2023
@iarspider
Copy link
Contributor

iarspider commented Mar 28, 2023

@civanch the DBG_X IBs are failing to build ( log ) after this PR was merged:

/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/gcc/11.2.1-f9b9dfdd886f71cd63f5538223d8f161/bin/c++ -c -DGNU_GCC -D_GNU_SOURCE -DEIGEN_DONT_PARALLELIZE -DTBB_USE_GLIBCXX_VERSION=110201 -DTBB_SUPPRESS_DEPRECATED_MESSAGES -DTBB_PREVIEW_RESUMABLE_TASKS=1 -DTBB_PREVIEW_TASK_GROUP_EXTENSIONS=1 -DBOOST_SPIRIT_THREADSAFE -DPHOENIX_THREADSAFE -DBOOST_MATH_DISABLE_STD_FPCLASSIFY -DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX -DGNU_GCC -DG4V9 -DGNU_GCC -DG4V9 -DDD4HEP_USE_GEANT4_UNITS=1 -DCMSSW_GIT_HASH='CMSSW_13_1_DBG_X_2023-03-27-2300' -DPROJECT_NAME='CMSSW' -DPROJECT_VERSION='CMSSW_13_1_DBG_X_2023-03-27-2300' -I/data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/9dde49def0b6f642763e19f977feeb75/opt/cmssw/el8_amd64_gcc11/cms/cmssw/CMSSW_13_1_DBG_X_2023-03-27-2300/src -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/dd4hep/v01-23x-3637f0613a0d3afea6b636bfbb4ace09/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/geant4/10.7.2-0e5231ef1da903b5220f5e39be20c6b6/include/Geant4 -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/geant4/10.7.2-0e5231ef1da903b5220f5e39be20c6b6/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/pcre/8.43-5dcc901acc02f624b22dd9840b2357e8/include -isystem/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/boost/1.80.0-d560885614912b656cea04440e0ae44f/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/bz2lib/1.0.6-2c1f18484cb66c30aba7929f2be5e7d4/include -isystem/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/clhep/2.4.5.1-7e9b1c45d7f5b4361ac787761986b8a2/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/cuda/11.5.2-66a9473808e7d5863d5bbec0824e2c4a/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/expat/2.1.0-5f6457b4c04e97afec6079bd7d2db998/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/gsl/2.6-fcf47bcbedd800ca8386c7e2920fa474/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/hepmc/2.06.10-8d052e96205063f65fddfc4cbf40f506/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/libuuid/2.34-0451b31e1b9a58c6aeefab41c18eea34/include -isystem/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/lcg/root/6.26.11-9cfff04c7e738c67c5f012057fa9fe5a/include -isystem/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/tbb/v2021.8.0-b05aa240920b2e90a45b2d4a5dc13536/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/vecgeom/v1.1.17-10b2db97d6b1736305b7b352fc807529/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/vecgeom/v1.1.17-10b2db97d6b1736305b7b352fc807529/include/VecGeom -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/xerces-c/3.1.3-96261f23c7d6fbfb7d59be544bd882f3/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/xz/5.2.5-83d0a00b575efd1701e07bedf7977343/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/zlib/1.2.11-3dfb2715f3608466b74431b80eb9d788/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/eigen/82dd3710dac619448f50331c1d6a35da673f764a-9ac4aed18ac60d0189693c592862694d/include/eigen3 -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/fmt/8.0.1-43b841663c2a0d6622910a1ad66d228d/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/md5/1.0.0-e68283f2de2e2e709a0db99db3b53205/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/OpenBLAS/0.3.15-26c67b8b638762cfd2e2bcfc936e3ec7/include -I/data/cmsbld/jenkins/workspace/build-any-ib/w/el8_amd64_gcc11/external/tinyxml2/6.2.0-c2bad61e58f94d6db8f640afbd739be2/include -O2 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -std=c++17 -ftree-vectorize -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -fuse-ld=bfd -msse3 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wextra -Wpessimizing-move -Wclass-memaccess -Wno-cast-function-type -Wno-unused-but-set-parameter -Wno-ignored-qualifiers -Wno-deprecated-copy -Wno-unused-parameter -Wunused -Wparentheses -Wno-deprecated -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=unused-label -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -ftls-model=global-dynamic -pthread -DBOOST_DISABLE_ASSERTS -g -O3 -DEDM_ML_DEBUG -flto -fipa-icf -flto-odr-type-merging -fno-fat-lto-objects -Wodr -Wl,--exclude-libs,ALL  -fPIC   /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/9dde49def0b6f642763e19f977feeb75/opt/cmssw/el8_amd64_gcc11/cms/cmssw/CMSSW_13_1_DBG_X_2023-03-27-2300/src/SimG4CMS/Calo/src/HFFibre.cc -o tmp/el8_amd64_gcc11/src/SimG4CMS/Calo/src/SimG4CMSCalo/bigobj/HFFibre.cc.o
/data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/9dde49def0b6f642763e19f977feeb75/opt/cmssw/el8_amd64_gcc11/cms/cmssw/CMSSW_13_1_DBG_X_2023-03-27-2300/src/SimG4CMS/Calo/src/CaloSD.cc: In member function 'virtual void CaloSD::update(const EndOfTrack*)':
  /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/9dde49def0b6f642763e19f977feeb75/opt/cmssw/el8_amd64_gcc11/cms/cmssw/CMSSW_13_1_DBG_X_2023-03-27-2300/src/SimG4CMS/Calo/src/CaloSD.cc:710:64: error: 'it' was not declared in this scope; did you mean 'Hit'?
   710 |         edm::LogVerbatim("CaloSim") << "CaloSD: get track " << it << " from Container of size "
      |                                                                ^~
      |                                                                Hit

it was defined as index of last element in trksForThisEvent ( here ). Could you please check if printing that value is still required?

@bsunanda
Copy link
Contributor

bsunanda commented Mar 29, 2023 via email

@civanch
Copy link
Contributor Author

civanch commented Mar 29, 2023

@bsunanda , you fix another problem in #41215

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants