feat(califa): Add (optional) new parameter ToT eff.

feat(califa): Thresholds for simulations changed from Int_t to Float_t.

feat(califa): Add ToT efficiency in the digitizer.

Author: pgrusell

califa/pars/R3BCalifaCrystalPars4Sim.cxx

@@ -11,13 +11,14 @@
 
 R3BCalifaCrystalPars4Sim::R3BCalifaCrystalPars4Sim(const char* name, const char* title, const char* context)
     : FairParGenericSet(name, title, context)
-    , fNumCrystals(4864)
-    , fNumParams4Sim(3) /* Crystal ID & Reso & Threshold */
+    , fNumCrystals(5088)
+    , fNumParams4Sim(4) /* Crystal ID & Reso & Threshold & ToTEff */
 {
 
     fCrystalIDArray = new TArrayI(fNumCrystals);
-    fThresholdArray = new TArrayI(fNumCrystals);
+    fThresholdArray = new TArrayF(fNumCrystals);
     fResolutionArray = new TArrayF(fNumCrystals);
+    fEffToTArray = new TArrayF(fNumCrystals);
 }
 
 R3BCalifaCrystalPars4Sim::~R3BCalifaCrystalPars4Sim()
@@ -28,6 +29,8 @@ R3BCalifaCrystalPars4Sim::~R3BCalifaCrystalPars4Sim()
         delete fThresholdArray;
     if (fResolutionArray)
         delete fResolutionArray;
+    if (fEffToTArray)
+        delete fEffToTArray;
 }
 
 void R3BCalifaCrystalPars4Sim::clear()
@@ -53,6 +56,9 @@ void R3BCalifaCrystalPars4Sim::putParams(FairParamList* list)
     fResolutionArray->Set(fNumCrystals);
     list->add("califaResolutionPar", *fResolutionArray);
 
+    fEffToTArray->Set(fNumCrystals);
+    list->add("califaEffToTPar", *fEffToTArray);
+
     list->add("califaCrystalNumberPar", fNumCrystals);
     list->add("califaNumPars4SimPar", fNumParams4Sim);
 }
@@ -96,6 +102,14 @@ Bool_t R3BCalifaCrystalPars4Sim::getParams(FairParamList* list)
         return kFALSE;
     }
 
+    fEffToTArray->Set(fNumCrystals);
+    if (!(list->fill("califaToTEffPar", fEffToTArray)))
+    {
+        LOG(info) << "---Could not initialize califaToTEffPar. Set to 1 by default.";
+        for (int i = 0; i < fNumCrystals; i++)
+            fEffToTArray->SetAt(1., i);
+    }
+
     return kTRUE;
 }
 
@@ -107,12 +121,13 @@ void R3BCalifaCrystalPars4Sim::printParams()
               << " "
               << "Threshold"
               << " "
-              << "Resolution";
+              << "Resolution"
+              << " "
+              << "ToT Efficiency";
 
     for (Int_t i = 0; i < fNumCrystals; i++)
-
     {
         LOG(info) << i + 1 << " " << fCrystalIDArray->GetAt(i) << " " << fThresholdArray->GetAt(i) << " "
-                  << fResolutionArray->GetAt(i);
+                  << fResolutionArray->GetAt(i) << " " << fEffToTArray->GetAt(i);
     }
 }

califa/pars/R3BCalifaCrystalPars4Sim.h

@@ -1,5 +1,4 @@
-#ifndef R3BCALIFACRYSTALPARS4SIM_H
-#define R3BCALIFACRYSTALPARS4SIM_H
+#pragma once
 
 #include "FairParGenericSet.h"
 
@@ -42,7 +41,8 @@ class R3BCalifaCrystalPars4Sim : public FairParGenericSet
     const Int_t GetNumParameters4Sim() { return fNumParams4Sim; }
 
     const Float_t GetResolution(Int_t crystal) { return fResolutionArray->GetAt(crystal - 1); }
-    const Int_t GetThreshold(Int_t crystal) { return fThresholdArray->GetAt(crystal - 1); }
+    const Float_t GetThreshold(Int_t crystal) { return fThresholdArray->GetAt(crystal - 1); }
+    const Float_t GetTotEff(Int_t crystal) { return fEffToTArray->GetAt(crystal - 1); }
 
     const Bool_t GetInUse(Int_t crystal)
     {
@@ -60,8 +60,9 @@ class R3BCalifaCrystalPars4Sim : public FairParGenericSet
   private:
     /* Simulation Parameters of Crystals */
     TArrayI* fCrystalIDArray;
-    TArrayI* fThresholdArray;
+    TArrayF* fThresholdArray;
     TArrayF* fResolutionArray;
+    TArrayF* fEffToTArray;
 
     Int_t fNumCrystals;   /* Number of crystals */
     Int_t fNumParams4Sim; /* Number of Simulation parameters in the Sim (CrystalID, Resolution, Threshold, NonUni...) */
@@ -72,5 +73,3 @@ class R3BCalifaCrystalPars4Sim : public FairParGenericSet
 
     ClassDef(R3BCalifaCrystalPars4Sim, 1);
 };
-
-#endif

califa/sim/R3BCalifaDigitizer.cxx

@@ -246,8 +246,9 @@ void R3BCalifaDigitizer::FillRealConfig(int nCrystalCals)
     double tempNf = 0;
     double tempNs = 0;
     int tempCryID = 0;
-    int parThres = 0;
+    double parThres = 0;
     bool inUse = false;
+    double ToTeff = 0;
 
     for (int i = 0; i < nCrystalCals; i++)
     {
@@ -257,8 +258,14 @@ void R3BCalifaDigitizer::FillRealConfig(int nCrystalCals)
         inUse = fSim_Par->GetInUse(tempCryID - 1);
         fResolution = fSim_Par->GetResolution(tempCryID - 1);
         parThres = fSim_Par->GetThreshold(tempCryID - 1);
+        ToTeff = fSim_Par->GetTotEff(tempCryID - 1);
 
-        if (inUse && parThres < tempE * 1000.)
+        // Metropolis-like algorithm to apply ToT efficiencies
+        // (if not ToT efficiencies are provided, default values are
+        // set to 1 so no correction by these unefficiencies is performed).
+        double randValue = gRandom->Uniform(0, 1);
+
+        if (inUse && parThres < tempE * 1000. && randValue < ToTeff)
         { // Thresholds are in KeV!!
 
             (dynamic_cast<R3BCalifaCrystalCalData*>(fCalifaCryCalDataCA->At(i)))->SetEnergy(ExpResSmearing(tempE));