refactor:Update classes

sci/CMakeLists.txt

@@ -1,9 +1,9 @@
 ##############################################################################
-#   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    #
-#   Copyright (C) 2019 University of Santiago de Compostela                  #
-#   Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay                  #
-#   Copyright (C) 2023 University of Coruña                                  #
-#   Copyright (C) 2019-2025 Members of R3B Collaboration                     #
+#   Copyright (C) 2018 GSI Helmholtzzentrum für Schwerionenforschung GmbH    #
+#   Copyright (C) 2018 University of Santiago de Compostela                  #
+#   Copyright (C) 2018-2026 CEA-DAM-DIF, Université Paris-Saclay             #
+#   Copyright (C) 2023-2026 University of Coruña                             #
+#   Copyright (C) 2018-2026 Members of R3B Collaboration                     #
 #                                                                            #
 #             This software is distributed under the terms of the            #
 #                 GNU General Public Licence (GPL) version 3,                #
@@ -15,34 +15,34 @@
 ##############################################################################
 
 set(SRCS
-    R3BSofSci.cxx
-    R3BSofSciContFact.cxx
-    R3BSofSciRawPosPar.cxx
-    R3BSofSciMapped2TcalPar.cxx
-    R3BSofSciTcal2RawPosPar.cxx
-    R3BSofSciTcal2RawTofPar.cxx
-    R3BSofSciCalPosPar.cxx
-    R3BSofSciCalTofPar.cxx
-    R3BSofSciSingleTcal2CalPosCaveCPar.cxx
-    R3BSofSciMapped2Tcal.cxx
-    R3BSofSciTcal2SingleTcal.cxx
-    R3BSofSciSingleTcal2Cal.cxx
-    R3BSofSciSingleTcal2Hit.cxx)
+    ./sim/R3BSofSci.cxx
+    ./pars/R3BSofSciContFact.cxx
+    ./pars/R3BSofSciRawPosPar.cxx
+    ./pars/R3BSofSciMapped2TcalPar.cxx
+    ./pars/R3BSofSciTcal2RawPosPar.cxx
+    ./pars/R3BSofSciTcal2RawTofPar.cxx
+    ./pars/R3BSofSciCalPosPar.cxx
+    ./pars/R3BSofSciCalTofPar.cxx
+    ./pars/R3BSofSciSingleTcal2CalPosCaveCPar.cxx
+    ./calibration/R3BSofSciMapped2Tcal.cxx
+    ./calibration/R3BSofSciTcal2SingleTcal.cxx
+    ./calibration/R3BSofSciSingleTcal2Cal.cxx
+    ./calibration/R3BSofSciSingleTcal2Hit.cxx)
 
 set(HEADERS
-    R3BSofSci.h
-    R3BSofSciContFact.h
-    R3BSofSciRawPosPar.h
-    R3BSofSciMapped2TcalPar.h
-    R3BSofSciTcal2RawPosPar.h
-    R3BSofSciTcal2RawTofPar.h
-    R3BSofSciCalPosPar.h
-    R3BSofSciCalTofPar.h
-    R3BSofSciSingleTcal2CalPosCaveCPar.h
-    R3BSofSciMapped2Tcal.h
-    R3BSofSciTcal2SingleTcal.h
-    R3BSofSciSingleTcal2Cal.h
-    R3BSofSciSingleTcal2Hit.h)
+    ./sim/R3BSofSci.h
+    ./pars/R3BSofSciContFact.h
+    ./pars/R3BSofSciRawPosPar.h
+    ./pars/R3BSofSciMapped2TcalPar.h
+    ./pars/R3BSofSciTcal2RawPosPar.h
+    ./pars/R3BSofSciTcal2RawTofPar.h
+    ./pars/R3BSofSciCalPosPar.h
+    ./pars/R3BSofSciCalTofPar.h
+    ./pars/R3BSofSciSingleTcal2CalPosCaveCPar.h
+    ./calibration/R3BSofSciMapped2Tcal.h
+    ./calibration/R3BSofSciTcal2SingleTcal.h
+    ./calibration/R3BSofSciSingleTcal2Cal.h
+    ./calibration/R3BSofSciSingleTcal2Hit.h)
 
 add_library_with_dictionary(
     LIBNAME
@@ -55,6 +55,9 @@ add_library_with_dictionary(
     ${SRCS}
     INCLUDEDIRS
     ${CMAKE_CURRENT_SOURCE_DIR}
+    sim
+    pars
+    calibration
     DEPENDENCIES
     R3BSofTcal
     R3BSofData

sci/SofSciLinkDef.h

@@ -1,10 +1,10 @@
 // clang-format off
 /******************************************************************************
- *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
- *   Copyright (C) 2019 University of Santiago de Compostela                  *
- *   Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay                  *
- *   Copyright (C) 2023 University of Coruña                                  *
- *   Copyright (C) 2019-2025 Members of R3B Collaboration                     *
+ *   Copyright (C) 2018 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
+ *   Copyright (C) 2018 University of Santiago de Compostela                  *
+ *   Copyright (C) 2018-2026 CEA-DAM-DIF, Université Paris-Saclay             *
+ *   Copyright (C) 2023-2026 University of Coruña                             *
+ *   Copyright (C) 2018-2026 Members of R3B Collaboration                     *
  *                                                                            *
  *             This software is distributed under the terms of the            *
  *                 GNU General Public Licence (GPL) version 3,                *

sofana/SofAnaLinkDef.h

@@ -2,9 +2,9 @@
 /******************************************************************************
  *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
  *   Copyright (C) 2019 University of Santiago de Compostela                  *
- *   Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay                  *
- *   Copyright (C) 2023 University of Coruña                                  *
- *   Copyright (C) 2019-2025 Members of R3B Collaboration                     *
+ *   Copyright (C) 2019-2026 CEA-DAM-DIF, Université Paris-Saclay             *
+ *   Copyright (C) 2023-2026 University of Coruña                             *
+ *   Copyright (C) 2019-2026 Members of R3B Collaboration                     *
  *                                                                            *
  *             This software is distributed under the terms of the            *
  *                 GNU General Public Licence (GPL) version 3,                *

tofwall/digi/R3BSofTofWDigitizer.cxx

@@ -86,11 +86,11 @@ InitStatus R3BSofTofWDigitizer::Init()
     R3BLOG(info, "");
 
     // Get input array
-    FairRootManager* ioman = FairRootManager::Instance();
+    auto* ioman = FairRootManager::Instance();
     R3BLOG_IF(fatal, !ioman, "FairRootManager not found.");
 
-    fMCTrack = (TClonesArray*)ioman->GetObject("MCTrack");
-    fTofPoints = (TClonesArray*)ioman->GetObject("SofTofWPoint");
+    fMCTrack = dynamic_cast<TClonesArray*>(ioman->GetObject("MCTrack"));
+    fTofPoints = dynamic_cast<TClonesArray*>(ioman->GetObject("SofTofWPoint"));
 
     // Register output array fTofHits
     fTofHits = new TClonesArray("R3BSofTofWHitData");
@@ -125,12 +125,12 @@ void R3BSofTofWDigitizer::Exec(Option_t*)
 
         if (PID > 1000080160) // Z=8 and A=16
         {
-            Double_t fX_in = pointData->GetXIn();
-            Double_t fY_in = pointData->GetYIn();
-            Double_t fZ_in = pointData->GetZIn();
-            Double_t fX_out = pointData->GetXOut();
-            Double_t fY_out = pointData->GetYOut();
-            Double_t fZ_out = pointData->GetZOut();
+            auto fX_in = pointData->GetXIn();
+            auto fY_in = pointData->GetYIn();
+            auto fZ_in = pointData->GetZIn();
+            auto fX_out = pointData->GetXOut();
+            auto fY_out = pointData->GetYOut();
+            auto fZ_out = pointData->GetZOut();
             paddle = pointData->GetDetCopyID() + 1;
             // std::cout<<paddle<<std::endl;
 

tofwall/sim/R3BSofTofW.cxx

@@ -43,7 +43,6 @@ R3BSofTofW::R3BSofTofW(const TString& geoFile, const TGeoTranslation& trans, con
 R3BSofTofW::R3BSofTofW(const TString& geoFile, const TGeoCombiTrans& combi)
     : R3BDetector("R3BSofTofW", kSOFTofWall, geoFile.Data(), combi)
     , fSofTofWallCollection(new TClonesArray("R3BSofTofWPoint"))
-    , fPosIndex(0)
 {
     ResetParameters();
 }
@@ -64,7 +63,7 @@ void R3BSofTofW::Initialize()
 }
 
 // -----   Public method ProcessHits  --------------------------------------
-Bool_t R3BSofTofW::ProcessHits(FairVolume* vol)
+bool R3BSofTofW::ProcessHits(FairVolume* vol)
 {
     /** This method is called from the MC stepping */
 
@@ -78,10 +77,10 @@ Bool_t R3BSofTofW::ProcessHits(FairVolume* vol)
         TVirtualMC::GetMC()->TrackMomentum(fMomIn);
     }
 
-    Double_t M_in = TVirtualMC::GetMC()->TrackMass() * 1000.;
+    auto M_in = TVirtualMC::GetMC()->TrackMass() * 1000.;
     // Charge and mass are now obtained from PDG Code
-    Double_t fZ_in = int(TVirtualMC::GetMC()->TrackPid() / 10000) - 100000.;
-    Double_t fA_in = 0.1 * (TVirtualMC::GetMC()->TrackPid() - (100000 + fZ_in) * 10000.);
+    auto fZ_in = int(TVirtualMC::GetMC()->TrackPid() / 10000) - 100000.;
+    auto fA_in = 0.1 * (TVirtualMC::GetMC()->TrackPid() - (100000 + fZ_in) * 10000.);
 
     fELoss += TVirtualMC::GetMC()->Edep();
     if (fELoss > 0)
@@ -138,7 +137,7 @@ void R3BSofTofW::EndOfEvent()
 // -----   Public method Register   -------------------------------------------
 void R3BSofTofW::Register()
 {
-    FairRootManager::Instance()->Register("SofTofWPoint", GetName(), fSofTofWallCollection, kTRUE);
+    FairRootManager::Instance()->Register("SofTofWPoint", GetName(), fSofTofWallCollection, true);
 }
 
 // -----   Public method GetCollection   --------------------------------------
@@ -158,7 +157,7 @@ TClonesArray* R3BSofTofW::GetCollection(Int_t iColl) const
 void R3BSofTofW::Print(Option_t*) const
 {
     auto nHits = fSofTofWallCollection->GetEntriesFast();
-    R3BLOG(info, nHits << " points registered in this event");
+    LOG(info) << "R3BSofTofW: " << nHits << " points registered in this event";
 }
 
 // -----   Public method Reset   ----------------------------------------------

tofwall/sim/R3BSofTofW.h

@@ -51,7 +51,7 @@ class R3BSofTofW : public R3BDetector
      ** to the collection.
      *@param vol  Pointer to the active volume
      **/
-    Bool_t ProcessHits(FairVolume* vol = 0) override;
+    bool ProcessHits(FairVolume* vol = 0) override;
 
     /** Virtual method EndOfEvent
      **
@@ -67,7 +67,7 @@ class R3BSofTofW : public R3BDetector
     void Register() override;
 
     /** Gets the produced collections */
-    TClonesArray* GetCollection(Int_t iColl) const override;
+    TClonesArray* GetCollection(int iColl) const override;
 
     /** Virtual method Print
      **
@@ -85,28 +85,27 @@ class R3BSofTofW : public R3BDetector
   private:
     /** Track information to be stored until the track leaves the
         active volume. **/
-    Int_t fTrackID;                 //!  track index
-    Int_t fTrackPID;                //!  particle identification
-    Int_t fVolumeID;                //!  volume id
-    Int_t fDetCopyID;               //!  Det volume id
-    Double_t fZ;                    //!  atomic number fragment
-    Double_t fA;                    //!  mass number fragment
+    int fTrackID;                   //!  track index
+    int fTrackPID;                  //!  particle identification
+    int fVolumeID;                  //!  volume id
+    int fDetCopyID;                 //!  Det volume id
+    double fZ;                      //!  atomic number fragment
+    double fA;                      //!  mass number fragment
     TLorentzVector fPosIn, fPosOut; //!  position
     TLorentzVector fMomIn, fMomOut; //!  momentum
-    Double32_t fTime;               //!  time
-    Double32_t fLength;             //!  length
-    Double32_t fELoss;              //!  energy loss
-    Int_t fPosIndex;                //!
+    double fTime;                   //!  time
+    double fLength;                 //!  length
+    double fELoss;                  //!  energy loss
 
     TClonesArray* fSofTofWallCollection; //  The point collection
 
     /** Private method AddPoint
      **
      ** Adds a SofTofWallPoint to the HitCollection
      **/
-    R3BSofTofWPoint* AddPoint(Int_t trackID,
-                              Int_t detID,
-                              Int_t volid,
+    R3BSofTofWPoint* AddPoint(int trackID,
+                              int detID,
+                              int volid,
                               Double_t Z,
                               Double_t A,
                               TVector3 posIn,
@@ -138,5 +137,4 @@ inline void R3BSofTofW::ResetParameters()
     fMomIn.SetXYZM(0.0, 0.0, 0.0, 0.0);
     fMomOut.SetXYZM(0.0, 0.0, 0.0, 0.0);
     fTime = fLength = fELoss = fZ = fA = 0;
-    fPosIndex = 0;
 };