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.

Sign up for GitHub

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

Jump to bottom

Add support for Geant4@11.2 #1075

Merged
merged 9 commits into from
Dec 31, 2023
Merged

Add support for Geant4@11.2 #1075

merged 9 commits into from
Dec 31, 2023

Conversation

whokion
Copy link
Contributor

@whokion whokion commented Dec 28, 2023 •
edited by sethrj
Loading

Updates for Geant4 11.2

  • Change G4VTouchable to G4TouchableHistory
  • Use G4EmParameters::Instance()->SetLPM instead of G4EmModel::SetLPMFlag

Description

This MR updates compatibility of celeritas to the new version of Geant4 11.2

Fixes #1074

@whokion whokion requested a review from sethrj December 28, 2023 17:01
@whokion whokion added the external Integration with external components (VecGeom, Geant4, ROOT, HepMC3) label Dec 28, 2023
@whokion whokion mentioned this pull request Dec 28, 2023
Closed
sethrj
sethrj requested changes Dec 28, 2023
View reviewed changes
Copy link
Member

@sethrj sethrj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @whokion ! But these changes need to be guarded with G4VERSION macros (there are examples elsewhere) so that it still works all the way back to Geant4 10.5...

@whokion
Copy link
Contributor Author

whokion commented Dec 28, 2023 •
edited
Loading

As far as I can see, these updates should be good for 10.5 and later without the version guard.

@sethrj sethrj changed the title Update for Geant4.11.2 Add support for Geant4@11.2 Dec 28, 2023
@sethrj sethrj added the bug Something isn't working label Dec 28, 2023
smuzaffar added a commit to cms-sw/cmsdist that referenced this pull request Dec 29, 2023
@smuzaffar
[celeritas] Testing celeritas-project/celeritas#1075
3d86b32
sethrj
sethrj approved these changes Dec 30, 2023
View reviewed changes
Copy link
Member

@sethrj sethrj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a somewhat hacky CELERITAS_GEANT4_VERSION version macro via the celeritas_sys_config which doesn't require anything downstream to link against geant4. So this now builds on 11.0 and 11.2.

@sethrj
Copy link
Member

sethrj commented Dec 30, 2023

I'm still having trouble getting this to work at runtime with geant4 11.2. Trying to setup the photoelectric model gives:

G4LivermorePhotoElectricModel data file </opt/spack/opt/spack/sonoma/geant4-data/11.2.0/6vfum26/share/geant4-data-11.2.0/G4EMLOW8.5/epics2017/phot/pe-cs-82.dat> is not opened!

G4EMLOW8.5 exists but epics2017 doesn't!

Looks like this could be related to geant4 change emutils-V11-00-23??

@amandalund
Copy link
Contributor

Odd, I do see the data in G4EMLOW8.5/epics2017/phot/...

@sethrj
Copy link
Member

sethrj commented Dec 31, 2023

OK, somehow it looks like EMLOW 6.5 got aliased into my 8.5 directory... weird!

@sethrj sethrj enabled auto-merge (squash) December 31, 2023 01:29
@sethrj sethrj merged commit f9b51d7 into celeritas-project:develop Dec 31, 2023
19 of 20 checks passed
@sethrj sethrj mentioned this pull request Feb 22, 2024
Merged
@whokion whokion deleted the fix-g4.11.2 branch March 7, 2024 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sethrj sethrj sethrj approved these changes

@amandalund amandalund Awaiting requested review from amandalund

Assignees
No one assigned
Labels
bug Something isn't working external Integration with external components (VecGeom, Geant4, ROOT, HepMC3)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build errors with GEANT4 11.2.0
3 participants
@whokion @sethrj @amandalund