New implementation of the FOOT online

New implementation of the hit level (probably wrong)

Error fixed on Hit level

New implementation of the hit level

Efficiency improvement

Minor modification

Map2Cal class optimized for FOOTs

Modifications on the online spectra of the FOOTs

Modification in the reader to allow a remapping on the foot IDs

New author

Zenodo updated

Zenodo updated

Zenodo updated

New label on the X and Y axis of the correlation plot

Modification regarding memory management

Minor change

Minor modification

Author: pgrusell

.zenodo.json

@@ -129,6 +129,12 @@
             "orcid": "0000-0002-5022-3312",
             "affiliation": "RBI Zagreb, HR10000 Zagreb, Croatia"
         },
+        {
+            "name": "González-Rusell, Pablo",
+            "orcid": "0009-0007-2579-9479",
+            "email": "pablo.grusell@udc.es",
+            "affiliation": "CITENI, Industrial Campus of Ferrol, University of Coruña, 15403 Ferrol, Spain"
+        },
         {
             "name": "Graña-González, Antia",
             "orcid": "0000-0002-0842-4110",

AUTHORS

@@ -8,6 +8,7 @@ Chatillon, Audrey [CEA, DAM, DIF, 91297 Arpajon, France]
 Feijoo-Fontán, Martina [https://orcid.org/0000-0002-8507-5137] [IGFAE, University of Santiago de Compostela, 15782 Santiago de Compostela, Spain]
 García-Jiménez, Gabriel [https://orcid.org/0000-0002-4435-0163] [IGFAE, University of Santiago de Compostela, 15782 Santiago de Compostela, Spain]
 Gasparic, Igor [https://orcid.org/0000-0002-5022-3312] [RBI Zagreb, HR10000 Zagreb, Croatia]
+González-Rusell, Pablo [pablo.grusell@udc.es] [https://orcid.org/0009-0007-2579-9479] [CITENI, Industrial Campus of Ferrol, University of Coruña, 15403 Ferrol, Spain]
 Graña-González, Antia [https://orcid.org/0000-0002-0842-4110] [CITENI, Industrial Campus of Ferrol, University of Coruña, 15403 Ferrol, Spain]
 Heil, Michael [https://orcid.org/0009-0000-9562-6644] [GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany]
 Horvat, Andrea [https://orcid.org/0009-0004-6882-5591] [RBI Zagreb, HR10000 Zagreb, Croatia]

r3bdata/footData/R3BFootCalData.cxx

@@ -18,10 +18,11 @@
 #include "R3BFootCalData.h"
 
 // -----   Standard constructor   ------------------------------------------
-R3BFootCalData::R3BFootCalData(uint8_t detid, uint16_t stripid, double energy)
+R3BFootCalData::R3BFootCalData(uint8_t detid, uint16_t stripid, double energy, double sigma)
     : fDetId(detid)
     , fStripId(stripid)
     , fEnergy(energy)
+    , fSigma(sigma)
 {
 }
 

r3bdata/footData/R3BFootCalData.h

@@ -32,8 +32,9 @@ class R3BFootCalData : public TObject
      *@param fDetId    Detector unique identifier
      *@param fStripId  Strip unique identifier
      *@param fEnergy   Total energy deposited on the strip ([GeV] in sim)
+     *@param fSigma Sigma of the energy after some corrections
      **/
-    explicit R3BFootCalData(uint8_t detid, uint16_t stripid, double energy);
+    explicit R3BFootCalData(uint8_t detid, uint16_t stripid, double energy, double sigma);
 
     /** Destructor **/
     virtual ~R3BFootCalData() = default;
@@ -42,16 +43,19 @@ class R3BFootCalData : public TObject
     [[nodiscard]] inline const uint8_t& GetDetId() const { return fDetId; }
     [[nodiscard]] inline const uint16_t& GetStripId() const { return fStripId; }
     [[nodiscard]] inline const double& GetEnergy() const { return fEnergy; }
+    [[nodiscard]] inline const double& GetSigma() const { return fSigma; }
 
     // Modifiers
     inline void SetDetId(uint8_t detid) { fDetId = detid; }
     inline void SetStripId(uint16_t stripid) { fStripId = stripid; }
     inline void SetEnergy(double energy) { fEnergy = energy; }
+    inline void SetSigma(double sigma) { fSigma = sigma; }
 
   protected:
     uint8_t fDetId = 0;            // detector unique identifier
     uint16_t fStripId = 0;         // strip unique identifier
     double fEnergy = std::nan(""); // total energy in the strip
+    double fSigma = std::nan("");  // sigma of the energy after corrections
 
   public:
     ClassDefOverride(R3BFootCalData, 1)

r3bdata/footData/R3BFootHitData.cxx

@@ -23,7 +23,8 @@ R3BFootHitData::R3BFootHitData(uint8_t detid,
                                double pos,
                                TVector3 master,
                                double energy,
-                               uint16_t mulstrip)
+                               uint16_t mulstrip,
+                               double eta)
     : fDetId(detid)
     , fNbHit(nbhit)
     , fPos(pos)
@@ -32,6 +33,7 @@ R3BFootHitData::R3BFootHitData(uint8_t detid,
     , fmaster(master)
     , fEnergy(energy)
     , fMulStrip(mulstrip)
+    , fEta(eta)
 {
 }
 
@@ -45,6 +47,7 @@ R3BFootHitData::R3BFootHitData(const R3BFootHitData& right)
     , fmaster(right.fmaster)
     , fEnergy(right.fEnergy)
     , fMulStrip(right.fMulStrip)
+    , fEta(right.fEta)
 {
 }
 

r3bdata/footData/R3BFootHitData.h

@@ -36,13 +36,15 @@ class R3BFootHitData : public TObject
      *@param fTheta     Master: Angle theta [rad] (lab frame)
      *@param fPhi       Master: Angle Phi [rad] (lab frame)
      *@param fEnergy    Total energy deposited by the hit ([GeV] in sim)
+     *@param fEta       Difference between the integer part of the cluster position and the cluster position
      **/
     explicit R3BFootHitData(uint8_t detid,
                             uint16_t nbhit,
                             double pos,
                             TVector3 master,
                             double energy,
-                            uint16_t mulstrip = 0);
+                            uint16_t mulstrip = 0,
+                            double eta = 0);
 
     /** Copy constructor **/
     R3BFootHitData(const R3BFootHitData&);
@@ -61,6 +63,7 @@ class R3BFootHitData : public TObject
     [[nodiscard]] inline const double& GetPhi() const { return fPhi; }
     [[nodiscard]] inline const TVector3 GetPosLab() const { return fmaster; }
     [[nodiscard]] inline const double& GetEnergy() const { return fEnergy; }
+    [[nodiscard]] inline const double& GetEta() const { return fEta; }
 
   protected:
     uint8_t fDetId = 0;
@@ -71,6 +74,7 @@ class R3BFootHitData : public TObject
     TVector3 fmaster;
     double fEnergy = std::nan("");
     uint16_t fMulStrip = 0;
+    double fEta = 0;
 
   public:
     ClassDefOverride(R3BFootHitData, 1)

r3bsource/foot/R3BFootSiReader.cxx

@@ -21,6 +21,8 @@
 #include "TClonesArray.h"
 #include "ext_data_struct_info.hh"
 
+#include <numeric>
+
 /**
  ** ext_h101_foot.h was created by running
  ** $unpacker --ntuple=STRUCT_HH,RAW:FOOT,id=h101_FOOT,NOTRIGEVENTNO,ext_h101_foot.h
@@ -42,7 +44,10 @@ R3BFootSiReader::R3BFootSiReader(EXT_STR_h101_FOOT_onion* data, size_t offset)
     //, fNbDet(sizeof(EXT_STR_h101_FOOT_onion) / sizeof(EXT_STR_h101_FOOT_onion.FOOT[0])) // Auto-gets # FEET from
     // struct!
     , fArray(new TClonesArray("R3BFootMappedData"))
+    , fMappedDetId(16)
 {
+    // Trivial mapping 1 - 1 by default
+    std::iota(fMappedDetId.begin(), fMappedDetId.end(), 1);
 }
 
 R3BFootSiReader::~R3BFootSiReader() { delete fArray; }
@@ -71,14 +76,29 @@ Bool_t R3BFootSiReader::Init(ext_data_struct_info* a_struct_info)
 Bool_t R3BFootSiReader::R3BRead()
 {
     R3BLOG(debug1, "Event data");
+
+    int kDet;
     // Read FOOT detectors
     for (Int_t d = 0; d < fNbDet; d++)
     {
+
+        // Remap of the det number to order them from 1 to 8
+
+        for (int i = 0; i < fMappedDetId.size(); i++)
+        {
+
+            if (d + 1 == fMappedDetId[i])
+            {
+                kDet = i;
+            }
+        }
+
         if (fData->FOOT[d]._ == 640)
         {
             for (Int_t strip = 0; strip < fData->FOOT[d]._; ++strip)
             {
-                new ((*fArray)[fArray->GetEntriesFast()]) R3BFootMappedData(d + 1, strip + 1, fData->FOOT[d].E[strip]);
+                new ((*fArray)[fArray->GetEntriesFast()])
+                    R3BFootMappedData(kDet + 1, strip + 1, fData->FOOT[d].E[strip]);
             }
         }
         else if (fData->FOOT[d]._ == 0)

r3bsource/foot/R3BFootSiReader.h

@@ -16,8 +16,7 @@
 // -----             Created 19/07/21  by J.L. Rodriguez-Sanchez    -----
 // ----------------------------------------------------------------------
 
-#ifndef R3BFootSiReader_H
-#define R3BFootSiReader_H
+#pragma once
 
 #include "R3BReader.h"
 #include <Rtypes.h>
@@ -50,6 +49,8 @@ class R3BFootSiReader : public R3BReader
     // Accessor to select online mode
     void SetOnline(Bool_t option) { fOnline = option; }
 
+    void SetMapping(const std::vector<int>& map) { fMappedDetId = map; }
+
   private:
     // An event counter
     unsigned int fNEvent;
@@ -63,9 +64,9 @@ class R3BFootSiReader : public R3BReader
     Int_t fNbDet;
     // Output array
     TClonesArray* fArray;
+    // Vector with the remapped detector ids
+    std::vector<int> fMappedDetId;
 
   public:
     ClassDefOverride(R3BFootSiReader, 0);
 };
-
-#endif /* R3BFootSiReader_H */

ssd/CMakeLists.txt

@@ -88,6 +88,6 @@ add_library_with_dictionary(
     pars
     sim
     DEPENDENCIES
-    R3BTracking R3BTCal)
+    R3BTracking R3BTCal R3BNeulandShared)
 
 add_subdirectory(test)

ssd/SsdLinkDef.h

@@ -43,6 +43,7 @@
 #pragma link C++ class R3BAmsStripCal2Hit+;
 #pragma link C++ class R3BAmsOnlineSpectra+;
 #pragma link C++ class R3BAmsCalifaCorrelatedOnlineSpectra+;
+#pragma link C++ class vector<R3B::DetectorMappedData>+;
 
 #pragma link C++ class R3BFootMappingPar+;
 #pragma link C++ class R3BFootCalPar+;