Skip to content

Implement nested volumes #144

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

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

Implement nested volumes #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7642390
add necessary maps to retrieve assemblies and nested volumes informat…
AlvaroEzq Nov 18, 2025
91755b0
add TRestGeant4GeometryInfo::GetAlternativePathFromGeant4Path
AlvaroEzq Nov 18, 2025
17518e9
fix trailing whitespace
AlvaroEzq Nov 18, 2025
710fb1e
add and fix debugging messages
AlvaroEzq Nov 18, 2025
62a4516
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 18, 2025
6046e4a
add function myXml::GetChildByAttributeValue
AlvaroEzq Nov 24, 2025
70cd131
fix imprint parsing of nested assemblies
AlvaroEzq Nov 24, 2025
4f4ca90
add RML configuration parameter to set the TRestGeant4GeometryInfo::f…
AlvaroEzq Nov 24, 2025
182df27
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 24, 2025
71a4a96
fix std::function typo and indentation
AlvaroEzq Nov 24, 2025
3618222
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 24, 2025
e868d5b
add forgotten filling of fGeant4AssemblyImprintToAssemblyLogicalNameMap
AlvaroEzq Nov 24, 2025
d6f78a6
fix filling of fGeant4AssemblyImprintToAssemblyLogicalNameMap
AlvaroEzq Nov 28, 2025
5379b36
replace fGeant4PhysicalNameToNewPhysicalNameMap by its reverse fNewPh…
AlvaroEzq Nov 29, 2025
ccc508c
fix typo in name
AlvaroEzq Nov 29, 2025
e7406c6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions inc/TRestGeant4GeometryInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#ifndef REST_TRESTGEANT4GEOMETRYINFO_H
#define REST_TRESTGEANT4GEOMETRYINFO_H

#include <TRestStringOutput.h>
#include <TString.h>
#include <TVector3.h>

Expand All @@ -12,10 +13,11 @@
class G4VPhysicalVolume;

class TRestGeant4GeometryInfo {
ClassDef(TRestGeant4GeometryInfo, 3);
ClassDef(TRestGeant4GeometryInfo, 4);

private:
bool fIsAssembly = false;
TString fPathSeparator = "_";

std::map<Int_t, TString> fVolumeNameMap = {};
std::map<TString, Int_t> fVolumeNameReverseMap = {};
Expand All @@ -34,12 +36,14 @@ class TRestGeant4GeometryInfo {
std::vector<TString> fGdmlLogicalNames;

std::map<TString, TString>
fGeant4PhysicalNameToNewPhysicalNameMap; /*
* only makes sense when using assembly
*/
fNewPhysicalToGeant4PhysicalNameMap; // reverse map of fGeant4PhysicalNameToNewPhysicalNameMap

std::map<TString, TString> fGeant4AssemblyImprintToGdmlNameMap;
std::map<TString, std::map<TString, TString>> fGdmlAssemblyToChildrenGeant4ToGdmlPhysicalNameMap;
std::map<TString, TString> fGeant4AssemblyImprintToAssemblyLogicalNameMap;

std::map<TString, TString> fPhysicalToLogicalVolumeMap;
std::map<TString, std::vector<TString> > fLogicalToPhysicalMap;
std::map<TString, std::vector<TString>> fLogicalToPhysicalMap;
// many physical volumes can point to one single logical
std::map<TString, TString> fLogicalToMaterialMap;
std::map<TString, TVector3> fPhysicalToPositionInWorldMap;
Expand All @@ -49,7 +53,9 @@ class TRestGeant4GeometryInfo {

void PopulateFromGdml(const TString&);

TString GetAlternativePathFromGeant4Path(const TString&) const;
TString GetAlternativeNameFromGeant4PhysicalName(const TString&) const;
std::set<TString> GetAlternativeNamesFromGeant4PhysicalName(const TString&) const;
TString GetGeant4PhysicalNameFromAlternativeName(const TString&) const;

std::vector<TString> GetAllLogicalVolumes() const;
Expand Down Expand Up @@ -86,7 +92,8 @@ class TRestGeant4GeometryInfo {
}

inline bool IsAssembly() const { return fIsAssembly; }

inline TString GetPathSeparator() const { return fPathSeparator; }
void SetPathSeparator(const TString& separator) { fPathSeparator = separator; }
void InsertVolumeName(Int_t id, const TString& volumeName);

TString GetVolumeFromID(Int_t id) const;
Expand Down
Loading