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

Fixed activeVolume for assemblies #45

Merged
merged 8 commits into from
May 10, 2022
Merged

Fixed activeVolume for assemblies #45

merged 8 commits into from
May 10, 2022

Conversation

lobis
Copy link
Member

@lobis lobis commented May 9, 2022

lobis Medium: 167

  • Fixes activeVolume definition not working properly with assemblies restG4#43
  • Replaces Nevents by nEvents in RML files (Nevents still works) for consistency
  • Replaces gdml_file by gdmlFile in RML files (gdml_file still works) for consistency
  • Replaced "plate" by "circle" in generator, for consistency with Geant4 (also I don't think a plate is necessarily circular, its more like a "sheet")
  • Other minor changes

@lobis lobis requested review from jgalan, nkx111 and juanangp and removed request for jgalan May 10, 2022 11:09
@lobis lobis requested a review from glorialuzon May 10, 2022 11:09
@lobis lobis marked this pull request as ready for review May 10, 2022 11:09
@jgalan
Copy link
Member

jgalan commented May 10, 2022

If we change the value of the parameter name, at least it should follow the standards. The corresponding metadata member is fGdmlFilename then the parameter should be gdmlFilename. I do not mind changing the metadata member name, but the naming should be consistent.

Then, if we include the line TRestMetadata::InitFromConfigFile() at the beginning of TRestGeant4Metadata::InitFromConfigFile, all the parameters matching their metadata member naming convention will be initialized with the RML values.

This could simplify the parameter retrieval in that method.

@jgalan
Copy link
Member

jgalan commented May 10, 2022

I see now that gdmFile is actually the parameter, and gdmlFilename is formed internally. Still, if TRestMetadata::InitFromConfigFile is called, then we could initialize directly fGdmlFilename. Although the logic might need revision.

@jgalan
Copy link
Member

jgalan commented May 10, 2022

We should probably throw gdml_file to adapt to the new naming conventions.

@lobis
Copy link
Member Author

lobis commented May 10, 2022

I see now that gdmFile is actually the parameter, and gdmlFilename is formed internally. Still, if TRestMetadata::InitFromConfigFile is called, then we could initialize directly fGdmlFilename. Although the logic might need revision.

I use explicit loading of the parameter to support both names for the parameter. I agree that the logic might need revision

@lobis lobis merged commit dc40a28 into master May 10, 2022
@lobis lobis deleted the lobis-activeVolume-43 branch May 10, 2022 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

activeVolume definition not working properly with assemblies
3 participants