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
2 changes: 1 addition & 1 deletion PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#include "ReconstructionDataFormats/PID.h"

#include <cmath>
#include <iostream>

Check failure on line 34 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream]

Do not include iostream. Use O2 logging instead.

using namespace o2::framework;

Check failure on line 36 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Do not put using directives at global scope in headers.

namespace o2::analysis::femtoWorld
{
Expand Down Expand Up @@ -92,7 +92,7 @@
dcaXYMax(-9999999.),
dcaZMax(-9999999.),
dcaMin(9999999.),
nSigmaPIDMax(9999999.) {};
nSigmaPIDMax(9999999.){};

/// Initializes histograms for the task
/// \tparam part Type of the particle for proper naming of the folders for QA
Expand All @@ -109,7 +109,7 @@
void setPIDSpecies(T& pids)
{
std::vector<int> tmpPids = pids; /// necessary due to some features of the configurable
for (o2::track::PID pid : tmpPids) {

Check failure on line 112 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
mPIDspecies.push_back(pid);
}
}
Expand Down Expand Up @@ -293,7 +293,7 @@

/// check whether the number of selection exceeds the bitmap size
unsigned int nSelections = getNSelections() - getNSelections(femtoWorldTrackSelection::kPIDnSigmaMax);
if (nSelections > 8 * sizeof(cutContainerType)) {

Check failure on line 296 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOG(fatal) << "FemtoWorldTrackCuts: Number of selections too large for your container - quitting!";
}

Expand Down Expand Up @@ -391,7 +391,7 @@
const auto dca = track.dcaXY(); // Accordingly to FemtoWorld in AliPhysics as well as LF analysis,
// only dcaXY should be checked; NOT std::sqrt(pow(dcaXY, 2.) + pow(dcaZ, 2.))
std::vector<float> pidTPC, pidTOF;
for (auto it : mPIDspecies) {

Check failure on line 394 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
pidTPC.push_back(getNsigmaTPC(track, it));
pidTOF.push_back(getNsigmaTOF(track, it));
}
Expand Down Expand Up @@ -432,7 +432,7 @@
if (nDCAMinSel > 0 && std::abs(dca) < dcaMin) {
return false;
}
if (nRejectNotPropagatedTracks && std::abs(dca) > 1e3) {

Check failure on line 435 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
}

Expand Down Expand Up @@ -469,16 +469,16 @@
const auto itsNClsIB = track.itsNClsInnerBarrel();
const auto dcaXY = track.dcaXY();
const auto dcaZ = track.dcaZ();
const auto dca = std::sqrt(pow(dcaXY, 2.) + pow(dcaZ, 2.));

Check failure on line 472 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.

std::vector<float> pidTPC, pidTOF;
for (auto it : mPIDspecies) {

Check failure on line 475 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
pidTPC.push_back(getNsigmaTPC(track, it));
pidTOF.push_back(getNsigmaTOF(track, it));
}

float observable = 0.;
for (auto& sel : mSelections) {

Check failure on line 481 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
const auto selVariable = sel.getSelectionVariable();
if (selVariable == femtoWorldTrackSelection::kPIDnSigmaMax) {
/// PID needs to be handled a bit differently since we may need more than one species
Expand Down Expand Up @@ -556,7 +556,7 @@
mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[part]) + HIST("/") + HIST(o2::aod::femtoworldparticle::TrackTypeName[tracktype]) + HIST("/hITSclustersIB"), track.itsNClsInnerBarrel());
mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[part]) + HIST("/") + HIST(o2::aod::femtoworldparticle::TrackTypeName[tracktype]) + HIST("/hDCAxy"), track.pt(), track.dcaXY());
mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[part]) + HIST("/") + HIST(o2::aod::femtoworldparticle::TrackTypeName[tracktype]) + HIST("/hDCAz"), track.pt(), track.dcaZ());
mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[part]) + HIST("/") + HIST(o2::aod::femtoworldparticle::TrackTypeName[tracktype]) + HIST("/hDCA"), track.pt(), std::sqrt(pow(track.dcaXY(), 2.) + pow(track.dcaZ(), 2.)));

Check failure on line 559 in PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[part]) + HIST("/") + HIST(o2::aod::femtoworldparticle::TrackTypeName[tracktype]) + HIST("/hTPCdEdX"), track.p(), track.tpcSignal());
mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[part]) + HIST("/") + HIST(o2::aod::femtoworldparticle::TrackTypeName[tracktype]) + HIST("/nSigmaTPC_el"), track.p(), track.tpcNSigmaEl());
mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[part]) + HIST("/") + HIST(o2::aod::femtoworldparticle::TrackTypeName[tracktype]) + HIST("/nSigmaTPC_pi"), track.p(), track.tpcNSigmaPi());
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/TableProducer/Nuspex/hyperRecoTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
#include "DCAFitter/DCAFitterN.h"
#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
#include "MathUtils/BetheBlochAleph.h"
#include "DetectorsBase/GeometryManager.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "MathUtils/BetheBlochAleph.h"
#include "ReconstructionDataFormats/Track.h"

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/Tasks/Nuspex/nucleitpcpbpb.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
#include "MathUtils/BetheBlochAleph.h"
#include "DetectorsBase/GeometryManager.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "MathUtils/BetheBlochAleph.h"
#include "ReconstructionDataFormats/Track.h"

#include <Math/Vector4D.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/Utils/nucleiUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/TableProducer/PID/pidTOFBase.h"

#include "MathUtils/BetheBlochAleph.h"
#include "DetectorsBase/GeometryManager.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/HistogramSpec.h"
#include "MathUtils/BetheBlochAleph.h"

#include "TMCProcess.h"

Expand Down
2 changes: 1 addition & 1 deletion Tutorials/OpenData/flowAnalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct flow_base {
HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};

Filter collisionFilter = (aod::collision::flags & (uint16_t)aod::collision::CollisionFlagsRun2::Run2VertexerTracks) == (uint16_t)aod::collision::CollisionFlagsRun2::Run2VertexerTracks;
Filter trackFilter = ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true));
Filter trackFilter = ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true));

void fillAPt(double trackpt, double cent, double vn, double sinHarm, double cosHarm)
{
Expand Down
Loading