Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Common/TableProducer/PID/pidTOFBase.cxx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in Common/TableProducer/PID/pidTOFBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file]

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -75,8 +75,8 @@
bool enableTable = false; // Flag to check if the TOF signal table is requested or not
bool enableTableFlags = false; // Flag to check if the TOF signal flags table is requested or not
// CCDB configuration
Configurable<std::string> url{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};

Check failure on line 78 in Common/TableProducer/PID/pidTOFBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<int64_t> timestamp{"ccdb-timestamp", -1, "timestamp of the object"};

Check failure on line 79 in Common/TableProducer/PID/pidTOFBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> timeShiftCCDBPath{"timeShiftCCDBPath", "", "Path of the TOF time shift vs eta. If empty none is taken"};
Configurable<float> distanceForGoodMatch{"distanceForGoodMatch", 999.f, "Maximum distance to consider a good match"};
Configurable<float> distanceForGoodMatchLowMult{"distanceForGoodMatchLowMult", 999.f, "Maximum distance to consider a good match for low multiplicity events"};
Expand Down Expand Up @@ -201,8 +201,8 @@
Service<o2::ccdb::BasicCCDBManager> ccdb;
Configurable<bool> inheritFromBaseTask{"inheritFromBaseTask", true, "Flag to iherit all common configurables from the TOF base task"};
// CCDB configuration (inherited from TOF signal task)
Configurable<std::string> url{"ccdb-url", "", "url of the ccdb repository"};

Check failure on line 204 in Common/TableProducer/PID/pidTOFBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<int64_t> timestamp{"ccdb-timestamp", -1, "timestamp of the object"};

Check failure on line 205 in Common/TableProducer/PID/pidTOFBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
// Event time configurations
Configurable<float> minMomentum{"minMomentum", 0.5f, "Minimum momentum to select track sample for TOF event time"};
Configurable<float> maxMomentum{"maxMomentum", 2.0f, "Maximum momentum to select track sample for TOF event time"};
Expand Down Expand Up @@ -358,7 +358,7 @@
using ResponseImplementationEvTime = o2::pid::tof::ExpTimes<TrksEvTime::iterator, pid>;
using EvTimeCollisions = soa::Join<aod::Collisions, aod::EvSels>;
void processNoFT0(TrksEvTime const& tracks,
EvTimeCollisions const&)
EvTimeCollisions const& collisions)
{
if (!enableTable) {
return;
Expand All @@ -372,7 +372,7 @@

int lastCollisionId = -1; // Last collision ID analysed
for (auto const& t : tracks) { // Loop on collisions
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
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
tableFlags(0);
tableEvTime(0.f, 999.f);
if (enableTableTOFOnly) {
Expand Down Expand Up @@ -420,7 +420,7 @@
using EvTimeCollisionsFT0 = soa::Join<EvTimeCollisions, aod::FT0sCorrected>;
void processFT0(TrksEvTime const& tracks,
aod::FT0s const&,
EvTimeCollisionsFT0 const&)
EvTimeCollisionsFT0 const& collisions)
{
if (!enableTable) {
return;
Expand All @@ -434,7 +434,7 @@

int lastCollisionId = -1; // Last collision ID analysed
for (auto const& t : tracks) { // Loop on collisions
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
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
tableFlags(0);
tableEvTime(0.f, 999.f);
if (enableTableTOFOnly) {
Expand Down Expand Up @@ -515,7 +515,7 @@
/// Process function to prepare the event for each track on Run 3 data with only the FT0
void processOnlyFT0(TrksEvTime const& tracks,
aod::FT0s const&,
EvTimeCollisionsFT0 const&)
EvTimeCollisionsFT0 const& collisions)
{
if (!enableTable) {
return;
Expand All @@ -531,7 +531,7 @@
if (enableTableTOFOnly) {
tableEvTimeTOFOnly((uint8_t)0, 0.f, 0.f, -1);
}
if (!t.has_collision()) { // Track was not assigned, cannot compute event time
if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time
tableFlags(0);
tableEvTime(0.f, 999.f);
continue;
Expand Down
8 changes: 4 additions & 4 deletions Common/TableProducer/PID/pidTOFFull.cxx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in Common/TableProducer/PID/pidTOFFull.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file]

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -74,8 +74,8 @@
Service<o2::ccdb::BasicCCDBManager> ccdb;
Configurable<bool> inheritFromBaseTask{"inheritFromBaseTask", true, "Flag to iherit all common configurables from the TOF base task"};
// CCDB configuration (inherited from TOF base task)
Configurable<std::string> url{"ccdb-url", "", "url of the ccdb repository"};

Check failure on line 77 in Common/TableProducer/PID/pidTOFFull.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<int64_t> timestamp{"ccdb-timestamp", -1, "timestamp of the object"};

Check failure on line 78 in Common/TableProducer/PID/pidTOFFull.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
// TOF Calib configuration (inherited from TOF base task)
Configurable<std::string> paramFileName{"paramFileName", "", "Path to the parametrization object. If empty the parametrization is not taken from file"};
Configurable<std::string> parametrizationPath{"parametrizationPath", "", "Path of the TOF parametrization on the CCDB or in the file, if the paramFileName is not empty"};
Expand Down Expand Up @@ -286,7 +286,7 @@
Preslice<Trks> perCollision = aod::track::collisionId;
template <o2::track::PID::ID pid>
using ResponseImplementation = o2::pid::tof::ExpTimes<Trks::iterator, pid>;
void processWSlice(Trks const& tracks, aod::Collisions const&, aod::BCsWithTimestamps const&)
void processWSlice(Trks const& tracks, aod::Collisions const& collisions, aod::BCsWithTimestamps const&)
{
constexpr auto responseEl = ResponseImplementation<PID::Electron>();
constexpr auto responseMu = ResponseImplementation<PID::Muon>();
Expand All @@ -305,7 +305,7 @@
int lastCollisionId = -1; // Last collision ID analysed
float resolution = 1.f; // Last resolution assigned
for (auto const& track : tracks) { // Loop on all tracks
if (!track.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
for (auto const& pidId : mEnabledParticles) {
makeTableEmpty(pidId);
}
Expand Down Expand Up @@ -392,7 +392,7 @@
using TrksIU = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TOFSignal, aod::TOFEvTime, aod::pidEvTimeFlags>;
template <o2::track::PID::ID pid>
using ResponseImplementationIU = o2::pid::tof::ExpTimes<TrksIU::iterator, pid>;
void processWoSlice(TrksIU const& tracks, aod::Collisions const&, aod::BCsWithTimestamps const&)
void processWoSlice(TrksIU const& tracks, aod::Collisions const& collisions, aod::BCsWithTimestamps const&)
{
constexpr auto responseEl = ResponseImplementationIU<PID::Electron>();
constexpr auto responseMu = ResponseImplementationIU<PID::Muon>();
Expand All @@ -409,7 +409,7 @@
}
float resolution = 1.f; // Last resolution assigned
for (auto const& track : tracks) { // Loop on all tracks
if (!track.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
for (auto const& pidId : mEnabledParticles) {
makeTableEmpty(pidId);
}
Expand Down
20 changes: 10 additions & 10 deletions Common/TableProducer/PID/pidTOFMerge.cxx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in Common/TableProducer/PID/pidTOFMerge.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file]

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -96,7 +96,7 @@
Configurable<bool> enableQaHistograms{"enableQaHistograms", false, "Flag to enable the QA histograms"};
HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
struct : ConfigurableGroup {
Configurable<std::string> cfgUrl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};

Check failure on line 99 in Common/TableProducer/PID/pidTOFMerge.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable]

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> cfgPathGrpLhcIf{"ccdb-path-grplhcif", "GLO/Config/GRPLHCIF", "Path on the CCDB for the GRPLHCIF object"};
Configurable<int64_t> cfgTimestamp{"ccdb-timestamp", -1, "timestamp of the object"};
Configurable<std::string> cfgTimeShiftCCDBPathPos{"timeShiftCCDBPathPos", "", "Path of the TOF time shift vs eta for pos. tracks. If empty none is taken"};
Expand Down Expand Up @@ -334,7 +334,7 @@
///
/// Process function to prepare the event for each track on Run 2 data
void processRun2(aod::Tracks const& tracks,
aod::Collisions const&,
aod::Collisions const& collisions,
aod::BCsWithTimestamps const& bcs)
{
if (!enableTableTOFEvTime) {
Expand All @@ -346,7 +346,7 @@
tableFlags.reserve(tracks.size());

for (auto const& t : tracks) { // Loop on collisions
if (!t.has_collision()) { // Track was not assigned, cannot compute event time
if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time
tableFlags(0);
tableEvTime(0.f, 999.f);
continue;
Expand All @@ -365,7 +365,7 @@
using ResponseImplementationEvTime = o2::pid::tof::ExpTimes<Run3TrksWtof::iterator, pid>;
void processRun3(Run3TrksWtof const& tracks,
aod::FT0s const&,
EvTimeCollisionsFT0 const&,
EvTimeCollisionsFT0 const& collisions,
aod::BCsWithTimestamps const& bcs)
{
if (!enableTableTOFEvTime) {
Expand Down Expand Up @@ -401,7 +401,7 @@
if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 1) {
int lastCollisionId = -1; // Last collision ID analysed
for (auto const& t : tracks) { // Loop on collisions
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
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
tableFlags(0);
tableEvTime(0.f, 999.f);
if (enableTableEvTimeTOFOnly) {
Expand Down Expand Up @@ -477,7 +477,7 @@
} else if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 0) {
int lastCollisionId = -1; // Last collision ID analysed
for (auto const& t : tracks) { // Loop on collisions
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
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
tableFlags(0);
tableEvTime(0.f, 999.f);
if (enableTableEvTimeTOFOnly) {
Expand Down Expand Up @@ -522,7 +522,7 @@
if (enableTableEvTimeTOFOnly) {
tableEvTimeTOFOnly((uint8_t)0, 0.f, 0.f, -1);
}
if (!t.has_collision()) { // Track was not assigned, cannot compute event time
if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time
tableFlags(0);
tableEvTime(0.f, 999.f);
continue;
Expand Down Expand Up @@ -881,7 +881,7 @@
template <o2::track::PID::ID pid>
using ResponseImplementation = o2::pid::tof::ExpTimes<Run3TrksWtofWevTime::iterator, pid>;
void processRun3(Run3TrksWtofWevTime const& tracks,
aod::Collisions const&,
aod::Collisions const& collisions,
aod::BCsWithTimestamps const& bcs)
{
constexpr auto responseEl = ResponseImplementation<PID::Electron>();
Expand All @@ -907,7 +907,7 @@
float resolution = 1.f; // Last resolution assigned
float nsigma = 0;
for (auto const& trk : tracks) { // Loop on all tracks
if (!trk.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
for (auto const& pidId : mEnabledParticles) {
makeTableEmpty(pidId, false);
}
Expand Down Expand Up @@ -1043,7 +1043,7 @@
template <o2::track::PID::ID pid>
using ResponseImplementationRun2 = o2::pid::tof::ExpTimes<Run2TrksWtofWevTime::iterator, pid>;
void processRun2(Run2TrksWtofWevTime const& tracks,
aod::Collisions const&,
aod::Collisions const& collisions,
aod::BCsWithTimestamps const& bcs)
{
constexpr auto responseEl = ResponseImplementationRun2<PID::Electron>();
Expand All @@ -1069,7 +1069,7 @@
float resolution = 1.f; // Last resolution assigned
float nsigma = 0;
for (auto const& trk : tracks) { // Loop on all tracks
if (!trk.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
for (auto const& pidId : mEnabledParticles) {
makeTableEmpty(pidId, false);
}
Expand Down
Loading