Merge pull request #98 from rest-for-physics/jgalan_printMetadata

TRestGeant4Metadata::PrintMetadata. Adding active volumes

Author: jgalan

inc/TRestGeant4Metadata.h

@@ -56,8 +56,6 @@ class TRestGeant4Metadata : public TRestMetadata {
     void ReadDetector();
     void ReadBiasing();
 
-    bool fDetectorSectionInitialized = false;  //!
-
     /// Class used to store and retrieve geometry info
     TRestGeant4GeometryInfo fGeant4GeometryInfo;
 

src/TRestGeant4Metadata.cxx

@@ -1411,8 +1411,6 @@ void TRestGeant4Metadata::ReadDetector() {
         }
     }
 
-    fDetectorSectionInitialized = true;
-
     if (GetNumberOfActiveVolumes() == 0) {
         RESTError << "No active volumes defined. Please check the detector section" << RESTendl;
         exit(1);
@@ -1441,28 +1439,30 @@ void TRestGeant4Metadata::PrintMetadata() {
     } else {
         RESTMetadata << "Register empty tracks was NOT enabled" << RESTendl;
     }
+
+    RESTMetadata << " " << RESTendl;
     RESTMetadata << "   ++++++++++ Generator +++++++++++   " << RESTendl;
     RESTMetadata << "Number of generated events: " << GetNumberOfEvents() << RESTendl;
     fGeant4PrimaryGeneratorInfo.Print();
 
     for (int i = 0; i < GetNumberOfSources(); i++) GetParticleSource(i)->PrintParticleSource();
 
-    if (fDetectorSectionInitialized) {
-        RESTMetadata << "   ++++++++++ Detector +++++++++++   " << RESTendl;
-        RESTMetadata << "Energy range (keV): (" << GetMinimumEnergyStored() << ", "
-                     << GetMaximumEnergyStored() << ")" << RESTendl;
-        RESTMetadata << "Number of sensitive volumes: " << GetNumberOfSensitiveVolumes() << RESTendl;
-        for (const auto& sensitiveVolume : fSensitiveVolumes) {
-            RESTMetadata << "Sensitive volume: " << sensitiveVolume << RESTendl;
-        }
-        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;
-        }
+    RESTMetadata << " " << RESTendl;
+    RESTMetadata << "   ++++++++++ Detector +++++++++++   " << RESTendl;
+    RESTMetadata << "Energy range (keV): (" << GetMinimumEnergyStored() << ", " << GetMaximumEnergyStored()
+                 << ")" << RESTendl;
+    RESTMetadata << "Number of sensitive volumes: " << GetNumberOfSensitiveVolumes() << RESTendl;
+    for (const auto& sensitiveVolume : fSensitiveVolumes) {
+        RESTMetadata << "Sensitive volume: " << sensitiveVolume << RESTendl;
+    }
+    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;
     }
+
     for (unsigned int n = 0; n < GetNumberOfBiasingVolumes(); n++) {
         GetBiasingVolume(n).PrintBiasingVolume();
     }

src/TRestGeant4ParticleSource.cxx

@@ -33,9 +33,10 @@ TRestGeant4ParticleSource::TRestGeant4ParticleSource() = default;
 TRestGeant4ParticleSource::~TRestGeant4ParticleSource() = default;
 
 void TRestGeant4ParticleSource::PrintParticleSource() {
-    RESTMetadata << "---------------------------------------" << RESTendl;
-    RESTMetadata << "Particle Source Name: " << GetParticleName() << RESTendl;
-    if (!fParticlesTemplate.empty() || fGenFilename != "NO_SUCH_PARA") {
+    RESTMetadata << " " << RESTendl;
+    if (GetParticleName() != "" && GetParticleName() != "NO_SUCH_PARA")
+        RESTMetadata << "Particle Source Name: " << GetParticleName() << RESTendl;
+    if (!fParticlesTemplate.empty() && fGenFilename != "NO_SUCH_PARA") {
         RESTMetadata << "Generator file: " << GetGenFilename() << RESTendl;
         RESTMetadata << "Stored templates: " << fParticlesTemplate.size() << RESTendl;
         RESTMetadata << "Particles: ";

src/TRestGeant4ParticleSourceDecay0.cxx

@@ -11,7 +11,8 @@ TRestGeant4ParticleSourceDecay0::TRestGeant4ParticleSourceDecay0()
 
 void TRestGeant4ParticleSourceDecay0::PrintParticleSource() {
     metadata << "---------------------------------------" << endl;
-    metadata << "Particle Source Name: " << fParticleName << endl;
+    if (!fParticleName.empty() && fParticleName != "NO_SUCH_PARA")
+        metadata << "Particle Source Name: " << fParticleName << endl;
     metadata << "Parent Nuclide: " << fParentName << endl;
     metadata << "Decay Mode: " << fDecayType << endl;
     metadata << "Daughter Level: " << fDaughterLevel << endl;