Merge pull request #100 from rest-for-physics/99-problem-retrieving-volume-id-at-getenergyinvolume

lobis · web-flow · commit d4c4d9507287 · 2023-09-10T16:56:59.000+02:00
Update metadata volume information print
diff --git a/src/TRestGeant4Metadata.cxx b/src/TRestGeant4Metadata.cxx
@@ -1457,10 +1457,10 @@ void TRestGeant4Metadata::PrintMetadata() {
     }
     RESTMetadata << "Number of active volumes: " << GetNumberOfActiveVolumes() << RESTendl;
     for (unsigned int n = 0; n < GetNumberOfActiveVolumes(); n++) {
-        RESTMetadata << "Name: " << GetActiveVolumeName(n)
-                     << ", ID: " << GetActiveVolumeID(GetActiveVolumeName(n))
-                     << ", maxStep: " << GetMaxStepSize(GetActiveVolumeName(n)) << "mm "
-                     << ", chance: " << GetStorageChance(GetActiveVolumeName(n)) << RESTendl;
+        const auto name = GetActiveVolumeName(n);
+        RESTMetadata << "Name: " << name << ", ID: " << fGeant4GeometryInfo.GetIDFromVolume(name)
+                     << ", maxStep: " << GetMaxStepSize(name) << "mm "
+                     << ", chance: " << GetStorageChance(name) << RESTendl;
     }
 
     for (unsigned int n = 0; n < GetNumberOfBiasingVolumes(); n++) {

Original file line number	Diff line number	Diff line change
`@@ -1457,10 +1457,10 @@ void TRestGeant4Metadata::PrintMetadata() {`
`1457`	`1457`	`}`
`1458`	`1458`	`RESTMetadata << "Number of active volumes: " << GetNumberOfActiveVolumes() << RESTendl;`
`1459`	`1459`	`for (unsigned int n = 0; n < GetNumberOfActiveVolumes(); n++) {`
`1460`		`- RESTMetadata << "Name: " << GetActiveVolumeName(n)`
`1461`		`- << ", ID: " << GetActiveVolumeID(GetActiveVolumeName(n))`
`1462`		`- << ", maxStep: " << GetMaxStepSize(GetActiveVolumeName(n)) << "mm "`
`1463`		`- << ", chance: " << GetStorageChance(GetActiveVolumeName(n)) << RESTendl;`
	`1460`	`+ const auto name = GetActiveVolumeName(n);`
	`1461`	`+ RESTMetadata << "Name: " << name << ", ID: " << fGeant4GeometryInfo.GetIDFromVolume(name)`
	`1462`	`+ << ", maxStep: " << GetMaxStepSize(name) << "mm "`
	`1463`	`+ << ", chance: " << GetStorageChance(name) << RESTendl;`
`1464`	`1464`	`}`
`1465`	`1465`
`1466`	`1466`	`for (unsigned int n = 0; n < GetNumberOfBiasingVolumes(); n++) {`