[ALICE3] Add nuclei to TOF & RICH + combined PID task

ALICE3/DataModel/OTFRICH.h

@@ -31,12 +31,20 @@ DECLARE_SOA_COLUMN(NSigmaMuonRich, nSigmaMuonRich, float);         //! NSigma mu
 DECLARE_SOA_COLUMN(NSigmaPionRich, nSigmaPionRich, float);         //! NSigma pion BarrelRich
 DECLARE_SOA_COLUMN(NSigmaKaonRich, nSigmaKaonRich, float);         //! NSigma kaon BarrelRich
 DECLARE_SOA_COLUMN(NSigmaProtonRich, nSigmaProtonRich, float);     //! NSigma proton BarrelRich
+DECLARE_SOA_COLUMN(NSigmaDeuteronRich, nSigmaDeuteronRich, float); //! NSigma deuteron BarrelRich
+DECLARE_SOA_COLUMN(NSigmaTritonRich, nSigmaTritonRich, float);     //! NSigma triton BarrelRich
+DECLARE_SOA_COLUMN(NSigmaHelium3Rich, nSigmaHelium3Rich, float);   //! NSigma helium3 BarrelRich
+DECLARE_SOA_COLUMN(NSigmaAlphaRich, nSigmaAlphaRich, float);       //! NSigma alpha BarrelRich
 DECLARE_SOA_DYNAMIC_COLUMN(NSigmaRich, nSigmaRich,                 //! General function to get the nSigma for the RICH
                            [](const float el,
                               const float mu,
                               const float pi,
                               const float ka,
                               const float pr,
+                              const float de,
+                              const float tr,
+                              const float he3,
+                              const float al,
                               const int id) -> float {
                              switch (std::abs(id)) {
                                case 0:
@@ -49,6 +57,14 @@ DECLARE_SOA_DYNAMIC_COLUMN(NSigmaRich, nSigmaRich,                 //! General f
                                  return ka;
                                case 4:
                                  return pr;
+                               case 5:
+                                 return de;
+                               case 6:
+                                 return tr;
+                               case 7:
+                                 return he3;
+                               case 8:
+                                 return al;
                                default:
                                  LOG(fatal) << "Unrecognized PDG code for RICH";
                                  return 999.f;
@@ -62,6 +78,10 @@ DECLARE_SOA_COLUMN(HasSigMu, hasSigMu, bool);       //! Has nSigma muon BarrelRi
 DECLARE_SOA_COLUMN(HasSigPi, hasSigPi, bool);       //! Has nSigma pion BarrelRich (is pion over threshold)
 DECLARE_SOA_COLUMN(HasSigKa, hasSigKa, bool);       //! Has nSigma kaon BarrelRich (is kaon over threshold)
 DECLARE_SOA_COLUMN(HasSigPr, hasSigPr, bool);       //! Has nSigma proton BarrelRich (is proton over threshold)
+DECLARE_SOA_COLUMN(HasSigDe, hasSigDe, bool);       //! Has nSigma deuteron BarrelRich (is deuteron over threshold)
+DECLARE_SOA_COLUMN(HasSigTr, hasSigTr, bool);       //! Has nSigma triton BarrelRich (is triton over threshold)
+DECLARE_SOA_COLUMN(HasSigHe3, hasSigHe3, bool);     //! Has nSigma helium3 BarrelRich (is helium3 over threshold)
+DECLARE_SOA_COLUMN(HasSigAl, hasSigAl, bool);       //! Has nSigma alpha BarrelRich (is alpha over threshold)
 
 } // namespace upgrade_rich
 DECLARE_SOA_TABLE(UpgradeRichs, "AOD", "UPGRADERICH",
@@ -70,11 +90,19 @@ DECLARE_SOA_TABLE(UpgradeRichs, "AOD", "UPGRADERICH",
                   upgrade_rich::NSigmaPionRich,
                   upgrade_rich::NSigmaKaonRich,
                   upgrade_rich::NSigmaProtonRich,
+                  upgrade_rich::NSigmaDeuteronRich,
+                  upgrade_rich::NSigmaTritonRich,
+                  upgrade_rich::NSigmaHelium3Rich,
+                  upgrade_rich::NSigmaAlphaRich,
                   upgrade_rich::NSigmaRich<upgrade_rich::NSigmaElectronRich,
                                            upgrade_rich::NSigmaMuonRich,
                                            upgrade_rich::NSigmaPionRich,
                                            upgrade_rich::NSigmaKaonRich,
-                                           upgrade_rich::NSigmaProtonRich>);
+                                           upgrade_rich::NSigmaProtonRich,
+                                           upgrade_rich::NSigmaDeuteronRich,
+                                           upgrade_rich::NSigmaTritonRich,
+                                           upgrade_rich::NSigmaHelium3Rich,
+                                           upgrade_rich::NSigmaAlphaRich>);
 
 using UpgradeRich = UpgradeRichs::iterator;
 
@@ -85,6 +113,10 @@ DECLARE_SOA_TABLE(UpgradeRichSignals, "AOD", "UPGRADERICHSIG",
                   upgrade_rich::HasSigPi,
                   upgrade_rich::HasSigKa,
                   upgrade_rich::HasSigPr,
+                  upgrade_rich::HasSigDe,
+                  upgrade_rich::HasSigTr,
+                  upgrade_rich::HasSigHe3,
+                  upgrade_rich::HasSigAl,
                   upgrade_rich::HasSigInGas);
 
 using UpgradeRichSignal = UpgradeRichSignals::iterator;

ALICE3/DataModel/OTFTOF.h

@@ -32,41 +32,61 @@
 DECLARE_SOA_COLUMN(OuterTOFTrackTime, outerTOFTrackTime, float);     //! Track time generated at the OuterTOF
 DECLARE_SOA_COLUMN(OuterTOFTrackLength, outerTOFTrackLength, float); //! track length for calculation of OuterTOF (generated)
 
 DECLARE_SOA_COLUMN(TOFEventTime, tofEventTime, float);                       //! Event time reconstructed with the TOF
 DECLARE_SOA_COLUMN(TOFEventTimeErr, tofEventTimeErr, float);                 //! Uncertainty on the event time reconstructed with the TOF
 DECLARE_SOA_COLUMN(NSigmaElectronInnerTOF, nSigmaElectronInnerTOF, float);   //! NSigma electron InnerTOF
 DECLARE_SOA_COLUMN(NSigmaMuonInnerTOF, nSigmaMuonInnerTOF, float);           //! NSigma muon InnerTOF
 DECLARE_SOA_COLUMN(NSigmaPionInnerTOF, nSigmaPionInnerTOF, float);           //! NSigma pion InnerTOF
 DECLARE_SOA_COLUMN(NSigmaKaonInnerTOF, nSigmaKaonInnerTOF, float);           //! NSigma kaon InnerTOF
 DECLARE_SOA_COLUMN(NSigmaProtonInnerTOF, nSigmaProtonInnerTOF, float);       //! NSigma proton InnerTOF
+DECLARE_SOA_COLUMN(NSigmaDeuteronInnerTOF, nSigmaDeuteronInnerTOF, float);   //! NSigma deuteron InnerTOF
+DECLARE_SOA_COLUMN(NSigmaTritonInnerTOF, nSigmaTritonInnerTOF, float);       //! NSigma triton InnerTOF
+DECLARE_SOA_COLUMN(NSigmaHelium3InnerTOF, nSigmaHelium3InnerTOF, float);     //! NSigma helium3 InnerTOF
+DECLARE_SOA_COLUMN(NSigmaAlphaInnerTOF, nSigmaAlphaInnerTOF, float);         //! NSigma alpha InnerTOF
 DECLARE_SOA_COLUMN(InnerTOFTrackTimeReco, innerTOFTrackTimeReco, float);     //! Track time measured at the InnerTOF
 DECLARE_SOA_COLUMN(InnerTOFTrackLengthReco, innerTOFTrackLengthReco, float); //! track length for calculation of InnerTOF (reconstructed)
 
-DECLARE_SOA_COLUMN(InnerTOFExpectedTimeEl, innerTOFExpectedTimeEl, float); //! Reconstructed expected time at the InnerTOF for the Electron mass hypotheses
-DECLARE_SOA_COLUMN(InnerTOFExpectedTimeMu, innerTOFExpectedTimeMu, float); //! Reconstructed expected time at the InnerTOF for the Muon mass hypotheses
-DECLARE_SOA_COLUMN(InnerTOFExpectedTimePi, innerTOFExpectedTimePi, float); //! Reconstructed expected time at the InnerTOF for the Pion mass hypotheses
-DECLARE_SOA_COLUMN(InnerTOFExpectedTimeKa, innerTOFExpectedTimeKa, float); //! Reconstructed expected time at the InnerTOF for the Kaon mass hypotheses
-DECLARE_SOA_COLUMN(InnerTOFExpectedTimePr, innerTOFExpectedTimePr, float); //! Reconstructed expected time at the InnerTOF for the Proton mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimeEl, innerTOFExpectedTimeEl, float);   //! Reconstructed expected time at the InnerTOF for the Electron mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimeMu, innerTOFExpectedTimeMu, float);   //! Reconstructed expected time at the InnerTOF for the Muon mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimePi, innerTOFExpectedTimePi, float);   //! Reconstructed expected time at the InnerTOF for the Pion mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimeKa, innerTOFExpectedTimeKa, float);   //! Reconstructed expected time at the InnerTOF for the Kaon mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimePr, innerTOFExpectedTimePr, float);   //! Reconstructed expected time at the InnerTOF for the Proton mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimeDe, innerTOFExpectedTimeDe, float);   //! Reconstructed expected time at the InnerTOF for the Deuteron mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimeTr, innerTOFExpectedTimeTr, float);   //! Reconstructed expected time at the InnerTOF for the Triton mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimeHe3, innerTOFExpectedTimeHe3, float); //! Reconstructed expected time at the InnerTOF for the Helium3 mass hypotheses
+DECLARE_SOA_COLUMN(InnerTOFExpectedTimeAl, innerTOFExpectedTimeAl, float);   //! Reconstructed expected time at the InnerTOF for the Alpha mass hypotheses
 
 DECLARE_SOA_COLUMN(NSigmaElectronOuterTOF, nSigmaElectronOuterTOF, float);   //! NSigma electron OuterTOF
 DECLARE_SOA_COLUMN(NSigmaMuonOuterTOF, nSigmaMuonOuterTOF, float);           //! NSigma muon OuterTOF
 DECLARE_SOA_COLUMN(NSigmaPionOuterTOF, nSigmaPionOuterTOF, float);           //! NSigma pion OuterTOF
 DECLARE_SOA_COLUMN(NSigmaKaonOuterTOF, nSigmaKaonOuterTOF, float);           //! NSigma kaon OuterTOF
 DECLARE_SOA_COLUMN(NSigmaProtonOuterTOF, nSigmaProtonOuterTOF, float);       //! NSigma proton OuterTOF
+DECLARE_SOA_COLUMN(NSigmaDeuteronOuterTOF, nSigmaDeuteronOuterTOF, float);   //! NSigma deuteron OuterTOF
+DECLARE_SOA_COLUMN(NSigmaTritonOuterTOF, nSigmaTritonOuterTOF, float);       //! NSigma triton OuterTOF
+DECLARE_SOA_COLUMN(NSigmaHelium3OuterTOF, nSigmaHelium3OuterTOF, float);     //! NSigma helium3 OuterTOF
+DECLARE_SOA_COLUMN(NSigmaAlphaOuterTOF, nSigmaAlphaOuterTOF, float);         //! NSigma alpha OuterTOF
 DECLARE_SOA_COLUMN(OuterTOFTrackTimeReco, outerTOFTrackTimeReco, float);     //! Track time measured at the OuterTOF
 DECLARE_SOA_COLUMN(OuterTOFTrackLengthReco, outerTOFTrackLengthReco, float); //! track length for calculation of OuterTOF (reconstructed)
 
-DECLARE_SOA_COLUMN(OuterTOFExpectedTimeEl, outerTOFExpectedTimeEl, float); //! Reconstructed expected time at the OuterTOF for the Electron mass hypotheses
-DECLARE_SOA_COLUMN(OuterTOFExpectedTimeMu, outerTOFExpectedTimeMu, float); //! Reconstructed expected time at the OuterTOF for the Muon mass hypotheses
-DECLARE_SOA_COLUMN(OuterTOFExpectedTimePi, outerTOFExpectedTimePi, float); //! Reconstructed expected time at the OuterTOF for the Pion mass hypotheses
-DECLARE_SOA_COLUMN(OuterTOFExpectedTimeKa, outerTOFExpectedTimeKa, float); //! Reconstructed expected time at the OuterTOF for the Kaon mass hypotheses
-DECLARE_SOA_COLUMN(OuterTOFExpectedTimePr, outerTOFExpectedTimePr, float); //! Reconstructed expected time at the OuterTOF for the Proton mass hypotheses
-DECLARE_SOA_DYNAMIC_COLUMN(NSigmaInnerTOF, nSigmaInnerTOF,                 //! General function to get the nSigma for the InnerTOF
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimeEl, outerTOFExpectedTimeEl, float);   //! Reconstructed expected time at the OuterTOF for the Electron mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimeMu, outerTOFExpectedTimeMu, float);   //! Reconstructed expected time at the OuterTOF for the Muon mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimePi, outerTOFExpectedTimePi, float);   //! Reconstructed expected time at the OuterTOF for the Pion mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimeKa, outerTOFExpectedTimeKa, float);   //! Reconstructed expected time at the OuterTOF for the Kaon mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimePr, outerTOFExpectedTimePr, float);   //! Reconstructed expected time at the OuterTOF for the Proton mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimeDe, outerTOFExpectedTimeDe, float);   //! Reconstructed expected time at the OuterTOF for the Deuteron mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimeTr, outerTOFExpectedTimeTr, float);   //! Reconstructed expected time at the OuterTOF for the Triton mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimeHe3, outerTOFExpectedTimeHe3, float); //! Reconstructed expected time at the OuterTOF for the Helium3 mass hypotheses
+DECLARE_SOA_COLUMN(OuterTOFExpectedTimeAl, outerTOFExpectedTimeAl, float);   //! Reconstructed expected time at the OuterTOF for the Alpha mass hypotheses
+DECLARE_SOA_DYNAMIC_COLUMN(NSigmaInnerTOF, nSigmaInnerTOF,                   //! General function to get the nSigma for the InnerTOF
                            [](const float el,
                               const float mu,
                               const float pi,
                               const float ka,
                               const float pr,
+                              const float de,
+                              const float tr,
+                              const float he3,
+                              const float al,
                               const int id) -> float {
                              switch (std::abs(id)) {
                                case 0:
@@ -79,6 +99,14 @@
                                  return ka;
                                case 4:
                                  return pr;
+                               case 5:
+                                 return de;
+                               case 6:
+                                 return tr;
+                               case 7:
+                                 return he3;
+                               case 8:
+                                 return al;
                                default:
                                  LOG(fatal) << "Unrecognized PDG code for InnerTOF";
                                  return 999.f;
@@ -90,6 +118,10 @@
                               const float pi,
                               const float ka,
                               const float pr,
+                              const float de,
+                              const float tr,
+                              const float he3,
+                              const float al,
                               const int id) -> float {
                              switch (std::abs(id)) {
                                case 0:
@@ -102,6 +134,14 @@
                                  return ka;
                                case 4:
                                  return pr;
+                               case 5:
+                                 return de;
+                               case 6:
+                                 return tr;
+                               case 7:
+                                 return he3;
+                               case 8:
+                                 return al;
                                default:
                                  LOG(fatal) << "Unrecognized PDG code for InnerTOF";
                                  return 999.f;
@@ -124,37 +164,61 @@
                   upgrade_tof::NSigmaPionInnerTOF,
                   upgrade_tof::NSigmaKaonInnerTOF,
                   upgrade_tof::NSigmaProtonInnerTOF,
+                  upgrade_tof::NSigmaDeuteronInnerTOF,
+                  upgrade_tof::NSigmaTritonInnerTOF,
+                  upgrade_tof::NSigmaHelium3InnerTOF,
+                  upgrade_tof::NSigmaAlphaInnerTOF,
                   upgrade_tof::InnerTOFTrackTimeReco,
                   upgrade_tof::InnerTOFTrackLengthReco,
                   upgrade_tof::NSigmaElectronOuterTOF,
                   upgrade_tof::NSigmaMuonOuterTOF,
                   upgrade_tof::NSigmaPionOuterTOF,
                   upgrade_tof::NSigmaKaonOuterTOF,
                   upgrade_tof::NSigmaProtonOuterTOF,
+                  upgrade_tof::NSigmaDeuteronOuterTOF,
+                  upgrade_tof::NSigmaTritonOuterTOF,
+                  upgrade_tof::NSigmaHelium3OuterTOF,
+                  upgrade_tof::NSigmaAlphaOuterTOF,
                   upgrade_tof::OuterTOFTrackTimeReco,
                   upgrade_tof::OuterTOFTrackLengthReco,
                   upgrade_tof::NSigmaInnerTOF<upgrade_tof::NSigmaElectronInnerTOF,
                                               upgrade_tof::NSigmaMuonInnerTOF,
                                               upgrade_tof::NSigmaPionInnerTOF,
                                               upgrade_tof::NSigmaKaonInnerTOF,
-                                              upgrade_tof::NSigmaProtonInnerTOF>,
+                                              upgrade_tof::NSigmaProtonInnerTOF,
+                                              upgrade_tof::NSigmaDeuteronInnerTOF,
+                                              upgrade_tof::NSigmaTritonInnerTOF,
+                                              upgrade_tof::NSigmaHelium3InnerTOF,
+                                              upgrade_tof::NSigmaAlphaInnerTOF>,
                   upgrade_tof::NSigmaOuterTOF<upgrade_tof::NSigmaElectronOuterTOF,
                                               upgrade_tof::NSigmaMuonOuterTOF,
                                               upgrade_tof::NSigmaPionOuterTOF,
                                               upgrade_tof::NSigmaKaonOuterTOF,
-                                              upgrade_tof::NSigmaProtonOuterTOF>);
+                                              upgrade_tof::NSigmaProtonOuterTOF,
+                                              upgrade_tof::NSigmaDeuteronOuterTOF,
+                                              upgrade_tof::NSigmaTritonOuterTOF,
+                                              upgrade_tof::NSigmaHelium3OuterTOF,
+                                              upgrade_tof::NSigmaAlphaOuterTOF>);
 
 DECLARE_SOA_TABLE(UpgradeTofExpectedTimes, "AOD", "UPGRADETOFEXPT",
                   upgrade_tof::InnerTOFExpectedTimeEl,
                   upgrade_tof::InnerTOFExpectedTimeMu,
                   upgrade_tof::InnerTOFExpectedTimePi,
                   upgrade_tof::InnerTOFExpectedTimeKa,
                   upgrade_tof::InnerTOFExpectedTimePr,
+                  upgrade_tof::InnerTOFExpectedTimeDe,
+                  upgrade_tof::InnerTOFExpectedTimeTr,
+                  upgrade_tof::InnerTOFExpectedTimeHe3,
+                  upgrade_tof::InnerTOFExpectedTimeAl,
                   upgrade_tof::OuterTOFExpectedTimeEl,
                   upgrade_tof::OuterTOFExpectedTimeMu,
                   upgrade_tof::OuterTOFExpectedTimePi,
                   upgrade_tof::OuterTOFExpectedTimeKa,
-                  upgrade_tof::OuterTOFExpectedTimePr);
+                  upgrade_tof::OuterTOFExpectedTimePr,
+                  upgrade_tof::OuterTOFExpectedTimeDe,
+                  upgrade_tof::OuterTOFExpectedTimeTr,
+                  upgrade_tof::OuterTOFExpectedTimeHe3,
+                  upgrade_tof::OuterTOFExpectedTimeAl);
 
 using UpgradeTofMC = UpgradeTofMCs::iterator;
 using UpgradeTof = UpgradeTofs::iterator;