Merge branch 'master' into lobis-quenching

Author: lobis

.github/pr-badge.yml

@@ -13,7 +13,5 @@
   message: "Ok: $additions"
   color: "green"
   when: "$additions < 100"
-- imageUrl: "https://gitlab.cern.ch/rest-for-physics/geant4lib/badges/$branchName/pipeline.svg"
-  url: "https://gitlab.cern.ch/rest-for-physics/geant4lib/-/commits/$branchName"
-- imageUrl: "https://github.com/rest-for-physics/geant4lib/actions/workflows/validation.yml/badge.svg?branch=$branchName"
+- imageUrl: "https://github.com/rest-for-physics/geant4lib/actions/workflows/frameworkValidation.yml/badge.svg?branch=$branchName"
   url: "https://github.com/rest-for-physics/geant4lib/commits/$branchName"

CMakeLists.txt

@@ -1,4 +1,4 @@
-set(LibraryVersion "2.0")
+set_library_version(LibraryVersion)
 add_definitions(-DLIBRARY_VERSION="${LibraryVersion}")
 
 if (${REST_DECAY0} MATCHES "ON")

inc/TRestGeant4AnalysisProcess.h

@@ -80,10 +80,6 @@ class TRestGeant4AnalysisProcess : public TRestEventProcess {
     Bool_t fPerProcessSensitiveEnergy = false;
     Bool_t fPerProcessSensitiveEnergyNorm = false;
 
-    // vectors for size and dimensions of prism used to compute "primaryOriginDistanceToPrism"
-    TVector3 fPrismCenter = {0, 0, 0};
-    TVector3 fPrismSize = {0, 0, 0};
-
     void Initialize() override;
 
     void LoadDefaultConfig();

inc/TRestGeant4EventViewer.h

@@ -15,6 +15,7 @@
 #ifndef RestCore_TRestGeant4EventViewer
 #define RestCore_TRestGeant4EventViewer
 
+#include "TEveStraightLineSet.h"
 #include "TRestEveEventViewer.h"
 #include "TRestGeant4Event.h"
 
@@ -25,6 +26,8 @@ class TRestGeant4EventViewer : public TRestEveEventViewer {
     TRestGeant4Event* fG4Event = nullptr;
     const TRestGeant4Metadata* fG4Metadata = nullptr;
 
+    TEveStraightLineSet* GetTrackEveDrawable(const TRestGeant4Track& track);
+
    public:
     void Initialize();
     void DeleteCurrentEvent();

inc/TRestGeant4PrimaryGeneratorInfo.h

@@ -48,7 +48,7 @@ EnergyDistributionTypes StringToEnergyDistributionTypes(const std::string&);
 
 enum class EnergyDistributionFormulas {
     COSMIC_NEUTRONS,
-    COSMIC,
+    COSMIC_GAMMAS,
 };
 
 std::string EnergyDistributionFormulasToString(const EnergyDistributionFormulas&);

macros/REST_Geant4_ViewEvent.C

@@ -10,8 +10,26 @@
 //*** This macro might need update/revision.
 //***
 //*******************************************************************************************************
-Int_t REST_Geant4_ViewEvent(TString fName) {
-    TRestBrowser* browser = new TRestBrowser("TRestGeant4EventViewer");
+Int_t REST_Geant4_ViewEvent(TString fName, Double_t geomScale = 0.1) {
+
+    TFile* f = TFile::Open(fName);
+
+    TIter nextkey(f->GetListOfKeys());
+    TKey* key;
+    Bool_t containsGeometry = false;
+    while ((key = (TKey*)nextkey())) {
+        RESTDebug << "Reading key with name : " << key->GetName() << RESTendl;
+        RESTDebug << "Key type (class) : " << key->GetClassName() << RESTendl;
+
+        if (key->GetClassName() == (TString) "TGeoManager") containsGeometry = true;
+    }
+
+    if (!containsGeometry) {
+        RESTWarning << "The file you are trying to visualize does not contain a geometry file!" << RESTendl;
+        RESTWarning << "Are you opening the file generated direcly with restG4?" << RESTendl;
+    }
+
+    TRestBrowser* browser = new TRestBrowser("TRestGeant4EventViewer", geomScale);
 
     TRestEvent* eve = new TRestGeant4Event();
     browser->SetInputEvent(eve);

src/TRestGeant4AnalysisProcess.cxx

@@ -387,11 +387,6 @@ void TRestGeant4AnalysisProcess::InitProcess() {
             fTracksEDepObservables.push_back(fObservables[i]);
             fParticleTrackEdep.emplace_back(particleName.Data());
         }
-
-        if (fObservables[i].find("primaryOriginDistanceToPrism") != string::npos) {
-            fPrismCenter = Get3DVectorParameterWithUnits("prismCenter");
-            fPrismSize = Get3DVectorParameterWithUnits("prismSizeXYZ");
-        }
     }
 }
 
@@ -442,28 +437,6 @@ TRestEvent* TRestGeant4AnalysisProcess::ProcessEvent(TRestEvent* inputEvent) {
     Double_t size = fOutputG4Event->GetBoundingBoxSize();
     SetObservableValue("boundingSize", size);
 
-    std::string eventPrimaryParticleName = fOutputG4Event->GetPrimaryEventParticleName(0).Data();
-    SetObservableValue("eventPrimaryParticleName", eventPrimaryParticleName);
-
-    std::string subEventPrimaryParticleName = fOutputG4Event->GetSubEventPrimaryEventParticleName().Data();
-    SetObservableValue("subEventPrimaryParticleName", subEventPrimaryParticleName);
-
-    auto observables = TRestEventProcess::ReadObservables();
-    auto it = std::find(observables.begin(), observables.end(), "primaryOriginDistanceToPrism");
-    if (it != observables.end()) {
-        TVector3 positionCentered = fOutputG4Event->GetPrimaryEventOrigin() - fPrismCenter;
-        double mx = TMath::Max(0., TMath::Max(-fPrismSize.X() / 2 - positionCentered.X(),
-                                              -fPrismSize.X() / 2 + positionCentered.X()));
-        double my = TMath::Max(0., TMath::Max(-fPrismSize.Y() / 2 - positionCentered.Y(),
-                                              -fPrismSize.Y() / 2 + positionCentered.Y()));
-        double mz = TMath::Max(0., TMath::Max(-fPrismSize.Z() / 2 - positionCentered.Z(),
-                                              -fPrismSize.Z() / 2 + positionCentered.Z()));
-
-        auto distance = TMath::Sqrt(mx * mx + my * my + mz * mz);
-
-        SetObservableValue("primaryOriginDistanceToPrism", distance);
-    }
-
     // process names as named by Geant4
     // processes present here will be added to the list of observables which can be used to see if the event
     // contains the process of interest.

src/TRestGeant4EventViewer.cxx

@@ -14,7 +14,6 @@
 
 #include "TRestGeant4EventViewer.h"
 
-#include <TEveStraightLineSet.h>
 #include <TRestStringOutput.h>
 
 using namespace std;
@@ -93,20 +92,20 @@ TrackVisualConfiguration GetTrackVisualConfiguration(const TRestGeant4Track& tra
     return config;
 }
 
-TEveStraightLineSet* GetTrackEveDrawable(const TRestGeant4Track& track) {
+TEveStraightLineSet* TRestGeant4EventViewer::GetTrackEveDrawable(const TRestGeant4Track& track) {
     auto lineSet = new TEveStraightLineSet(
         TString::Format("ID %d | %s | Created by %s | KE: %s",  //
                         track.GetTrackID(), track.GetParticleName().Data(), track.GetCreatorProcess().Data(),
                         ToEnergyString(track.GetInitialKineticEnergy()).c_str()));
 
     const auto& hits = track.GetHits();
     for (unsigned int i = 0; i < hits.GetNumberOfHits() - 1; i++) {
-        lineSet->AddLine({static_cast<float>(GEOM_SCALE * hits.GetPosition(i).x()),
-                          static_cast<float>(GEOM_SCALE * hits.GetPosition(i).y()),
-                          static_cast<float>(GEOM_SCALE * hits.GetPosition(i).z())},  //
-                         {static_cast<float>(GEOM_SCALE * hits.GetPosition(i + 1).x()),
-                          static_cast<float>(GEOM_SCALE * hits.GetPosition(i + 1).y()),
-                          static_cast<float>(GEOM_SCALE * hits.GetPosition(i + 1).z())});
+        lineSet->AddLine({static_cast<float>(fGeomScale * hits.GetPosition(i).x()),
+                          static_cast<float>(fGeomScale * hits.GetPosition(i).y()),
+                          static_cast<float>(fGeomScale * hits.GetPosition(i).z())},  //
+                         {static_cast<float>(fGeomScale * hits.GetPosition(i + 1).x()),
+                          static_cast<float>(fGeomScale * hits.GetPosition(i + 1).y()),
+                          static_cast<float>(fGeomScale * hits.GetPosition(i + 1).z())});
 
         const auto config = GetTrackVisualConfiguration(track);
         lineSet->SetMainColor(config.fColor);
@@ -213,8 +212,8 @@ void TRestGeant4EventViewer::AddEvent(TRestEvent* event) {
                 gEve->AddElement(hitPoints, hitsType[processType]);
             }
             hitsPoints.at(processName)
-                ->SetNextPoint(GEOM_SCALE * position.X(), GEOM_SCALE * position.Y(),
-                               GEOM_SCALE * position.Z());
+                ->SetNextPoint(fGeomScale * position.X(), fGeomScale * position.Y(),
+                               fGeomScale * position.Z());
             hitsCounter++;
         }
     }
@@ -237,8 +236,8 @@ void TRestGeant4EventViewer::AddText(TString text, TVector3 at) {
     TEveText* evText = new TEveText(text);
     evText->SetName("Event title");
     evText->SetFontSize(12);
-    evText->RefMainTrans().SetPos((at.X() + 15) * GEOM_SCALE, (at.Y() + 15) * GEOM_SCALE,
-                                  (at.Z() + 15) * GEOM_SCALE);
+    evText->RefMainTrans().SetPos((at.X() + 15) * fGeomScale, (at.Y() + 15) * fGeomScale,
+                                  (at.Z() + 15) * fGeomScale);
 
     gEve->AddElement(evText);
 }
@@ -248,13 +247,13 @@ void TRestGeant4EventViewer::AddMarker(Int_t trkID, TVector3 at, TString name) {
     marker->SetName(name);
     marker->SetMarkerColor(kMagenta);
     marker->SetMarkerStyle(3);
-    marker->SetPoint(0, at.X() * GEOM_SCALE, at.Y() * GEOM_SCALE, at.Z() * GEOM_SCALE);
+    marker->SetPoint(0, at.X() * fGeomScale, at.Y() * fGeomScale, at.Z() * fGeomScale);
     marker->SetMarkerSize(0.4);
     fHitConnectors[trkID]->AddElement(marker);
 }
 
 void TRestGeant4EventViewer::NextTrackVertex(Int_t trkID, TVector3 to) {
-    fHitConnectors[trkID]->SetNextPoint(to.X() * GEOM_SCALE, to.Y() * GEOM_SCALE, to.Z() * GEOM_SCALE);
+    fHitConnectors[trkID]->SetNextPoint(to.X() * fGeomScale, to.Y() * fGeomScale, to.Z() * fGeomScale);
 }
 
 void TRestGeant4EventViewer::AddTrack(Int_t trkID, Int_t parentID, TVector3 from, TString name) {
@@ -271,7 +270,7 @@ void TRestGeant4EventViewer::AddTrack(Int_t trkID, Int_t parentID, TVector3 from
     if (name.Contains("alpha")) fHitConnectors[trkID]->SetMainColor(kYellow);
     if (name.Contains("neutron")) fHitConnectors[trkID]->SetMainColor(kBlue);
 
-    fHitConnectors[trkID]->SetNextPoint(from.X() * GEOM_SCALE, from.Y() * GEOM_SCALE, from.Z() * GEOM_SCALE);
+    fHitConnectors[trkID]->SetNextPoint(from.X() * fGeomScale, from.Y() * fGeomScale, from.Z() * fGeomScale);
 
     if (parentID >= 0 && fHitConnectors.size() > (unsigned int)parentID)
         fHitConnectors[parentID]->AddElement(fHitConnectors[trkID]);
@@ -289,7 +288,7 @@ void TRestGeant4EventViewer::AddParentTrack(Int_t trkID, TVector3 from, TString
 
     fHitConnectors[trkID]->SetMainColor(kWhite);
     fHitConnectors[trkID]->SetLineWidth(4);
-    fHitConnectors[trkID]->SetNextPoint(from.X() * GEOM_SCALE, from.Y() * GEOM_SCALE, from.Z() * GEOM_SCALE);
+    fHitConnectors[trkID]->SetNextPoint(from.X() * fGeomScale, from.Y() * fGeomScale, from.Z() * fGeomScale);
 
     gEve->AddElement(fHitConnectors[trkID]);
 }

src/TRestGeant4PrimaryGeneratorInfo.cxx

@@ -163,8 +163,8 @@ string TRestGeant4PrimaryGeneratorTypes::EnergyDistributionFormulasToString(
     switch (type) {
         case EnergyDistributionFormulas::COSMIC_NEUTRONS:
             return "CosmicNeutrons";
-        case EnergyDistributionFormulas::COSMIC:
-            return "Cosmic";
+        case EnergyDistributionFormulas::COSMIC_GAMMAS:
+            return "CosmicGammas";
     }
     cout << "TRestGeant4PrimaryGeneratorTypes::EnergyDistributionFormulasToString - Error - Unknown energy "
             "distribution formula"
@@ -177,9 +177,10 @@ EnergyDistributionFormulas TRestGeant4PrimaryGeneratorTypes::StringToEnergyDistr
     if (TString(type).EqualTo(EnergyDistributionFormulasToString(EnergyDistributionFormulas::COSMIC_NEUTRONS),
                               TString::ECaseCompare::kIgnoreCase)) {
         return EnergyDistributionFormulas::COSMIC_NEUTRONS;
-    } else if (TString(type).EqualTo(EnergyDistributionFormulasToString(EnergyDistributionFormulas::COSMIC),
-                                     TString::ECaseCompare::kIgnoreCase)) {
-        return EnergyDistributionFormulas::COSMIC;
+    } else if (TString(type).EqualTo(
+                   EnergyDistributionFormulasToString(EnergyDistributionFormulas::COSMIC_GAMMAS),
+                   TString::ECaseCompare::kIgnoreCase)) {
+        return EnergyDistributionFormulas::COSMIC_GAMMAS;
     } else {
         cout << "TRestGeant4PrimaryGeneratorTypes::StringToEnergyDistributionFormulas - Error - Unknown "
                 "energyDistributionFormulas: "
@@ -206,13 +207,8 @@ TF1 TRestGeant4PrimaryGeneratorTypes::EnergyDistributionFormulasToRootFormula(
             distribution.GetXaxis()->SetTitle("Energy (keV)");
             return distribution;
         }
-        case EnergyDistributionFormulas::COSMIC:
-            const char* title = "Cosmic distribution approximation";
-            auto distribution = TF1(title, "TMath::Power(x, -2.7)", 1E2, 1E9);
-            distribution.SetNormalized(true);  // Normalized, not really necessary
-            distribution.SetTitle(title);
-            distribution.GetXaxis()->SetTitle("Energy (keV)");
-            return distribution;
+        case EnergyDistributionFormulas::COSMIC_GAMMAS:
+            exit(1);
     }
     cout << "TRestGeant4PrimaryGeneratorTypes::EnergyDistributionFormulasToRootFormula - Error - Unknown "
             "energy distribution formula"