Skip to content

Commit 7032985

Browse files
committed
Align includes, fix ALICE3 TOF param
1 parent 1eb8a5f commit 7032985

7 files changed

Lines changed: 11 additions & 18 deletions

File tree

ALICE3/Core/TOFResoALICE3.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
#define O2_ANALYSIS_PID_TOFRESOALICE3_H_
2121

2222
// O2 includes
23-
#include "Common/Core/PID/ParamBase.h"
23+
#include "PID/ParamBase.h"
24+
#include "PID/DetectorResponse.h"
25+
#include "PID/PIDTOF.h"
2426
#include "ReconstructionDataFormats/PID.h"
2527

2628
namespace o2::pid::tof

ALICE3/TableProducer/alice3-pidTOF.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "ReconstructionDataFormats/Track.h"
2323
#include <CCDB/BasicCCDBManager.h>
2424
#include "Common/Core/PID/PIDResponse.h"
25-
#include "Common/Core/PID/PIDTOF.h"
2625
#include "ALICE3/Core/TOFResoALICE3.h"
2726
#include "Common/DataModel/TrackSelectionTables.h"
2827
#include "Framework/RunningWorkflowInfo.h"
@@ -125,8 +124,7 @@ struct ALICE3pidTOFTask {
125124
return -999.f;
126125
}
127126
return ((track.trackTime() - track.collision().collisionTime()) * 1000.f - tof::ExpTimes<Trks::iterator, id>::ComputeExpectedTime(track.tofExpMom() / o2::pid::tof::kCSPEED,
128-
track.length(),
129-
o2::track::PID::getMass2Z(id))) /
127+
track.length())) /
130128
sigma<id>(track);
131129
}
132130
void process(Trks const& tracks, Coll const&)

DPG/Tasks/qaPIDTOF.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
///
1717

1818
#include "Framework/AnalysisTask.h"
19+
#include "Common/TableProducer/PID/pidTOFBase.h"
1920
#include "qaPIDTOF.h"
2021
#include "Framework/runDataProcessing.h"
2122

DPG/Tasks/qaPIDTOF.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
// or submit itself to any jurisdiction.
1111

1212
///
13-
/// \file qaTOF.h
13+
/// \file qaPIDTOF.h
1414
/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
1515
/// \brief Header file for QA tasks of the TOF PID quantities
1616
///
1717

18-
#include "Common/Core/PID/PIDResponse.h"
1918
#include "Framework/HistogramRegistry.h"
2019
#include "Framework/StaticFor.h"
2120
#include "Common/DataModel/TrackSelectionTables.h"
2221
#include "Common/DataModel/EventSelection.h"
22+
#include "Common/Core/PID/PIDResponse.h"
2323

2424
using namespace o2;
2525
using namespace o2::framework;

DPG/Tasks/qaPIDTOFMC.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,11 @@
1717

1818
// O2 includes
1919
#include "Framework/AnalysisTask.h"
20-
#include "Framework/AnalysisDataModel.h"
21-
#include "Framework/ASoAHelpers.h"
2220
#include "Framework/HistogramRegistry.h"
23-
#include "ReconstructionDataFormats/Track.h"
24-
#include <CCDB/BasicCCDBManager.h>
2521
#include "Common/Core/PID/PIDResponse.h"
26-
#include "Common/Core/PID/PIDTOF.h"
2722

2823
using namespace o2;
2924
using namespace o2::framework;
30-
using namespace o2::pid;
3125
using namespace o2::framework::expressions;
3226
using namespace o2::track;
3327

@@ -43,6 +37,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4337

4438
#include "Framework/runDataProcessing.h"
4539

40+
/// Task to produce the TOF QA plots
4641
template <o2::track::PID::ID pid_type>
4742
struct pidTOFTaskQA {
4843

DPG/Tasks/qaPIDTPC.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
// or submit itself to any jurisdiction.
1111

1212
///
13-
/// \file qaTPC.h
13+
/// \file qaPIDTPC.h
1414
/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
1515
/// \brief Header file for QA tasks of the TPC PID quantities
1616
///
1717

18-
#include "Common/Core/PID/PIDResponse.h"
1918
#include "Framework/HistogramRegistry.h"
2019
#include "Framework/StaticFor.h"
2120
#include "Common/DataModel/TrackSelectionTables.h"
2221
#include "Common/DataModel/EventSelection.h"
22+
#include "Common/Core/PID/PIDResponse.h"
2323

2424
using namespace o2;
2525
using namespace o2::framework;

DPG/Tasks/qaPIDTPCMC.cxx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717

1818
// O2 includes
1919
#include "Framework/AnalysisTask.h"
20-
#include "Framework/AnalysisDataModel.h"
21-
#include "Framework/ASoAHelpers.h"
2220
#include "Framework/HistogramRegistry.h"
23-
#include "ReconstructionDataFormats/Track.h"
24-
#include <CCDB/BasicCCDBManager.h>
2521
#include "Common/Core/PID/PIDResponse.h"
2622

2723
using namespace o2;
@@ -41,6 +37,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4137

4238
#include "Framework/runDataProcessing.h"
4339

40+
/// Task to produce the TPC QA plots
4441
template <o2::track::PID::ID pid_type>
4542
struct pidTPCTaskQA {
4643

0 commit comments

Comments
 (0)