Skip to content

Commit fc5a341

Browse files
PaolaVTPaolaVT
authored
Merge branch 'AliceO2Group:master' into master
2 parents 811df3b + 3695b2c commit fc5a341

72 files changed

Lines changed: 8409 additions & 3271 deletions

File tree

Some content is hidden

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

‎.clang-format‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ IncludeCategories:
4747
Priority: 2
4848
CaseSensitive: true
4949
# O2Physics, non-PWG
50-
- Regex: ^(<|")(Common|ALICE3|DPG|EventFiltering|Tools|Tutorials)/.*\.h
50+
- Regex: ^(<|")(Common|ALICE3|DPG|EventFiltering|PID|Tools|Tutorials)/.*\.h
5151
Priority: 3
5252
CaseSensitive: true
5353
# O2
54-
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|FDD|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MCH|MFT|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
54+
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|FDD|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MCH|MFT|MID|PHOS|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
5555
Priority: 4
5656
CaseSensitive: true
5757
# ROOT
@@ -93,6 +93,7 @@ IncludeCategories:
9393
# rest
9494
- Regex: .*
9595
Priority: 100
96+
CaseSensitive: true
9697
SpaceBeforeAssignmentOperators: true
9798
SpaceBeforeParens: ControlStatements
9899
SpaceInEmptyParentheses: false

‎Common/Core/PID/PIDTOFParamService.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "Common/Core/CollisionTypeHelper.h"
2222
#include "Common/Core/MetadataHelper.h"
23+
#include "Common/Core/PID/PIDTOF.h"
2324

2425
#include <CCDB/BasicCCDBManager.h>
2526
#include <DataFormatsParameters/GRPLHCIFData.h>
@@ -30,7 +31,6 @@
3031
#include <Framework/ServiceHandle.h>
3132
#include <Framework/ServiceSpec.h>
3233
#include <Framework/TypeIdHelpers.h>
33-
#include <PID/PIDTOF.h>
3434

3535
#include <TGraph.h>
3636

@@ -80,7 +80,7 @@ void o2::pid::tof::TOFResponseImpl::initSetup(o2::ccdb::BasicCCDBManager* ccdb,
8080
LOG(fatal) << "CCDB manager is not set, cannot initialize TOFResponseImpl";
8181
}
8282
inheritFromBaseTask(initContext, task); // Gets the configuration parameters from the base task (tof-signal)
83-
mCcdb = ccdb; // Set the CCDB manager
83+
mCcdb = ccdb; // Set the CCDB manager
8484
mCcdb->setURL(mUrl);
8585
mCcdb->setTimestamp(mTimestamp);
8686
mCcdb->setCaching(true);

‎Common/Core/PID/ParamBase.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
/// These are the basic storage elements to be kept in the CCDB
1818
///
1919

20+
#include "ParamBase.h"
21+
2022
#include <Framework/Logger.h>
21-
#include <PID/ParamBase.h>
2223

2324
#include <TFile.h>
2425
#include <TString.h>

‎Common/DataModel/Centrality.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ DECLARE_SOA_COLUMN(CentRun2CL1, centRun2CL1, float); //! Run 2
2626
DECLARE_SOA_COLUMN(CentRun2RefMult5, centRun2RefMult5, float); //! Run 2 cent. from ref. mult. estimator, eta 0.5
2727
DECLARE_SOA_COLUMN(CentRun2RefMult8, centRun2RefMult8, float); //! Run 2 cent. from ref. mult. estimator, eta 0.8
2828

29-
DECLARE_SOA_COLUMN(CentFV0A, centFV0A, float); //! Run 3 cent. from FV0A multiplicities
30-
DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); //! Run 3 cent. from FT0A+FT0C multiplicities
31-
DECLARE_SOA_COLUMN(CentFT0MLightIonAnchorCol, centFT0MLightIonAnchorCol, float); //! Run 3 cent. from FT0A+FT0C multiplicities - light ion only - 90% anchor - collision based (NOT recommended, cross-check only!)
32-
DECLARE_SOA_COLUMN(CentFT0MLightIonAnchorBC, centFT0MLightIonAnchorBC, float); //! Run 3 cent. from FT0A+FT0C multiplicities - light ion only - 90% anchor - bunch crossing based (NOT recommended, cross-check only!)
33-
DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float); //! Run 3 cent. from FT0A multiplicity
34-
DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float); //! Run 3 cent. from FT0C multiplicity
35-
DECLARE_SOA_COLUMN(CentFT0CVariant1, centFT0CVariant1, float); //! Run 3 cent. from FT0C multiplicity
36-
DECLARE_SOA_COLUMN(CentFT0CVariant2, centFT0CVariant2, float); //! Run 3 cent. from FT0C multiplicity, uses classical truncated Nancestors (NOT recommended, cross-check only!)
37-
DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float); //! Run 3 cent. from FDDA+FDDC multiplicity
38-
DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float); //! Run 3 cent. from the number of tracks contributing to the PV
39-
DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float); //! Run 3 cent. from the number of global tracks
40-
DECLARE_SOA_COLUMN(CentMFT, centMFT, float); //! Run 3 cent. from the number of tracks in the MFT
29+
DECLARE_SOA_COLUMN(CentFV0A, centFV0A, float); //! Run 3 cent. from FV0A multiplicities
30+
DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); //! Run 3 cent. from FT0A+FT0C multiplicities
31+
DECLARE_SOA_COLUMN(CentFT0MAnchorCol, centFT0MAnchorCol, float); //! Run 3 cent. from FT0A+FT0C multiplicities - anchored glauber - collision based (NOT recommended, cross-check only!)
32+
DECLARE_SOA_COLUMN(CentFT0MAnchorBC, centFT0MAnchorBC, float); //! Run 3 cent. from FT0A+FT0C multiplicities - anchored glauber - bunch crossing based (NOT recommended, cross-check only!)
33+
DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float); //! Run 3 cent. from FT0A multiplicity
34+
DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float); //! Run 3 cent. from FT0C multiplicity
35+
DECLARE_SOA_COLUMN(CentFT0CVariant1, centFT0CVariant1, float); //! Run 3 cent. from FT0C multiplicity
36+
DECLARE_SOA_COLUMN(CentFT0CVariant2, centFT0CVariant2, float); //! Run 3 cent. from FT0C multiplicity, uses classical truncated Nancestors (NOT recommended, cross-check only!)
37+
DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float); //! Run 3 cent. from FDDA+FDDC multiplicity
38+
DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float); //! Run 3 cent. from the number of tracks contributing to the PV
39+
DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float); //! Run 3 cent. from the number of global tracks
40+
DECLARE_SOA_COLUMN(CentMFT, centMFT, float); //! Run 3 cent. from the number of tracks in the MFT
4141
} // namespace cent
4242

4343
// Run 2 tables
@@ -61,10 +61,10 @@ DECLARE_SOA_TABLE(CentNGlobals, "AOD", "CENTNGLOBAL", cent::CentNGlobal); //! Ru
6161
DECLARE_SOA_TABLE(CentMFTs, "AOD", "CENTMFT", cent::CentMFT); //! Run 3 MFT tracks centrality table
6262

6363
// Run 3 variant tables
64-
DECLARE_SOA_TABLE(CentFT0CVariant1s, "AOD", "CENTFT0Cvar1", cent::CentFT0CVariant1); //! Run 3 FT0C variant 1
65-
DECLARE_SOA_TABLE(CentFT0CVariant2s, "AOD", "CENTFT0Cvar2", cent::CentFT0CVariant2); //! Run 3 FT0C variant 1 - uses truncated Nancestors in glauber fit. Not recommended! for cross-checks only
66-
DECLARE_SOA_TABLE(CentFT0MLightIonAnchorCols, "AOD", "CENTFT0MLICOL", cent::CentFT0MLightIonAnchorCol); //! Run 3 Light ions FT0M - Traditional anchor at 90% with Glauber. Colliison based calibration. Not recommended! for cross-checks only
67-
DECLARE_SOA_TABLE(CentFT0MLightIonAnchorBCs, "AOD", "CENTFT0MLIBC", cent::CentFT0MLightIonAnchorBC); //! Run 3 Light ions FT0M - Traditional anchor at 90% with Glauber. Bunch crossing based calibration. Not recommended! for cross-checks only
64+
DECLARE_SOA_TABLE(CentFT0CVariant1s, "AOD", "CENTFT0Cvar1", cent::CentFT0CVariant1); //! Run 3 FT0C variant 1
65+
DECLARE_SOA_TABLE(CentFT0CVariant2s, "AOD", "CENTFT0Cvar2", cent::CentFT0CVariant2); //! Run 3 FT0C variant 2 - uses truncated Nancestors in glauber fit. Not recommended! for cross-checks only
66+
DECLARE_SOA_TABLE(CentFT0MAnchorCols, "AOD", "CENTFT0MCOL", cent::CentFT0MAnchorCol); //! Run 3 FT0M with anchored Glauber. Colliison based calibration. Not recommended! for cross-checks only
67+
DECLARE_SOA_TABLE(CentFT0MAnchorBCs, "AOD", "CENTFT0MBC", cent::CentFT0MAnchorBC); //! Run 3 FT0M with anchored Glauber. Bunch crossing based calibration. Not recommended! for cross-checks only
6868

6969
// Run 3 centrality per BC (joinable with BC)
7070
DECLARE_SOA_TABLE(BCCentFT0Ms, "AOD", "BCCENTFT0M", cent::CentFT0M, o2::soa::Marker<1>); //! Run 3 FT0M BC centrality table

‎Common/TableProducer/PID/pidTOF.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
///
1818

1919
#include "pidTOFBase.h"
20-
20+
//
21+
#include "Common/Core/PID/PIDTOF.h"
2122
#include "Common/Core/TableHelper.h"
2223
#include "Common/DataModel/PIDResponseTOF.h"
2324

@@ -31,7 +32,6 @@
3132
#include <Framework/Configurable.h>
3233
#include <Framework/InitContext.h>
3334
#include <Framework/Variant.h>
34-
#include <PID/PIDTOF.h>
3535
#include <ReconstructionDataFormats/PID.h>
3636

3737
#include <TGraph.h>

‎Common/TableProducer/PID/pidTOFBase.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "pidTOFBase.h"
1919

20+
#include "Common/Core/PID/PIDTOF.h"
2021
#include "Common/Core/TableHelper.h"
2122
#include "Common/DataModel/EventSelection.h"
2223
#include "Common/DataModel/FT0Corrected.h"
@@ -35,7 +36,6 @@
3536
#include <Framework/InitContext.h>
3637
#include <Framework/OutputObjHeader.h>
3738
#include <Framework/runDataProcessing.h>
38-
#include <PID/PIDTOF.h>
3939
#include <ReconstructionDataFormats/PID.h>
4040
#include <TOFBase/EventTimeMaker.h>
4141

@@ -370,8 +370,8 @@ struct tofEventTime {
370370
tableEvTimeTOFOnly.reserve(tracks.size());
371371
}
372372

373-
int lastCollisionId = -1; // Last collision ID analysed
374-
for (auto const& t : tracks) { // Loop on collisions
373+
int lastCollisionId = -1; // Last collision ID analysed
374+
for (auto const& t : tracks) { // Loop on collisions
375375
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
376376
tableFlags(0);
377377
tableEvTime(0.f, 999.f);
@@ -432,8 +432,8 @@ struct tofEventTime {
432432
tableEvTimeTOFOnly.reserve(tracks.size());
433433
}
434434

435-
int lastCollisionId = -1; // Last collision ID analysed
436-
for (auto const& t : tracks) { // Loop on collisions
435+
int lastCollisionId = -1; // Last collision ID analysed
436+
for (auto const& t : tracks) { // Loop on collisions
437437
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
438438
tableFlags(0);
439439
tableEvTime(0.f, 999.f);

‎Common/TableProducer/PID/pidTOFFull.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include "pidTOFBase.h"
2020

21+
#include "Common/Core/PID/PIDTOF.h"
2122
#include "Common/Core/TableHelper.h"
2223
#include "Common/DataModel/PIDResponseTOF.h"
2324

@@ -31,7 +32,6 @@
3132
#include <Framework/Configurable.h>
3233
#include <Framework/InitContext.h>
3334
#include <Framework/Variant.h>
34-
#include <PID/PIDTOF.h>
3535
#include <ReconstructionDataFormats/PID.h>
3636

3737
#include <TGraph.h>
@@ -302,9 +302,9 @@ struct tofPidFull {
302302
reserveTable(pidId, tracks.size());
303303
}
304304

305-
int lastCollisionId = -1; // Last collision ID analysed
306-
float resolution = 1.f; // Last resolution assigned
307-
for (auto const& track : tracks) { // Loop on all tracks
305+
int lastCollisionId = -1; // Last collision ID analysed
306+
float resolution = 1.f; // Last resolution assigned
307+
for (auto const& track : tracks) { // Loop on all tracks
308308
if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
309309
for (auto const& pidId : mEnabledParticles) {
310310
makeTableEmpty(pidId);
@@ -407,8 +407,8 @@ struct tofPidFull {
407407
for (auto const& pidId : mEnabledParticles) {
408408
reserveTable(pidId, tracks.size());
409409
}
410-
float resolution = 1.f; // Last resolution assigned
411-
for (auto const& track : tracks) { // Loop on all tracks
410+
float resolution = 1.f; // Last resolution assigned
411+
for (auto const& track : tracks) { // Loop on all tracks
412412
if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
413413
for (auto const& pidId : mEnabledParticles) {
414414
makeTableEmpty(pidId);

‎Common/TableProducer/PID/pidTOFMerge.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include "Common/Core/CollisionTypeHelper.h"
2323
#include "Common/Core/MetadataHelper.h"
24+
#include "Common/Core/PID/PIDTOF.h"
2425
#include "Common/Core/PID/PIDTOFParamService.h"
2526
#include "Common/Core/TableHelper.h"
2627
#include "Common/DataModel/EventSelection.h"
@@ -40,7 +41,6 @@
4041
#include <Framework/InitContext.h>
4142
#include <Framework/OutputObjHeader.h>
4243
#include <Framework/runDataProcessing.h>
43-
#include <PID/PIDTOF.h>
4444
#include <ReconstructionDataFormats/PID.h>
4545
#include <TOFBase/EventTimeMaker.h>
4646

@@ -345,7 +345,7 @@ struct tofEventTime {
345345
tableEvTime.reserve(tracks.size());
346346
tableFlags.reserve(tracks.size());
347347

348-
for (auto const& t : tracks) { // Loop on collisions
348+
for (auto const& t : tracks) { // Loop on collisions
349349
if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time
350350
tableFlags(0);
351351
tableEvTime(0.f, 999.f);
@@ -399,8 +399,8 @@ struct tofEventTime {
399399
LOG(debug) << "Running on " << CollisionSystemType::getCollisionSystemName(tofResponse->cfgCollisionType()) << " mComputeEvTimeWithTOF " << mComputeEvTimeWithTOF.value << " mComputeEvTimeWithFT0 " << mComputeEvTimeWithFT0.value;
400400

401401
if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 1) {
402-
int lastCollisionId = -1; // Last collision ID analysed
403-
for (auto const& t : tracks) { // Loop on collisions
402+
int lastCollisionId = -1; // Last collision ID analysed
403+
for (auto const& t : tracks) { // Loop on collisions
404404
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
405405
tableFlags(0);
406406
tableEvTime(0.f, 999.f);
@@ -475,8 +475,8 @@ struct tofEventTime {
475475
}
476476
}
477477
} else if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 0) {
478-
int lastCollisionId = -1; // Last collision ID analysed
479-
for (auto const& t : tracks) { // Loop on collisions
478+
int lastCollisionId = -1; // Last collision ID analysed
479+
for (auto const& t : tracks) { // Loop on collisions
480480
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
481481
tableFlags(0);
482482
tableEvTime(0.f, 999.f);
@@ -906,7 +906,7 @@ struct tofPidMerge {
906906

907907
float resolution = 1.f; // Last resolution assigned
908908
float nsigma = 0;
909-
for (auto const& trk : tracks) { // Loop on all tracks
909+
for (auto const& trk : tracks) { // Loop on all tracks
910910
if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
911911
for (auto const& pidId : mEnabledParticles) {
912912
makeTableEmpty(pidId, false);
@@ -1068,7 +1068,7 @@ struct tofPidMerge {
10681068

10691069
float resolution = 1.f; // Last resolution assigned
10701070
float nsigma = 0;
1071-
for (auto const& trk : tracks) { // Loop on all tracks
1071+
for (auto const& trk : tracks) { // Loop on all tracks
10721072
if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
10731073
for (auto const& pidId : mEnabledParticles) {
10741074
makeTableEmpty(pidId, false);

‎Common/TableProducer/PID/pidTOFbeta.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/// \brief Task to produce TOF beta and TOF mass tables
1616
///
1717

18+
#include "Common/Core/PID/PIDTOF.h"
1819
#include "Common/Core/TableHelper.h"
1920
#include "Common/DataModel/PIDResponseTOF.h"
2021

@@ -27,7 +28,6 @@
2728
#include <Framework/Configurable.h>
2829
#include <Framework/InitContext.h>
2930
#include <Framework/Variant.h>
30-
#include <PID/PIDTOF.h>
3131
#include <ReconstructionDataFormats/PID.h>
3232

3333
#include <chrono>

0 commit comments

Comments
 (0)