Skip to content

Commit 648d86c

Browse files
jjurackajjuracka
authored
Merge branch 'AliceO2Group:master' into updates
2 parents aa6d2b7 + 4a92058 commit 648d86c

File tree

594 files changed

+14261
-9776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

594 files changed

+14261
-9776
lines changed

‎.github/workflows/mega-linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: ml
3939
# You can override MegaLinter flavor used to have faster performances
4040
# More info at https://megalinter.io/flavors/
41-
uses: oxsecurity/megalinter@v9.0.1
41+
uses: oxsecurity/megalinter@v9.1.0
4242
env:
4343
# All available variables are described in documentation:
4444
# https://megalinter.io/configuration/

‎ALICE3/Core/FastTracker.cxx‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <TObject.h>
2323

2424
#include <fstream>
25+
#include <map>
2526
#include <string>
2627
#include <vector>
2728

@@ -66,20 +67,6 @@ void FastTracker::addDeadPhiRegionInLayer(const std::string& layerName, float ph
6667
layers[layerIdx].addDeadPhiRegion(phiStart, phiEnd);
6768
}
6869

69-
DetLayer FastTracker::GetLayer(int layer, bool ignoreBarrelLayers) const
70-
{
71-
int layerIdx = layer;
72-
if (ignoreBarrelLayers) {
73-
for (int il = 0, trackingLayerIdx = 0; trackingLayerIdx <= layer; il++) {
74-
if (layers[il].isInert())
75-
continue;
76-
trackingLayerIdx++;
77-
layerIdx = il;
78-
}
79-
}
80-
return layers[layerIdx];
81-
}
82-
8370
int FastTracker::GetLayerIndex(const std::string& name) const
8471
{
8572
int i = 0;
@@ -339,7 +326,7 @@ void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBMa
339326
LOG(fatal) << "Cannot open dead phi regions file " << deadPhiRegions;
340327
return;
341328
}
342-
TGraph* g = (TGraph*)infile.Get(infile.GetListOfKeys()->At(0)->GetName());
329+
TGraph* g = reinterpret_cast<TGraph*>(infile.Get(infile.GetListOfKeys()->At(0)->GetName()));
343330
infile.Close();
344331
addedLayer->setDeadPhiRegions(g);
345332
}

‎ALICE3/Core/FastTracker.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class FastTracker
4848
/// \param phiStart Start angle of the dead region (in radians)
4949
/// \param phiEnd End angle of the dead region (in radians)
5050
void addDeadPhiRegionInLayer(const std::string& layerName, float phiStart, float phiEnd);
51-
DetLayer GetLayer(const int layer, bool ignoreBarrelLayers = true) const;
51+
DetLayer GetLayer(const int layer) const { return layers[layer]; }
5252
std::vector<DetLayer> GetLayers() const { return layers; }
5353
int GetLayerIndex(const std::string& name) const;
5454
size_t GetNLayers() const { return layers.size(); }

‎ALICE3/Tasks/ECALqa.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
///
1818

1919
// O2 includes
20-
#include "Framework/AnalysisTask.h"
2120
#include "ALICE3/DataModel/ECAL.h"
22-
#include "Common/DataModel/PIDResponse.h"
23-
#include "ReconstructionDataFormats/PID.h"
21+
22+
#include "Framework/AnalysisTask.h"
2423
#include "Framework/HistogramRegistry.h"
2524
#include "Framework/runDataProcessing.h"
25+
#include "ReconstructionDataFormats/PID.h"
2626

2727
using namespace o2;
2828
using namespace o2::track;

‎ALICE3/Tasks/alice3-cdeuteron.cxx‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
/// \author Alexander Kalweit <alexander.kalweit@cern.ch>, CERN
1414

1515
// O2 includes
16+
#include "Common/Core/RecoDecay.h"
17+
#include "Common/Core/trackUtilities.h"
18+
#include "Common/DataModel/PIDResponseTOF.h"
19+
20+
#include "DCAFitter/DCAFitterN.h"
1621
#include "Framework/AnalysisTask.h"
17-
#include "Framework/runDataProcessing.h"
18-
#include "TLorentzVector.h"
1922
#include "Framework/HistogramRegistry.h"
23+
#include "Framework/runDataProcessing.h"
2024
#include "ReconstructionDataFormats/PID.h"
21-
#include "Common/Core/RecoDecay.h"
22-
#include "DCAFitter/DCAFitterN.h"
23-
#include "Common/DataModel/PIDResponse.h"
24-
#include "Common/Core/trackUtilities.h"
25+
26+
#include "TLorentzVector.h"
2527

2628
using namespace o2;
2729
using namespace o2::framework;
@@ -468,7 +470,7 @@ struct Alice3CDeuteron {
468470

469471
// fitterCasc.getTrack(1).getPxPyPzGlo(pvecbach);
470472
} // End loop on pions
471-
} // End loop on kaons
473+
} // End loop on kaons
472474
histos.fill(HIST("event/candperdeuteron"), ncand);
473475
} // End loop on deuterons
474476
}

‎ALICE3/Tasks/pidRICHqa.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
///
1717

1818
// O2 includes
19-
#include "Framework/AnalysisTask.h"
2019
#include "ALICE3/DataModel/RICH.h"
21-
#include "Common/DataModel/PIDResponse.h"
20+
#include "Common/DataModel/PIDResponseTOF.h"
21+
22+
#include "Framework/AnalysisTask.h"
2223
#include "ReconstructionDataFormats/PID.h"
2324

2425
using namespace o2;

‎CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
/PWGLF/Utils @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
5757

5858
# PWG-MM (fused with LF, LF conveners included. Directories to be merged in the future)
59-
/PWGMM @alibuild @sustripathy @skundu692 @aalkin @jgcn
60-
/PWGMM/Mult @alibuild @sustripathy @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
61-
/PWGMM/Lumi @alibuild @sustripathy @skundu692 @aalkin @jgcn @gbencedi @abmodak
62-
/PWGMM/UE @alibuild @sustripathy @skundu692 @aalkin @aortizve @jgcn
59+
/PWGMM @alibuild @mpuccio @skundu692 @aalkin @jgcn
60+
/PWGMM/Mult @alibuild @mpuccio @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
61+
/PWGMM/Lumi @alibuild @mpuccio @skundu692 @aalkin @jgcn @gbencedi @abmodak
62+
/PWGMM/UE @alibuild @mpuccio @skundu692 @aalkin @aortizve @jgcn
6363

6464
/PWGUD @alibuild @amatyja @rolavick
6565
/PWGJE @alibuild @lhavener @maoyx @nzardosh @fjonasALICE @mfasDa @mhemmer-cern

‎Common/Core/TrackSelectorPID.h‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct TrackSelectorPID {
3737
};
3838
};
3939

40-
template <uint64_t pdg = kPiPlus>
40+
template <uint64_t pdg = PDG_t::kPiPlus>
4141
class TrackSelectorPidBase
4242
{
4343
public:
@@ -121,15 +121,15 @@ class TrackSelectorPidBase
121121

122122
// Get nσ for a given particle hypothesis.
123123
double nSigma = 100.;
124-
if constexpr (pdg == kElectron) {
124+
if constexpr (pdg == PDG_t::kElectron) {
125125
nSigma = track.tpcNSigmaEl();
126-
} else if constexpr (pdg == kMuonMinus) {
126+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
127127
nSigma = track.tpcNSigmaMu();
128-
} else if constexpr (pdg == kPiPlus) {
128+
} else if constexpr (pdg == PDG_t::kPiPlus) {
129129
nSigma = track.tpcNSigmaPi();
130-
} else if constexpr (pdg == kKPlus) {
130+
} else if constexpr (pdg == PDG_t::kKPlus) {
131131
nSigma = track.tpcNSigmaKa();
132-
} else if constexpr (pdg == kProton) {
132+
} else if constexpr (pdg == PDG_t::kProton) {
133133
nSigma = track.tpcNSigmaPr();
134134
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
135135
nSigma = track.tpcNSigmaDe();
@@ -217,15 +217,15 @@ class TrackSelectorPidBase
217217

218218
// Get nσ for a given particle hypothesis.
219219
double nSigma = 100.;
220-
if constexpr (pdg == kElectron) {
220+
if constexpr (pdg == PDG_t::kElectron) {
221221
nSigma = track.tofNSigmaEl();
222-
} else if constexpr (pdg == kMuonMinus) {
222+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
223223
nSigma = track.tofNSigmaMu();
224-
} else if constexpr (pdg == kPiPlus) {
224+
} else if constexpr (pdg == PDG_t::kPiPlus) {
225225
nSigma = track.tofNSigmaPi();
226-
} else if constexpr (pdg == kKPlus) {
226+
} else if constexpr (pdg == PDG_t::kKPlus) {
227227
nSigma = track.tofNSigmaKa();
228-
} else if constexpr (pdg == kProton) {
228+
} else if constexpr (pdg == PDG_t::kProton) {
229229
nSigma = track.tofNSigmaPr();
230230
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
231231
nSigma = track.tofNSigmaDe();
@@ -315,15 +315,15 @@ class TrackSelectorPidBase
315315

316316
// Get nσ for a given particle hypothesis.
317317
double nSigma = 100.;
318-
if constexpr (pdg == kElectron) {
318+
if constexpr (pdg == PDG_t::kElectron) {
319319
nSigma = track.rich().richNsigmaEl();
320-
} else if constexpr (pdg == kMuonMinus) {
320+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
321321
nSigma = track.rich().richNsigmaMu();
322-
} else if constexpr (pdg == kPiPlus) {
322+
} else if constexpr (pdg == PDG_t::kPiPlus) {
323323
nSigma = track.rich().richNsigmaPi();
324-
} else if constexpr (pdg == kKPlus) {
324+
} else if constexpr (pdg == PDG_t::kKPlus) {
325325
nSigma = track.rich().richNsigmaKa();
326-
} else if constexpr (pdg == kProton) {
326+
} else if constexpr (pdg == PDG_t::kProton) {
327327
nSigma = track.rich().richNsigmaPr();
328328
} else {
329329
errorPdg();
@@ -364,7 +364,7 @@ class TrackSelectorPidBase
364364
template <typename T>
365365
bool isValidForMid(const T& track)
366366
{
367-
if constexpr (pdg == kMuonMinus) {
367+
if constexpr (pdg == PDG_t::kMuonMinus) {
368368
return track.midId() > -1;
369369
} else {
370370
errorPdg();
@@ -378,7 +378,7 @@ class TrackSelectorPidBase
378378
template <typename T>
379379
bool isSelectedByMid(const T& track)
380380
{
381-
if constexpr (pdg == kMuonMinus) {
381+
if constexpr (pdg == PDG_t::kMuonMinus) {
382382
return track.mid().midIsMuon() == 1; // FIXME: change to return track.midIsMuon() once the column is bool.
383383
} else {
384384
errorPdg();
@@ -392,7 +392,7 @@ class TrackSelectorPidBase
392392
template <typename T>
393393
TrackSelectorPID::Status statusMid(const T& track)
394394
{
395-
if constexpr (pdg == kMuonMinus) {
395+
if constexpr (pdg == PDG_t::kMuonMinus) {
396396
if (!isValidForMid(track)) {
397397
return TrackSelectorPID::NotApplicable;
398398
}
@@ -555,15 +555,15 @@ class TrackSelectorPidBase
555555
bool isSelectedByBayes(const T& track)
556556
{
557557
// Get index of the most probable species for a given track.
558-
if constexpr (pdg == kElectron) {
558+
if constexpr (pdg == PDG_t::kElectron) {
559559
return track.bayesID() == o2::track::PID::Electron;
560-
} else if constexpr (pdg == kMuonMinus) {
560+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
561561
return track.bayesID() == o2::track::PID::Muon;
562-
} else if constexpr (pdg == kPiPlus) {
562+
} else if constexpr (pdg == PDG_t::kPiPlus) {
563563
return track.bayesID() == o2::track::PID::Pion;
564-
} else if constexpr (pdg == kKPlus) {
564+
} else if constexpr (pdg == PDG_t::kKPlus) {
565565
return track.bayesID() == o2::track::PID::Kaon;
566-
} else if constexpr (pdg == kProton) {
566+
} else if constexpr (pdg == PDG_t::kProton) {
567567
return track.bayesID() == o2::track::PID::Proton;
568568
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
569569
return track.bayesID() == o2::track::PID::Deuteron;
@@ -585,15 +585,15 @@ class TrackSelectorPidBase
585585

586586
// Get probability for a given particle hypothesis.
587587
double prob = 0.;
588-
if constexpr (pdg == kElectron) {
588+
if constexpr (pdg == PDG_t::kElectron) {
589589
prob = track.bayesEl();
590-
} else if constexpr (pdg == kMuonMinus) {
590+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
591591
prob = track.bayesMu();
592-
} else if constexpr (pdg == kPiPlus) {
592+
} else if constexpr (pdg == PDG_t::kPiPlus) {
593593
prob = track.bayesPi();
594-
} else if constexpr (pdg == kKPlus) {
594+
} else if constexpr (pdg == PDG_t::kKPlus) {
595595
prob = track.bayesKa();
596-
} else if constexpr (pdg == kProton) {
596+
} else if constexpr (pdg == PDG_t::kProton) {
597597
prob = track.bayesPr();
598598
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
599599
prob = track.bayesDe();
@@ -674,11 +674,11 @@ class TrackSelectorPidBase
674674
};
675675

676676
// Predefined types
677-
using TrackSelectorEl = TrackSelectorPidBase<kElectron>; // El
678-
using TrackSelectorMu = TrackSelectorPidBase<kMuonMinus>; // Mu
679-
using TrackSelectorPi = TrackSelectorPidBase<kPiPlus>; // Pi
680-
using TrackSelectorKa = TrackSelectorPidBase<kKPlus>; // Ka
681-
using TrackSelectorPr = TrackSelectorPidBase<kProton>; // Pr
677+
using TrackSelectorEl = TrackSelectorPidBase<PDG_t::kElectron>; // El
678+
using TrackSelectorMu = TrackSelectorPidBase<PDG_t::kMuonMinus>; // Mu
679+
using TrackSelectorPi = TrackSelectorPidBase<PDG_t::kPiPlus>; // Pi
680+
using TrackSelectorKa = TrackSelectorPidBase<PDG_t::kKPlus>; // Ka
681+
using TrackSelectorPr = TrackSelectorPidBase<PDG_t::kProton>; // Pr
682682
using TrackSelectorDe = TrackSelectorPidBase<o2::constants::physics::Pdg::kDeuteron>; // De
683683

684684
#endif // COMMON_CORE_TRACKSELECTORPID_H_

‎Common/DataModel/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ o2physics_add_header_only_library(DataModel
2727
MatchMFTFT0.h
2828
MftmchMatchingML.h
2929
ZDCExtra.h
30+
ZDCLightIons.h
3031
EseTable.h
3132
FwdTrackReAlignTables.h)

‎Common/DataModel/ZDCExtra.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ DECLARE_SOA_COLUMN(Vx, vx, float); //! Vertex X
4646
DECLARE_SOA_COLUMN(Vy, vy, float); //! Vertex Y
4747
DECLARE_SOA_COLUMN(Vz, vz, float); //! Vertex Z
4848
DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t); //! Timestamp
49+
DECLARE_SOA_COLUMN(RunNumber, runNumber, uint32_t); //! Run Number
4950
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags
5051
} // namespace zdcextra
5152

@@ -71,6 +72,7 @@ DECLARE_SOA_TABLE(ZdcExtras, "AOD", "ZDCEXTRA", o2::soa::Index<>,
7172
zdcextra::Vy,
7273
zdcextra::Vz,
7374
zdcextra::Timestamp,
75+
zdcextra::RunNumber,
7476
zdcextra::SelectionBits);
7577
} // namespace o2::aod
7678

0 commit comments

Comments
 (0)