fix(Alpide): Minor change

fix(FOOT): clang format

fix(Alpide): Fixing and histogram reseting

style(Alpide): Changed limits of the histograms

feat(FOOT): Setter for histogram limits

Author: pgrusell

alpide/online/R3BAlpideOnlineSpectra.cxx

@@ -179,7 +179,8 @@ InitStatus R3BAlpideOnlineSpectra::Init()
         }
         mainfol->Add(calfol);
 
-        fh1_Calmult_total = R3B::root_owned<TH1F>("fh1_mulcal_sensor_total", "Cal_mult for all sensors", 70, 0, 70);
+        fh1_Calmult_total =
+            R3B::root_owned<TH1F>("fh1_mulcal_sensor_total", "Cal_mult for all sensors", 70, -0.5, 69.5);
         fh1_Calmult_total->GetXaxis()->SetTitle("Pixel multiplicity");
         fh1_Calmult_total->GetYaxis()->SetTitle("Counts");
         fh1_Calmult_total->GetYaxis()->SetTitleOffset(1.1);
@@ -231,7 +232,7 @@ InitStatus R3BAlpideOnlineSpectra::Init()
             cHit->Divide(2, 1);
             sprintf(Name1, "fh2_pos_hit_sensor_%d", s + 1);
             sprintf(Name2, "Hit-position for sensor: %d", s + 1);
-            fh2_PosHit[s] = R3B::root_owned<TH2F>(Name1, Name2, 200, -15.0, 15.0, 100, -7.5, 7.5);
+            fh2_PosHit[s] = R3B::root_owned<TH2F>(Name1, Name2, 200, 0, 30., 100, 0, 15.);
             fh2_PosHit[s]->GetXaxis()->SetTitle("Posl [mm]");
             fh2_PosHit[s]->GetYaxis()->SetTitle("Post [mm]");
             fh2_PosHit[s]->GetYaxis()->SetTitleOffset(1.1);
@@ -270,6 +271,34 @@ InitStatus R3BAlpideOnlineSpectra::Init()
             fh1_Clustermult[s]->Draw();
             hitfol->Add(cHitm);
         }
+
+        auto cHitmTot = new TCanvas("Cluster_multiplicity_total", "mult hit info", 10, 10, 500, 500);
+        fh1_Clustermult_total =
+            R3B::root_owned<TH1F>("Cluster_multiplicity_total", "Total cluster multiplicity", 60, 0, 60);
+        fh1_Clustermult_total->GetXaxis()->SetTitle("Cluster multiplicity");
+        fh1_Clustermult_total->GetYaxis()->SetTitle("Counts");
+        fh1_Clustermult_total->GetYaxis()->SetTitleOffset(1.1);
+        fh1_Clustermult_total->GetXaxis()->CenterTitle(true);
+        fh1_Clustermult_total->GetYaxis()->CenterTitle(true);
+        fh1_Clustermult_total->SetLineColor(1);
+        fh1_Clustermult_total->SetFillColor(31);
+        cHitmTot->cd();
+        fh1_Clustermult_total->Draw();
+        hitfol->Add(cHitmTot);
+
+        auto cSizemTot = new TCanvas("Size_multiplicity_total", "size hit info", 10, 10, 500, 500);
+        fh1_Clustersize_total = R3B::root_owned<TH1F>("Size_multiplicity_total", "Total size multiplicity", 60, 0, 60);
+        fh1_Clustersize_total->GetXaxis()->SetTitle("Size multiplicity");
+        fh1_Clustersize_total->GetYaxis()->SetTitle("Counts");
+        fh1_Clustersize_total->GetYaxis()->SetTitleOffset(1.1);
+        fh1_Clustersize_total->GetXaxis()->CenterTitle(true);
+        fh1_Clustersize_total->GetYaxis()->CenterTitle(true);
+        fh1_Clustersize_total->SetLineColor(1);
+        fh1_Clustersize_total->SetFillColor(31);
+        cSizemTot->cd();
+        fh1_Clustersize_total->Draw();
+        hitfol->Add(cSizemTot);
+
         mainfol->Add(hitfol);
 
         cHit_angcor = new TCanvas("Theta_vs_Phi", "Correlation theta vs phi", 10, 10, 500, 500);
@@ -458,8 +487,16 @@ void R3BAlpideOnlineSpectra::Reset_Histo()
         {
             hist->Reset();
         }
+
         fh2_theta_phi->Reset();
         fh2_max_clusters->Reset();
+
+        for (auto& hist : fh2_y_x)
+        {
+            hist->Reset();
+        }
+        fh1_Clustermult_total->Reset();
+        fh1_Clustersize_total->Reset();
     }
 
     return;
@@ -539,6 +576,7 @@ void R3BAlpideOnlineSpectra::Exec(Option_t* /*option*/)
         std::vector<double> y_max(2, NAN);
         std::vector<int> cls_size(2, 0);
 
+        fh1_Clustermult_total->Fill(nHits);
         for (size_t ihit = 0; ihit < nHits; ihit++)
         {
             auto hit = dynamic_cast<R3BAlpideHitData*>(fHitItems->At(ihit));
@@ -547,6 +585,7 @@ void R3BAlpideOnlineSpectra::Exec(Option_t* /*option*/)
             auto senid = hit->GetSensorId() - 1;
             fh1_Clustersize[senid]->Fill(hit->GetClusterSize());
             fh2_PosHit[senid]->Fill(hit->GetPosl(), hit->GetPost());
+            fh1_Clustersize_total->Fill(hit->GetClusterSize());
             if (fMap_Par->GetGeoVersion() == 202505)
             {
                 fh2_theta_phi->Fill(hit->GetPhi() * TMath::RadToDeg(), hit->GetTheta() * TMath::RadToDeg());
@@ -575,6 +614,7 @@ void R3BAlpideOnlineSpectra::Exec(Option_t* /*option*/)
                     }
                 }
             }
+
             mult[senid]++;
         }
         for (size_t s = 0; s < fNbSensors; s++)
@@ -585,12 +625,16 @@ void R3BAlpideOnlineSpectra::Exec(Option_t* /*option*/)
         {
             if (std::isfinite(x_max[0]) && std::isfinite(x_max[1]))
                 fh2_y_x_cor_det[0]->Fill(x_max[0], x_max[1]);
+
             if (std::isfinite(y_max[0]) && std::isfinite(y_max[1]))
                 fh2_y_x_cor_det[1]->Fill(y_max[0], y_max[1]);
+
             if (std::isfinite(x_max[0]) && std::isfinite(y_max[1]))
                 fh2_y_x_cor_det[2]->Fill(x_max[0], y_max[1]);
-            if (std::isfinite(x_max[2]) && std::isfinite(y_max[0]))
+
+            if (std::isfinite(x_max[1]) && std::isfinite(y_max[0]))
                 fh2_y_x_cor_det[3]->Fill(x_max[1], y_max[0]);
+
             if (cls_size[0] > 0 && cls_size[1] > 0)
                 fh2_max_clusters->Fill(cls_size[0], cls_size[1]);
         }
@@ -639,6 +683,7 @@ void R3BAlpideOnlineSpectra::FinishTask()
     if (fHitItems)
     {
         fh2_theta_phi->Write();
+
         fh2_max_clusters->Write();
         for (const auto& hist : fh2_y_x)
         {
@@ -648,6 +693,9 @@ void R3BAlpideOnlineSpectra::FinishTask()
         {
             hist->Write();
         }
+
+        fh1_Clustermult_total->Write();
+        fh1_Clustersize_total->Write();
     }
 }
 ClassImp(R3BAlpideOnlineSpectra)

alpide/online/R3BAlpideOnlineSpectra.h

@@ -125,6 +125,9 @@ class R3BAlpideOnlineSpectra : public FairTask
     std::vector<TH2F*> fh2_y_x_cor_det;
     TH2F* fh2_max_clusters;
 
+    TH1F* fh1_Clustermult_total;
+    TH1F* fh1_Clustersize_total;
+
     TCanvas* cCalPixelSize = nullptr;
     TCanvas* cHit_angcor = nullptr;
 

ssd/CMakeLists.txt

@@ -35,10 +35,11 @@ set(SRCS
     calibration/R3BAmsStripCal2Hit.cxx
     online/R3BAmsOnlineSpectra.cxx
     online/R3BAmsCalifaCorrelatedOnlineSpectra.cxx
+    online/R3BFootVsAlpideOnlineSpectra.cxx
     online/R3BFootOnlineSpectra.cxx
     pars/R3BFootMappingPar.cxx
     pars/R3BFootCalPar.cxx
-    pars/R3BFootHitPar.cxx
+	pars/R3BFootHitPar.cxx
     calibration/R3BFootMapped2StripCal.cxx
     calibration/R3BFootStripCal2Hit.cxx)
 
@@ -66,10 +67,11 @@ set(HEADERS
     calibration/R3BAmsStripCal2Hit.h
     online/R3BAmsOnlineSpectra.h
     online/R3BAmsCalifaCorrelatedOnlineSpectra.h
+	online/R3BFootVsAlpideOnlineSpectra.h
     online/R3BFootOnlineSpectra.h
     pars/R3BFootMappingPar.h
     pars/R3BFootCalPar.h
-    pars/R3BFootHitPar.h
+	pars/R3BFootHitPar.h
     calibration/R3BFootMapped2StripCal.h
     calibration/R3BFootStripCal2Hit.h)
 

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 R3BFootVsAlpideOnlineSpectra;
 #pragma link C++ class vector<R3B::DetectorMappedData>+;
 
 #pragma link C++ class R3BFootMappingPar+;

ssd/calibration/R3BFootMapped2StripCal.cxx

@@ -294,6 +294,13 @@ void R3BFootMapped2StripCal::SetPedestals(Int_t thr, TString conf)
                 Float_t ped = h1_peds->GetBinContent(istrip + 1);
                 Float_t sig = h1_sigma->GetBinContent(istrip + 1);
 
+                // Do not update dead strip
+                if (sigmas[iDet][istrip] == -1)
+                {
+                    sig = -1.;
+                    ped = -1.;
+                }
+
                 sigmas[iDet][istrip] = sig;
                 pedestals[iDet][istrip] = ped;
 
@@ -312,7 +319,16 @@ void R3BFootMapped2StripCal::SetPedestals(Int_t thr, TString conf)
                 fine_sigmas[iDet][istrip] = h1_sigma->GetBinContent(istrip + 1);
                 fCal_Par->SetFineSigma(fine_sigmas[iDet][istrip], iDet * fNStrip + istrip);
                 fCal_Par->setChanged(kTRUE);
-                sigmas[iDet][istrip] = fine_sigmas[iDet][istrip];
+                Float_t sig;
+                if (sigmas[iDet][istrip] == -1)
+                {
+                    sig = -1.;
+                }
+                else
+                {
+                    sig = fine_sigmas[iDet][istrip];
+                }
+                sigmas[iDet][istrip] = sig;
             }
         }
 
@@ -423,7 +439,7 @@ void R3BFootMapped2StripCal::Exec(Option_t* /*option*/)
             h2_fine[detId]->Fill(stripId + 1, energies[detId][stripId]);
         }
 
-        if (energies[detId][stripId] > 0. && pedestals[detId][stripId] != -1)
+        if (energies[detId][stripId] > 0. && sigmas[detId][stripId] != -1)
             StripCounter[detId]++;
     }
 
@@ -432,9 +448,11 @@ void R3BFootMapped2StripCal::Exec(Option_t* /*option*/)
         detId = data->GetDetId() - 1;
         stripId = data->GetStripId() - 1;
 
-        if (pedestals[detId][stripId] != -1 &&
+        if (sigmas[detId][stripId] != -1 &&
             StripCounter[detId] < fNStrip) // allow also negative values for the energies
+        {
             AddCalData(detId + 1, stripId + 1, energies[detId][stripId], fine_sigmas[detId][stripId]);
+        }
     }
 }
 

ssd/calibration/R3BFootStripCal2Hit.cxx

@@ -35,6 +35,7 @@
 // FOOT headers
 #include "R3BFootCalData.h"
 #include "R3BFootHitData.h"
+#include "R3BFootHitPar.h"
 #include "R3BFootMappingPar.h"
 #include "R3BFootStripCal2Hit.h"
 #include "R3BLogger.h"
@@ -70,6 +71,17 @@ void R3BFootStripCal2Hit::SetParContainers()
     {
         R3BLOG(info, "footMappingPar found");
     }
+
+    R3BLOG(info, "Calling SetParContainers()");
+    fHit_Par = dynamic_cast<R3BFootHitPar*>(rtdb->getContainer("footHitPar"));
+    if (!fHit_Par)
+    {
+        R3BLOG(error, "SetParContainers(): footHitPar not found");
+    }
+    else
+    {
+        R3BLOG(info, "SetParContainers(): footHitPar loaded correctly");
+    }
 }
 
 void R3BFootStripCal2Hit::SetParameter()
@@ -92,6 +104,28 @@ void R3BFootStripCal2Hit::SetParameter()
         fOffsetY.push_back(fMap_Par->GetOffsetY(i + 1));
     }
     fMap_Par->printParams();
+
+    if (!fHit_Par)
+    {
+        R3BLOG(error, "SetParameter(): fHit_Par is NULL");
+    }
+    else
+    {
+        R3BLOG(info, TString::Format("SetParameter(): fHit_Par is VALID, NumParsFit = %d", fHit_Par->GetNumParsFit()));
+    }
+
+    fNumParsFit = fHit_Par->GetNumParsFit();
+    HitCalParams = fHit_Par->GetCharCalParams();
+    Int_t array_size = fMaxNumDet * fNumParsFit;
+    HitCalParams->Set(array_size);
+
+    for (int d = 0; d < fMaxNumDet; d++)
+    {
+        for (int j = 0; j < fNumParsFit; j++)
+        {
+            fCharCalPar.push_back(HitCalParams->GetAt(d * fNumParsFit + j));
+        }
+    }
 }
 
 // -----   Public method Init   -------------------------------------------------
@@ -224,9 +258,6 @@ void R3BFootStripCal2Hit::Exec(Option_t* /*option*/)
             int k = j + 1;
             while (k < StripE[i].size())
             {
-                if (StripI[i][k] - StripI[i][k - 1] != 1)
-                    break;
-
                 if (StripE[i][k] < fTimesSigmas * StripS[i][k])
                     break;
 
@@ -333,9 +364,25 @@ void R3BFootStripCal2Hit::Exec(Option_t* /*option*/)
             TVector3 master(x, y, z);
             // TODO: Eta correction not used at the moment
 
+            // Charge calibration (charge = m * energy + n)
+            double m = 1;
+            double n = 0;
+
+            if (fCharCalPar.size() > 0)
+            {
+                if (fCharCalPar[i * fNumParsFit] != 0)
+                {
+                    m = fCharCalPar[i * fNumParsFit];
+                    n = fCharCalPar[i * fNumParsFit + 1];
+                }
+            }
+
+            double charge = m * ClusterESum[i][j] + n;
+
             if (ClusterESum[i][j] > fThSum && j < fMaxNumClusters)
             {
-                AddHitData(i + 1, ClusterNStrip[i][j], pos, master, ClusterESum[i][j], ClusterMult[i], Eta[i][j]);
+                AddHitData(
+                    i + 1, ClusterNStrip[i][j], pos, master, ClusterESum[i][j], ClusterMult[i], Eta[i][j], charge);
             }
             else
             {
@@ -375,11 +422,12 @@ R3BFootHitData* R3BFootStripCal2Hit::AddHitData(uint8_t detid,
                                                 TVector3 master,
                                                 double energy_s,
                                                 uint16_t mulS,
-                                                double eta)
+                                                double eta,
+                                                double charge)
 {
     TClonesArray& clref = *fFootHitData;
     int size = clref.GetEntriesFast();
-    return new (clref.ConstructedAt(size)) R3BFootHitData(detid, numhit, pos, master, energy_s, mulS, eta);
+    return new (clref.ConstructedAt(size)) R3BFootHitData(detid, numhit, pos, master, energy_s, mulS, eta, charge);
 }
 
 ClassImp(R3BFootStripCal2Hit)

ssd/calibration/R3BFootStripCal2Hit.h

@@ -23,12 +23,14 @@
 #include <FairTask.h>
 
 #include <Rtypes.h>
+#include <TArrayF.h>
 #include <TVector3.h>
 #include <vector>
 
 class TClonesArray;
 class TH1F;
 class R3BFootMappingPar;
+class R3BFootHitPar;
 
 class R3BFootStripCal2Hit : public FairTask
 {
@@ -80,12 +82,15 @@ class R3BFootStripCal2Hit : public FairTask
     double fTimesSigmas = 3.;
     int fMaxNumDet = 16;
     int fMaxNumClusters = 10;
+    int fNumParsFit = 2;
     std::vector<double> fDistTarget;
     std::vector<double> fAngleTheta;
     std::vector<double> fAnglePhi;
     std::vector<double> fOffsetX;
     std::vector<double> fOffsetY;
+    std::vector<double> fCharCalPar;
     std::vector<TH1F*> hssd;
+    TArrayF* HitCalParams = nullptr;
 
     std::vector<int> ClusterMult;                 // Cluster multiplicity
     std::vector<std::vector<double>> ClusterPos;  // Position of Cluster from Weighted Average
@@ -97,8 +102,10 @@ class R3BFootStripCal2Hit : public FairTask
     std::vector<std::vector<std::vector<double>>> ClusterE; // Energy of Strip in Cluster
 
     R3BFootMappingPar* fMap_Par = nullptr; // Parameter container with mapping
-    TClonesArray* fFootCalData = nullptr;  // Array with FOOT Cal-input data
-    TClonesArray* fFootHitData = nullptr;  // Array with FOOT Hit-output data
+    R3BFootHitPar* fHit_Par = nullptr;     // Parameter container with hit params
+
+    TClonesArray* fFootCalData = nullptr; // Array with FOOT Cal-input data
+    TClonesArray* fFootHitData = nullptr; // Array with FOOT Hit-output data
 
     bool fOnline = false; // Don't store data for online
     Double_t* fChannelPeaks;
@@ -110,7 +117,8 @@ class R3BFootStripCal2Hit : public FairTask
                                TVector3 master,
                                double energy_s,
                                uint16_t mulS,
-                               double eta);
+                               double eta,
+                               double charge);
 
   public:
     // Class definition