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
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 PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.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 All @@ -16,13 +16,12 @@
/// \author Romain Schotter <romain.schotter@cern.ch>, Austrian Academy of Sciences & MBI
//

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
Expand Down
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 PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter2.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 All @@ -16,8 +16,6 @@
/// \author Romain Schotter <romain.schotter@cern.ch>, Austrian Academy of Sciences & MBI
//

#include <vector>

#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

Expand Down
4 changes: 2 additions & 2 deletions PWGLF/TableProducer/Strangeness/strangederivedbuilder.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 PWGLF/TableProducer/Strangeness/strangederivedbuilder.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 All @@ -10,14 +10,14 @@
// or submit itself to any jurisdiction.
//
/// \file strangederivedbuilder.cxx
/// \brief this task provides general links between collisions and strange objects reconstructed in various ways.
/// \brief this task provides general links between collisions and strange objects reconstructed in various ways.
/// It is meant to help with providing auxiliary information when dealing with derived data.
///
/// \author David Dobrigkeit Chinellato <david.dobrigkeit.chinellato@cern.ch>, Austrian Academy of Sciences & MBI
/// \author Romain Schotter <romain.schotter@cern.ch>, Austrian Academy of Sciences & MBI
//
//__________________________________________________
//
//

#include "PWGLF/DataModel/EPCalibrationTables.h"
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
Expand Down Expand Up @@ -208,7 +208,7 @@

Configurable<bool> qaCentrality{"qaCentrality", false, "qa centrality flag: check base raw values"};
struct : ConfigurableGroup {
ConfigurableAxis axisFT0A{"FT0Aamplitude", {100, 0.0f, 2000.0f}, "FT0Aamplitude"};

Check failure on line 211 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.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.)
ConfigurableAxis axisFT0C{"FT0Camplitude", {100, 0.0f, 2000.0f}, "FT0Camplitude"};
ConfigurableAxis axisFV0A{"FV0Aamplitude", {100, 0.0f, 2000.0f}, "FV0Aamplitude"};
ConfigurableAxis axisFDDA{"FDDAamplitude", {100, 0.0f, 2000.0f}, "FDDAamplitude"};
Expand Down Expand Up @@ -417,7 +417,7 @@
auto hZNATimeVsZNAUD = histos.add<TH2>("hZNATimeVsZNAUD", "hZNAMultVsZNAUD; ZNA time; ZNA UD", kTH2F, {axisDetectors.axisZNAtime, axisDetectors.axisZNAtime});
auto hZNCTimeVsZNCUD = histos.add<TH2>("hZNCTimeVsZNCUD", "hZNCMultVsZNCUD; ZNC time; ZNC UD", kTH2F, {axisDetectors.axisZNCtime, axisDetectors.axisZNCtime});

for (int ii = 1; ii < 101; ii++) {

Check failure on line 420 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

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.
float value = 100.5f - static_cast<float>(ii);
hRawCentrality->SetBinContent(ii, value);
}
Expand Down Expand Up @@ -703,7 +703,7 @@
if (p != nullptr) {
charge = p->Charge();
}
if (std::abs(charge) < 1e-3) {

Check failure on line 706 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

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.
continue; // reject neutral particles in counters
}
totalMult++;
Expand Down Expand Up @@ -1039,7 +1039,7 @@
void processPureSimulation(aod::McParticles const& mcParticles)
{
for (auto const& mcp : mcParticles) {
if (std::abs(mcp.y()) < 0.5) {

Check failure on line 1042 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

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.
static_for<0, nSpecies - 1>([&](auto i) {
constexpr int index = i.value;
if (mcp.pdgCode() == particlePDGCodes[index] && bitcheck(enabledBits, index)) {
Expand Down Expand Up @@ -1069,7 +1069,7 @@
histos.fill(HIST("h2dNVerticesVsCentrality"), bestCentrality, collisions.size());

for (auto const& mcp : mcParticles) {
if (std::abs(mcp.y()) < 0.5 && mcp.isPhysicalPrimary()) {

Check failure on line 1072 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

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.
static_for<0, nSpecies - 1>([&](auto i) {
constexpr int index = i.value;
if (mcp.pdgCode() == particlePDGCodes[index] && bitcheck(enabledBits, index)) {
Expand Down Expand Up @@ -1100,7 +1100,7 @@

auto mcParticles = mcParticlesEntireTable.sliceBy(mcParticlePerMcCollision, mcCollIndex);
for (auto const& mcp : mcParticles) {
if (std::abs(mcp.y()) < 0.5 && mcp.isPhysicalPrimary()) {

Check failure on line 1103 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

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.
auto binNumber = hBinFinder->FindBin(mcCollision.bestCollisionCentFT0C(), mcp.pt()); // caution: pack
if (mcp.pdgCode() == PDG_t::kK0Short)
genK0Short[binNumber]++;
Expand Down Expand Up @@ -1185,7 +1185,7 @@

for (const auto& mcPart : mcParticles) {
if (std::abs(mcPart.pdgCode()) == kNeutron) { // check if it is a neutron or anti-neutron
if (std::abs(mcPart.eta()) > 8.7) { // check if it is within ZDC acceptance

Check failure on line 1188 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

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.
products.zdcNeutrons(mcPart.pdgCode(), mcPart.statusCode(), mcPart.flags(),
mcPart.vx(), mcPart.vy(), mcPart.vz(), mcPart.vt(),
mcPart.px(), mcPart.py(), mcPart.pz(), mcPart.e());
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
#include <cstdlib>
#include <iterator>
#include <map>
#include <unordered_map>
#include <string>
#include <unordered_map>
#include <vector>

using namespace o2;
Expand Down
Loading