Minor update for CALIFA simulation classes

Minor change Added include TArray.h in calibration/R3BCalifaMapped2CrystalCalPar.h Added include TArray.h in calibration/R3BCalifaMapped2CrystalCalPar.h Added include TArrayF.h in calibration/R3BCalifaMapped2CrystalCalPar.h Added include TArrayF.h in calibration/R3BCalifaMapped2CrystalCal.h Update R3BCalifa class for simulation and related classes Minor change Minor change in r3bcalifa Check compilation Almost ready the new implementation Minor change Minor update Added final IOConnector for output data Added final IOConnector for output data Minor changes Clang-format Clang-format Minor change Minor change Minor change Minor change Minor change Minor change Minor change Minor change in R3BCalifaCrystalCal2Cluster.cxx Use of TObject for R3BCalifaClusterData
R3BRootGroup · Jan 6, 2024 · 0d878c8 · 0d878c8
1 parent 494f869
commit 0d878c8
Show file tree

Hide file tree

Showing 22 changed files with 442 additions and 555 deletions.
diff --git a/califa/CalifaLinkDef.h b/califa/CalifaLinkDef.h
@@ -19,6 +19,8 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
+#pragma link C++ class vector<R3BCalifaCrystalCalData>+;
+
 #pragma link C++ class R3BCalifaContFact;
 #pragma link C++ class R3BCalifaClusterPar+;
 #pragma link C++ class R3BCalifaMappingPar+;

diff --git a/califa/calibration/R3BCalifaCrystalCal2Cluster.cxx b/califa/calibration/R3BCalifaCrystalCal2Cluster.cxx
@@ -147,9 +147,8 @@ R3BCalifaCrystalCal2Cluster::R3BCalifaCrystalCal2Cluster()
     , fCrystalCalData(NULL)
     , fCalifaClusterData(NULL)
     , fGeometryVersion(2021)
-    , fCrystalThreshold(100.)
-    , fGammaClusterThreshold(1000)
-    , fProtonClusterThreshold(50000)
+    , fCrystalThreshold(0)
+    , fGammaClusterThreshold(0)
     , fRoundWindow(0.25)
     , fSimulation(kFALSE)
     , fCalifaGeo(NULL)
@@ -173,9 +172,10 @@ R3BCalifaCrystalCal2Cluster::~R3BCalifaCrystalCal2Cluster()
 void R3BCalifaCrystalCal2Cluster::SetParContainers()
 {
     FairRuntimeDb* rtdb = FairRuntimeDb::instance();
+    R3BLOG_IF(fatal, !rtdb, "FairRuntimeDb not found");
 
-    fCalifaGeoPar = (R3BTGeoPar*)rtdb->getContainer("CalifaGeoPar");
-    fTargetGeoPar = (R3BTGeoPar*)rtdb->getContainer("TargetGeoPar");
+    fCalifaGeoPar = dynamic_cast<R3BTGeoPar*>(rtdb->getContainer("CalifaGeoPar"));
+    fTargetGeoPar = dynamic_cast<R3BTGeoPar*>(rtdb->getContainer("TargetGeoPar"));
 
     if (!fCalifaGeoPar)
     {
@@ -213,15 +213,15 @@ InitStatus R3BCalifaCrystalCal2Cluster::Init()
 {
     R3BLOG(info, "");
     assert(!fCalifaClusterData); // in case someone calls Init() twice.
-    SetParContainers();
+    SetParContainers();          // TODO: This should not be here!!!
 
-    FairRootManager* ioManager = FairRootManager::Instance();
-    R3BLOG_IF(fatal, !ioManager, "FairRootManager not found");
+    auto* rootman = FairRootManager::Instance();
+    R3BLOG_IF(fatal, !rootman, "FairRootManager not found");
 
-    fCrystalCalData = (TClonesArray*)ioManager->GetObject("CalifaCrystalCalData");
+    fCrystalCalData = dynamic_cast<TClonesArray*>(rootman->GetObject("CalifaCrystalCalData"));
 
     fCalifaClusterData = new TClonesArray("R3BCalifaClusterData");
-    ioManager->Register("CalifaClusterData", "CALIFA Cluster", fCalifaClusterData, !fOnline);
+    rootman->Register("CalifaClusterData", "CALIFA Cluster", fCalifaClusterData, !fOnline);
 
     fCalifaGeo = R3BCalifaGeometry::Instance();
 
@@ -260,7 +260,7 @@ void R3BCalifaCrystalCal2Cluster::Exec(Option_t* opt)
 {
     Reset();
 
-    const int numCrystalHits = fCrystalCalData->GetEntries();
+    const int numCrystalHits = fCrystalCalData->GetEntriesFast();
 
     R3BLOG(debug1, "Crystal hits at start:" << numCrystalHits);
 

diff --git a/califa/calibration/R3BCalifaCrystalCal2Cluster.h b/califa/calibration/R3BCalifaCrystalCal2Cluster.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
- *   Copyright (C) 2019-2023 Members of R3B Collaboration                     *
+ *   Copyright (C) 2019-2024 Members of R3B Collaboration                     *
  *                                                                            *
  *             This software is distributed under the terms of the            *
  *                 GNU General Public Licence (GPL) version 3,                *
@@ -11,6 +11,8 @@
  * or submit itself to any jurisdiction.                                      *
  ******************************************************************************/
 
+#pragma once
+
 #ifndef R3BCALIFACRYSTALCAL2CLUSTER_H
 #define R3BCALIFACRYSTALCAL2CLUSTER_H 1
 
@@ -96,10 +98,11 @@ class R3BCalifaCrystalCal2Cluster : public FairTask
     Int_t fGeometryVersion; // Selecting the geometry of the CALIFA calorimeter
     Int_t fTotalCrystals;
 
-    Double_t fCrystalThreshold;       // Minimum energy requested in a crystal to be included in a cluster
-    Double_t fProtonClusterThreshold; // Minimum energy in a crystal to be considered as a proton cluster candidate
-    Double_t fGammaClusterThreshold;  // Minimum energy in a crystal to be considered as a gamma cluster candidate
-    Double_t fProtonThreshold;        // Defines the cut energy between proton and gamma readout
+    Double_t fCrystalThreshold; // Minimum energy requested in a crystal to be included in a cluster
+    Double_t fProtonClusterThreshold =
+        50.;                         // Minimum energy in a crystal to be considered as a proton cluster candidate
+    Double_t fGammaClusterThreshold; // Minimum energy in a crystal to be considered as a gamma cluster candidate
+    Double_t fProtonThreshold;       // Defines the cut energy between proton and gamma readout
 
     Double_t fRoundWindow; // Cluster window
     Bool_t fSimulation;    // Simulation flag

diff --git a/califa/calibration/R3BCalifaCrystalCal2CrystalCalPID.cxx b/califa/calibration/R3BCalifaCrystalCal2CrystalCalPID.cxx
@@ -1,6 +1,6 @@
 /******************************************************************************
  *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
- *   Copyright (C) 2019-2023 Members of R3B Collaboration                     *
+ *   Copyright (C) 2019-2024 Members of R3B Collaboration                     *
  *                                                                            *
  *             This software is distributed under the terms of the            *
  *                 GNU General Public Licence (GPL) version 3,                *
@@ -18,9 +18,9 @@
 #include "FairRootManager.h"
 #include "FairRunAna.h"
 #include "FairRuntimeDb.h"
-
 #include <fstream>
 #include <iomanip>
+#include <iostream>
 
 #include "R3BCalifaCrystalCal2CrystalCalPID.h"
 #include "R3BCalifaCrystalCalData.h"

diff --git a/califa/calibration/R3BCalifaCrystalCal2CrystalCalPID.h b/califa/calibration/R3BCalifaCrystalCal2CrystalCalPID.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
- *   Copyright (C) 2019-2023 Members of R3B Collaboration                     *
+ *   Copyright (C) 2019-2024 Members of R3B Collaboration                     *
  *                                                                            *
  *             This software is distributed under the terms of the            *
  *                 GNU General Public Licence (GPL) version 3,                *
@@ -11,6 +11,8 @@
  * or submit itself to any jurisdiction.                                      *
  ******************************************************************************/
 
+#pragma once
+
 #ifndef R3BCalifaCrystalCal2CrystalCalPID_H
 #define R3BCalifaCrystalCal2CrystalCalPID_H
 

diff --git a/califa/calibration/R3BCalifaCrystalCal2TotCalPar.cxx b/califa/calibration/R3BCalifaCrystalCal2TotCalPar.cxx
@@ -180,8 +180,8 @@ void R3BCalifaCrystalCal2TotCalPar::Exec(Option_t* opt)
         // Fill histograms
         if (CalHit[i]->GetEnergy() > fThreshold)
             energy_vs_tot_crystal[crystalId - 1]->SetPoint(
-                energy_vs_tot_crystal[crystalId - 1]->GetN(), CalHit[i]->GetToT_Energy(), CalHit[i]->GetEnergy());
-        LOG(debug) << "Tot = " << CalHit[i]->GetToT_Energy();
+                energy_vs_tot_crystal[crystalId - 1]->GetN(), CalHit[i]->GetToTEnergy(), CalHit[i]->GetEnergy());
+        LOG(debug) << "Tot = " << CalHit[i]->GetToTEnergy();
         LOG(debug) << "Energy = " << CalHit[i]->GetEnergy();
     }
 

diff --git a/califa/calibration/R3BCalifaCrystalCal2TotCalPar.h b/califa/calibration/R3BCalifaCrystalCal2TotCalPar.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
- *   Copyright (C) 2019-2023 Members of R3B Collaboration                     *
+ *   Copyright (C) 2019-2024 Members of R3B Collaboration                     *
  *                                                                            *
  *             This software is distributed under the terms of the            *
  *                 GNU General Public Licence (GPL) version 3,                *
@@ -11,12 +11,14 @@
  * or submit itself to any jurisdiction.                                      *
  ******************************************************************************/
 
+#pragma once
+
 #ifndef R3BCalifaCrystalCal2TotCalPar_H
-#define R3BCalifaCrystalCal2TotCalPar_H
+#define R3BCalifaCrystalCal2TotCalPar_H 1
 
-#include "FairTask.h"
-#include "TGraph.h"
-#include "TH1F.h"
+#include <FairTask.h>
+#include <TGraph.h>
+#include <TH1F.h>
 
 class TClonesArray;
 class R3BCalifaMappingPar;

diff --git a/califa/calibration/R3BCalifaMapped2CrystalCal.h b/califa/calibration/R3BCalifaMapped2CrystalCal.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
- *   Copyright (C) 2019-2023 Members of R3B Collaboration                     *
+ *   Copyright (C) 2019-2024 Members of R3B Collaboration                     *
  *                                                                            *
  *             This software is distributed under the terms of the            *
  *                 GNU General Public Licence (GPL) version 3,                *
@@ -20,14 +20,17 @@
 // -----                                                                   -----
 // -----------------------------------------------------------------------------
 
+#pragma once
+
 #ifndef R3BCALIFAMAPPED2CRYSTALCAL_H
-#define R3BCALIFAMAPPED2CRYSTALCAL_H
+#define R3BCALIFAMAPPED2CRYSTALCAL_H 1
 
 #include "FairTask.h"
 
 #include "R3BCalifaCrystalCalData.h"
 #include "R3BCalifaMappedData.h"
 
+#include <TArrayF.h>
 #include <TRandom.h>
 
 class TClonesArray;

diff --git a/califa/calibration/R3BCalifaMapped2CrystalCalPar.h b/califa/calibration/R3BCalifaMapped2CrystalCalPar.h
@@ -11,11 +11,14 @@
  * or submit itself to any jurisdiction.                                      *
  ******************************************************************************/
 
+#pragma once
+
 #ifndef R3BCALIFAMAPPED2CRYSTALCALPAR_H
-#define R3BCALIFAMAPPED2CRYSTALCALPAR_H
+#define R3BCALIFAMAPPED2CRYSTALCALPAR_H 1
 
-#include "FairTask.h"
-#include "TH1F.h"
+#include <FairTask.h>
+#include <TArrayF.h>
+#include <TH1F.h>
 
 class TClonesArray;
 class R3BCalifaMappingPar;