Skip to content

[PWGJE] Fix includes #17792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vkucera wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[PWGJE] Fix includes #17792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions PWGJE/TableProducer/berkeleyTreeProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@
#include "PWGJE/DataModel/Jet.h"
#include "PWGJE/DataModel/JetReducedData.h"

#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/runDataProcessing.h>

#include <cmath>
#include <cstdint>
#include <string>
#include <vector>

Expand Down
2 changes: 2 additions & 0 deletions PWGJE/TableProducer/derivedDataWriter.cxx
View file
Open in desktop
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 PWGJE/TableProducer/derivedDataWriter.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.)

Check failure on line 1 in PWGJE/TableProducer/derivedDataWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Specify task name only when it cannot be derived from the struct name. Only append to the default name.
// 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 @@ -37,6 +37,8 @@
#include <Framework/runDataProcessing.h>
#include <MathUtils/detail/TypeTruncation.h>

#include <Rtypes.h>

#include <algorithm>
#include <cstdint>
#include <iterator>
Expand Down Expand Up @@ -711,24 +713,24 @@

const auto particlesPerMcCollision = particles.sliceBy(preslices.ParticlesPerMcCollision, mcCollision.globalIndex());

for (auto particle : particlesPerMcCollision) {

Check failure on line 716 in PWGJE/TableProducer/derivedDataWriter.cxx

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.
particleMapping[particle.globalIndex()] = particleTableIndex;
particleTableIndex++;
}
for (auto particle : particlesPerMcCollision) {

Check failure on line 720 in PWGJE/TableProducer/derivedDataWriter.cxx

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.

std::vector<int32_t> mothersIds;
int daughtersIds[2] = {-1, -1};
if (config.savePartonLevelInfo) {
if (particle.has_mothers()) {
auto mothersIdTemps = particle.mothersIds();
for (auto mothersIdTemp : mothersIdTemps) {

Check failure on line 727 in PWGJE/TableProducer/derivedDataWriter.cxx

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.
mothersIds.push_back(particleMapping[mothersIdTemp]);
}
}
if (particle.has_daughters()) {
auto i = 0;
for (auto daughterId : particle.daughtersIds()) {

Check failure on line 733 in PWGJE/TableProducer/derivedDataWriter.cxx

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.
if (i > 1) {
break;
}
Expand Down Expand Up @@ -1127,7 +1129,7 @@
{
std::vector<DataProcessorSpec> tasks;

tasks.emplace_back(adaptAnalysisTask<JetDerivedDataWriter>(cfgc, TaskName{"jet-deriveddata-writer"}));

Check failure on line 1132 in PWGJE/TableProducer/derivedDataWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Device names jet-deriveddata-writer and jet-derived-data-writer generated from the specified task name jet-deriveddata-writer and from the struct name JetDerivedDataWriter, respectively, differ in hyphenation. Consider fixing capitalisation of the struct name to JetDeriveddataWriter and removing TaskName.

return WorkflowSpec{tasks};
}
1 change: 0 additions & 1 deletion PWGJE/Tasks/bjetTaggingGnn.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include <TAxis.h>
#include <TH1.h>
#include <TH2.h>
#include <TH3.h>

#include <array>
#include <cmath>
Expand Down
6 changes: 4 additions & 2 deletions PWGJE/Tasks/bjetTreeCreator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
#include <unordered_map>
#include <vector>

#include <math.h>

using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;
Expand Down Expand Up @@ -112,8 +114,8 @@
DECLARE_SOA_COLUMN(TrackTPCNCrossedRows, tracktpcncrossedrows, float); //! The track TPC NCrossedRows
// DECLARE_SOA_COLUMN(TrackTPCNSigmaPi, tracktpcnsigmapi, float); //! The track TPC nSigma Pi
// DECLARE_SOA_COLUMN(TrackTOFNSigmaPi, tracktofnsigmapi, float); //! The track TOF nSigma Pi
DECLARE_SOA_COLUMN(TrackOrigin, trk_origin, int); //! The track origin label for GNN track origin predictions
DECLARE_SOA_COLUMN(TrackVtxIndex, trk_vtx_index, int); //! The track vertex index for GNN vertex predictions
DECLARE_SOA_COLUMN(TrackOrigin, trk_origin, int); //! The track origin label for GNN track origin predictions
DECLARE_SOA_COLUMN(TrackVtxIndex, trk_vtx_index, int); //! The track vertex index for GNN vertex predictions
// DECLARE_SOA_COLUMN(DCATrackJet, dcatrackjet, float); //! The distance between track and jet, unfortunately it cannot be calculated in O2
} // namespace trackInfo

Expand Down Expand Up @@ -479,14 +481,14 @@
bool isAcceptedJet(AnalysisJet const& jet)
{

if (jetAreaFractionMin > -98.0) {

Check failure on line 484 in PWGJE/Tasks/bjetTreeCreator.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.
if (jet.area() < jetAreaFractionMin * M_PI * (jet.r() / 100.0) * (jet.r() / 100.0)) {
return false;
}
}
bool checkConstituentPt = true;
bool checkConstituentMinPt = (leadingConstituentPtMin > -98.0);

Check failure on line 490 in PWGJE/Tasks/bjetTreeCreator.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.
bool checkConstituentMaxPt = (leadingConstituentPtMax < 9998.0);

Check failure on line 491 in PWGJE/Tasks/bjetTreeCreator.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.
if (!checkConstituentMinPt && !checkConstituentMaxPt) {
checkConstituentPt = false;
}
Expand Down
1 change: 1 addition & 0 deletions PWGJE/Tasks/jetBackgroundAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include <CommonConstants/MathConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
Expand Down
2 changes: 2 additions & 0 deletions PWGJE/Tasks/jetDsSpecSubs.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
#include "PWGJE/Core/JetDerivedDataUtilities.h"
#include "PWGJE/Core/JetUtilities.h"
#include "PWGJE/DataModel/Jet.h"
#include "PWGJE/DataModel/JetReducedData.h"

#include "Common/Core/RecoDecay.h"

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/ConfigContext.h>
#include <Framework/Configurable.h>
Expand Down
3 changes: 2 additions & 1 deletion PWGJE/Tasks/jetHFAngularity.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#include "PWGJE/Core/JetUtilities.h"
#include "PWGJE/DataModel/Jet.h"
#include "PWGJE/DataModel/JetReducedData.h"
#include "PWGJE/DataModel/JetSubstructure.h"

#include "Common/Core/RecoDecay.h"

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/ConfigContext.h>
#include <Framework/Configurable.h>
Expand All @@ -36,6 +36,7 @@

#include <array>
#include <cmath>
#include <cstdint>
#include <string>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Tasks/jetOutlierQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ struct JetOutlierQATask {
{
//
// collision-based outlier checks based on BC and z position
// based on 2-event correlation checks in PWGDQ/Tasks/tableReader_withAssoc.cxx
// based on 2-event correlation checks in PWGDQ/Tasks/tableReader_withAssoc.h
//

fBCCollMap.clear();
Expand Down
1 change: 1 addition & 0 deletions PWGJE/Tasks/trackEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <Framework/runDataProcessing.h>

#include <TH1.h>
#include <TMCProcess.h>

#include <algorithm>
#include <cmath>
Expand Down
Loading