feat(fiber/test):Add CI test for parameter containers

jose-luis-rs · jose-luis-rs · commit 376860a3481d · 2025-07-26T19:26:04.000+02:00
Minor change

More basic changes

Update

Minor change

Last change
diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ The following systems are tested regularly.
 
 | **OS Name** | **Arch** | **OS Version** | **Compiler** | **CMake**       | **C++ Version** |
 | ----------- | -------- | -------------- | ------------ | --------------- | --------------- |
-| Almalinux   | x86\_64  | 9.3            | GCC 11.4.1   | 3.27.9 / 4.0.3  | C++17 / C++20   |
+| Almalinux   | x86\_64  | 9.3            | GCC 11.4.1   | 3.27.9 / 4.0.3  | C++17 / C++20 / C++23   |
 | Almalinux   | x86\_64  | 9.4            | GCC 14.2.0   | 3.30.6          | C++17           |
 | RHEL        | x86\_64  | 9.6            | GCC 14.2.0   | 3.30.6          | C++17           |
 | Debian      | x86\_64  | 10             | GCC 8.3.0    | 3.27.4 / 4.0.3  | C++17           |
diff --git a/alpide/pars/R3BAlpideMappingPar.cxx b/alpide/pars/R3BAlpideMappingPar.cxx
@@ -186,4 +186,4 @@ void R3BAlpideMappingPar::printParams()
     }
 }
 
-ClassImp(R3BAlpideMappingPar);
+ClassImp(R3BAlpideMappingPar)
diff --git a/fiber/CMakeLists.txt b/fiber/CMakeLists.txt
@@ -77,3 +77,8 @@ add_library_with_dictionary(
     DEPENDENCIES
     R3BTCal
     R3BTracking)
+    
+if(BUILD_GEOMETRY)
+#    add_subdirectory(geobase)
+endif()
+add_subdirectory(test)
diff --git a/fiber/pars/R3BFiberMappingPar.cxx b/fiber/pars/R3BFiberMappingPar.cxx
@@ -18,37 +18,27 @@
 
 #include "R3BFiberMappingPar.h"
 
-#include "FairParamList.h"
 #include "R3BLogger.h"
+#include <FairParamList.h>
 
-#include "TMath.h"
-#include "TString.h"
+#include <TMath.h>
+#include <TString.h>
 
 // ---- Standard Constructor ---------------------------------------------------
 R3BFiberMappingPar::R3BFiberMappingPar(const TString& name, const TString& title, const TString& context)
     : FairParGenericSet(name, title, context)
-    , fNbSides(2)
-    , fNbChannels(512)
 {
-    for (Int_t s = 0; s < fNbSides; s++)
+    fTrigmap.resize(fNbSides);
+    for (size_t s = 0; s < fNbSides; s++)
     {
         fTrigmap[s] = new TArrayI(fNbChannels);
-        for (Int_t c = 0; c < fNbChannels; c++)
+        for (size_t c = 0; c < fNbChannels; c++)
         {
             fTrigmap[s]->AddAt(0, c);
         }
     }
 }
 
-// ----  Destructor ------------------------------------------------------------
-R3BFiberMappingPar::~R3BFiberMappingPar()
-{
-    clear();
-    for (Int_t s = 0; s < fNbSides; s++)
-        if (fTrigmap[s])
-            delete fTrigmap[s];
-}
-
 // ----  Method clear ----------------------------------------------------------
 void R3BFiberMappingPar::clear()
 {
@@ -71,12 +61,11 @@ void R3BFiberMappingPar::putParams(FairParamList* list)
     R3BLOG(info, "Nb of channels: " << fNbChannels);
     R3BLOG(info, "Nb of sides: " << fNbSides);
 
-    char name[300];
-    for (Int_t s = 0; s < fNbSides; s++)
+    for (size_t s = 0; s < fNbSides; s++)
     {
         fTrigmap[s]->Set(fNbChannels);
-        sprintf(name, "fiberside%dPar", s + 1);
-        list->add(name, *fTrigmap[s]);
+        TString name = Form("fiberside%zuPar", s + 1);
+        list->add(name.Data(), *fTrigmap[s]);
     }
 }
 
@@ -100,13 +89,11 @@ Bool_t R3BFiberMappingPar::getParams(FairParamList* list)
         return kFALSE;
     }
 
-    char name[300];
-    for (Int_t s = 0; s < fNbSides; s++)
+    for (size_t s = 0; s < fNbSides; s++)
     {
         fTrigmap[s]->Set(fNbChannels);
-        sprintf(name, "fiberside%dPar", s + 1);
-
-        if (!(list->fill(name, fTrigmap[s])))
+        TString name = Form("fiberside%zuPar", s + 1);
+        if (!(list->fill(name.Data(), fTrigmap[s])))
         {
             R3BLOG(error, "Could not initialize " << name);
             return kFALSE;
@@ -123,11 +110,11 @@ void R3BFiberMappingPar::print() { printParams(); }
 void R3BFiberMappingPar::printParams()
 {
     R3BLOG(info, "Mapping params for Fiber: Num of sides: " << fNbSides << " and channels: " << fNbChannels);
-    for (Int_t s = 0; s < fNbSides; s++)
-        for (Int_t c = 0; c < fNbChannels; c++)
+    for (size_t s = 0; s < fNbSides; s++)
+        for (size_t c = 0; c < fNbChannels; c++)
         {
             R3BLOG(info, "Side: " << s + 1 << " , channel:" << c + 1 << ", value: " << fTrigmap[s]->GetAt(c));
         }
 }
 
-ClassImp(R3BFiberMappingPar);
+ClassImp(R3BFiberMappingPar)
diff --git a/fiber/pars/R3BFiberMappingPar.h b/fiber/pars/R3BFiberMappingPar.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include "FairParGenericSet.h"
+#include <FairParGenericSet.h>
 
 #include "TArrayI.h"
-#include "TObjArray.h"
 #include <Rtypes.h>
+#include <TString.h>
 #include <stdint.h>
 #include <vector>
 
@@ -37,40 +37,40 @@ class R3BFiberMappingPar : public FairParGenericSet
                        const TString& context = "fiberMappingContext");
 
     /** Destructor **/
-    virtual ~R3BFiberMappingPar();
+    virtual ~R3BFiberMappingPar() = default;
 
     /** Reset all parameters **/
-    virtual void clear();
+    void clear() override;
 
     /** Store all parameters using FairRuntimeDB **/
-    virtual void putParams(FairParamList* list);
+    void putParams(FairParamList* list) override;
 
     /** Retrieve all parameters using FairRuntimeDB**/
-    Bool_t getParams(FairParamList* list);
+    Bool_t getParams(FairParamList* list) override;
 
     /** Print values of parameters to the standard output **/
-    virtual void print();
-    void printParams();
+    void print() override;
+    void printParams() override;
 
     /** Accessor functions **/
     const Int_t GetNbChannels() { return fNbChannels; }
     const Int_t GetNbSides() { return fNbSides; }
     // GetTrigMap in 1-base for side(1-2) and channel(1-X)
     const Int_t GetTrigMap(UInt_t side, UInt_t ch) { return fTrigmap[side - 1]->GetAt(ch - 1); }
 
-    void SetNbChannels(Int_t p) { fNbChannels = p; }
-    void SetNbSides(Int_t p) { fNbSides = p; }
+    inline void SetNbChannels(Int_t p) { fNbChannels = p; }
+    inline void SetNbSides(Int_t p) { fNbSides = p; }
     // SetTrigMap in 1-base for side(1-2) and channel(1-X)
-    void SetTrigMap(Int_t value, UInt_t side, UInt_t ch) { fTrigmap[side - 1]->AddAt(value, ch - 1); }
+    inline void SetTrigMap(Int_t value, UInt_t side, UInt_t ch) { fTrigmap[side - 1]->AddAt(value, ch - 1); }
 
   private:
-    Int_t fNbChannels;
-    Int_t fNbSides;
-    TArrayI* fTrigmap[2]; // Two sides per fiber
+    Int_t fNbChannels = 512;
+    Int_t fNbSides = 2; // Two sides per fiber
+    std::vector<TArrayI*> fTrigmap;
 
     const R3BFiberMappingPar& operator=(const R3BFiberMappingPar&);
     R3BFiberMappingPar(const R3BFiberMappingPar&);
 
   public:
-    ClassDef(R3BFiberMappingPar, 1);
+    ClassDefOverride(R3BFiberMappingPar, 1);
 };
diff --git a/fiber/test/CMakeLists.txt b/fiber/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+##############################################################################
+#   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    #
+#   Copyright (C) 2022-2025 Members of R3B Collaboration                     #
+#                                                                            #
+#             This software is distributed under the terms of the            #
+#                 GNU General Public Licence (GPL) version 3,                #
+#                    copied verbatim in the file "LICENSE".                  #
+#                                                                            #
+# In applying this license GSI does not waive the privileges and immunities  #
+# granted to it by virtue of its status as an Intergovernmental Organization #
+# or submit itself to any jurisdiction.                                      #
+##############################################################################
+
+if(GTEST_FOUND)
+    add_executable(
+        FiberUnitTests
+        testFiberContainerPar.cxx)
+    target_link_libraries(FiberUnitTests PRIVATE GTest::gtest_main GTest::gmock_main
+                                                   R3BBunchedFiber)
+    gtest_discover_tests(FiberUnitTests DISCOVERY_TIMEOUT 600)
+endif(GTEST_FOUND)
+
+#generate_root_test_script(${R3BROOT_SOURCE_DIR}/fiber/test/testFiberSimulation.C)
+#add_test(NAME FiberSimulation COMMAND ${R3BROOT_BINARY_DIR}/fiber/test/testFiberSimulation.sh)
+#set_tests_properties(FiberSimulation PROPERTIES TIMEOUT "2000")
+#set_tests_properties(FiberSimulation PROPERTIES PASS_REGULAR_EXPRESSION
+#                                                  "Macro finished successfully.")
diff --git a/fiber/test/testFiberContainerPar.cxx b/fiber/test/testFiberContainerPar.cxx
@@ -0,0 +1,70 @@
+
+/******************************************************************************
+ *   Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH    *
+ *   Copyright (C) 2022-2025 Members of R3B Collaboration                     *
+ *                                                                            *
+ *             This software is distributed under the terms of the            *
+ *                 GNU General Public Licence (GPL) version 3,                *
+ *                    copied verbatim in the file "LICENSE".                  *
+ *                                                                            *
+ * In applying this license GSI does not waive the privileges and immunities  *
+ * granted to it by virtue of its status as an Intergovernmental Organization *
+ * or submit itself to any jurisdiction.                                      *
+ ******************************************************************************/
+
+#include "R3BBunchedFiberHitModulePar.h"
+#include "R3BFiberMAPMTHitModulePar.h"
+#include "R3BFiberMappingPar.h"
+#include "gtest/gtest.h"
+#include <map>
+
+namespace
+{
+    TEST(testFiberMappingPar, GetNbChannels)
+    {
+        R3BFiberMappingPar par;
+        par.SetNbChannels(20);
+
+        EXPECT_EQ(par.GetNbChannels(), 20);
+    }
+
+    TEST(testFiberMappingPar, GetNbSides)
+    {
+        R3BFiberMappingPar par;
+        par.SetNbSides(10);
+
+        EXPECT_EQ(par.GetNbSides(), 10);
+    }
+
+    TEST(testFiberMAPMTHitModulePar, GetFiber)
+    {
+        R3BFiberMAPMTHitModulePar par;
+        par.SetFiber(100);
+
+        EXPECT_EQ(par.GetFiber(), 100);
+    }
+
+    TEST(testFiberMAPMTHitModulePar, GetGainUp)
+    {
+        R3BFiberMAPMTHitModulePar par;
+        par.SetGainUp(12.24);
+
+        EXPECT_EQ(par.GetGainUp(), 12.24);
+    }
+
+    TEST(testBunchedFiberHitModulePar, GetFiber)
+    {
+        R3BBunchedFiberHitModulePar par;
+        par.SetFiber(100);
+
+        EXPECT_EQ(par.GetFiber(), 100);
+    }
+
+    TEST(testBunchedFiberHitModulePar, GetVeff)
+    {
+        R3BBunchedFiberHitModulePar par;
+        par.SetVeff(12.2);
+
+        EXPECT_EQ(par.GetVeff(), 12.2);
+    }
+} // namespace

Original file line number	Diff line number	Diff line change
`@@ -186,4 +186,4 @@ void R3BAlpideMappingPar::printParams()`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`		`-ClassImp(R3BAlpideMappingPar);`
	`189`	`+ClassImp(R3BAlpideMappingPar)`
Original file line number	Diff line number	Diff line change
`@@ -18,37 +18,27 @@`
`18`	`18`
`19`	`19`	`#include "R3BFiberMappingPar.h"`
`20`	`20`
`21`		`-#include "FairParamList.h"`
`22`	`21`	`#include "R3BLogger.h"`
	`22`	`+#include <FairParamList.h>`
`23`	`23`
`24`		`-#include "TMath.h"`
`25`		`-#include "TString.h"`
	`24`	`+#include <TMath.h>`
	`25`	`+#include <TString.h>`
`26`	`26`
`27`	`27`	`// ---- Standard Constructor ---------------------------------------------------`
`28`	`28`	`R3BFiberMappingPar::R3BFiberMappingPar(const TString& name, const TString& title, const TString& context)`
`29`	`29`	`: FairParGenericSet(name, title, context)`
`30`		`- , fNbSides(2)`
`31`		`- , fNbChannels(512)`
`32`	`30`	`{`
`33`		`- for (Int_t s = 0; s < fNbSides; s++)`
	`31`	`+ fTrigmap.resize(fNbSides);`
	`32`	`+ for (size_t s = 0; s < fNbSides; s++)`
`34`	`33`	`{`
`35`	`34`	`fTrigmap[s] = new TArrayI(fNbChannels);`
`36`		`- for (Int_t c = 0; c < fNbChannels; c++)`
	`35`	`+ for (size_t c = 0; c < fNbChannels; c++)`
`37`	`36`	`{`
`38`	`37`	`fTrigmap[s]->AddAt(0, c);`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`
`43`		`-// ---- Destructor ------------------------------------------------------------`
`44`		`-R3BFiberMappingPar::~R3BFiberMappingPar()`
`45`		`-{`
`46`		`- clear();`
`47`		`- for (Int_t s = 0; s < fNbSides; s++)`
`48`		`- if (fTrigmap[s])`
`49`		`- delete fTrigmap[s];`
`50`		`-}`
`51`		`-`
`52`	`42`	`// ---- Method clear ----------------------------------------------------------`
`53`	`43`	`void R3BFiberMappingPar::clear()`
`54`	`44`	`{`
`@@ -71,12 +61,11 @@ void R3BFiberMappingPar::putParams(FairParamList* list)`
`71`	`61`	`R3BLOG(info, "Nb of channels: " << fNbChannels);`
`72`	`62`	`R3BLOG(info, "Nb of sides: " << fNbSides);`
`73`	`63`
`74`		`- char name[300];`
`75`		`- for (Int_t s = 0; s < fNbSides; s++)`
	`64`	`+ for (size_t s = 0; s < fNbSides; s++)`
`76`	`65`	`{`
`77`	`66`	`fTrigmap[s]->Set(fNbChannels);`
`78`		`- sprintf(name, "fiberside%dPar", s + 1);`
`79`		`- list->add(name, *fTrigmap[s]);`
	`67`	`+ TString name = Form("fiberside%zuPar", s + 1);`
	`68`	`+ list->add(name.Data(), *fTrigmap[s]);`
`80`	`69`	`}`
`81`	`70`	`}`
`82`	`71`
`@@ -100,13 +89,11 @@ Bool_t R3BFiberMappingPar::getParams(FairParamList* list)`
`100`	`89`	`return kFALSE;`
`101`	`90`	`}`
`102`	`91`
`103`		`- char name[300];`
`104`		`- for (Int_t s = 0; s < fNbSides; s++)`
	`92`	`+ for (size_t s = 0; s < fNbSides; s++)`
`105`	`93`	`{`
`106`	`94`	`fTrigmap[s]->Set(fNbChannels);`
`107`		`- sprintf(name, "fiberside%dPar", s + 1);`
`108`		`-`
`109`		`- if (!(list->fill(name, fTrigmap[s])))`
	`95`	`+ TString name = Form("fiberside%zuPar", s + 1);`
	`96`	`+ if (!(list->fill(name.Data(), fTrigmap[s])))`
`110`	`97`	`{`
`111`	`98`	`R3BLOG(error, "Could not initialize " << name);`
`112`	`99`	`return kFALSE;`
`@@ -123,11 +110,11 @@ void R3BFiberMappingPar::print() { printParams(); }`
`123`	`110`	`void R3BFiberMappingPar::printParams()`
`124`	`111`	`{`
`125`	`112`	`R3BLOG(info, "Mapping params for Fiber: Num of sides: " << fNbSides << " and channels: " << fNbChannels);`
`126`		`- for (Int_t s = 0; s < fNbSides; s++)`
`127`		`- for (Int_t c = 0; c < fNbChannels; c++)`
	`113`	`+ for (size_t s = 0; s < fNbSides; s++)`
	`114`	`+ for (size_t c = 0; c < fNbChannels; c++)`
`128`	`115`	`{`
`129`	`116`	`R3BLOG(info, "Side: " << s + 1 << " , channel:" << c + 1 << ", value: " << fTrigmap[s]->GetAt(c));`
`130`	`117`	`}`
`131`	`118`	`}`
`132`	`119`
`133`		`-ClassImp(R3BFiberMappingPar);`
	`120`	`+ClassImp(R3BFiberMappingPar)`