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
8 changes: 4 additions & 4 deletions PWGHF/D2H/Tasks/taskCd.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,14 @@
/// \author Biao Zhang <biao.zhang@cern.ch>, Heidelberg Universiity

#include "PWGHF/Core/CentralityEstimation.h"
#include "PWGHF/Core/DecayChannels.h"
#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsEvSelHf.h"

#include "Common/Core/RecoDecay.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"

#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisTask.h>
Expand All @@ -33,10 +30,13 @@
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>

#include <THnSparse.h>

#include <Rtypes.h>

#include <array>
#include <cmath>
#include <numeric>
Expand Down
1 change: 1 addition & 0 deletions PWGHF/D2H/Tasks/taskD0.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"

#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
Expand Down
5 changes: 5 additions & 0 deletions PWGHF/D2H/Tasks/taskLc.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsEvSelHf.h"
#include "PWGUD/Core/UPCHelpers.h"

#include "Common/Core/RecoDecay.h"
#include "Common/DataModel/Centrality.h"
Expand All @@ -36,21 +37,25 @@
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>

#include <TH1.h>
#include <THnSparse.h>
#include <TPDGCode.h>

#include <array>
#include <cmath>
#include <numeric>
#include <string>
#include <string_view>
#include <vector> // std::vector

using namespace o2;
Expand Down
2 changes: 2 additions & 0 deletions PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"

#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisTask.h>
Expand All @@ -40,6 +41,7 @@

#include <array>
#include <cstdint>
#include <cstdlib>
#include <numeric>
#include <vector>

Expand Down
1 change: 1 addition & 0 deletions PWGHF/HFC/Macros/DhCorrelationExtraction.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 PWGHF/HFC/Macros/DhCorrelationExtraction.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 @@ -34,7 +34,8 @@

#include <cstdio>
#include <cstdlib>
#include <iostream>

Check failure on line 37 in PWGHF/HFC/Macros/DhCorrelationExtraction.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream]

Do not include iostream. Use O2 logging instead.
#include <stdexcept>

DhCorrelationExtraction::DhCorrelationExtraction() : // default constructor
fFileMass(nullptr),
Expand Down Expand Up @@ -183,7 +184,7 @@
Bool_t DhCorrelationExtraction::setDmesonSpecie(DmesonSpecie k)
{

if (k < 0 || k > 3) {

Check failure on line 187 in PWGHF/HFC/Macros/DhCorrelationExtraction.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.
printf("[ERROR] D meson specie not correctly set!\n");
return kFALSE;
}
Expand All @@ -191,7 +192,7 @@
fDmesonLabel = "Dzero";
} else if (k == 1) {
fDmesonLabel = "Dplus";
} else if (k == 2) {

Check failure on line 195 in PWGHF/HFC/Macros/DhCorrelationExtraction.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.
fDmesonLabel = "Ds";
} else {
fDmesonLabel = "Dstar";
Expand Down Expand Up @@ -994,7 +995,7 @@
Double_t modul[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

for (int iBin = 0; iBin < hRatioNonPrompt->GetNbinsX(); iBin++) {
if (iBin > 1 && iBin < 13) {

Check failure on line 998 in PWGHF/HFC/Macros/DhCorrelationExtraction.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.
recoKineVal[iBin - 2] = hRatioNonPrompt->GetBinContent(iBin + 1) - (fitVal - 1);
relAmplC[iBin - 2] = hRecPrompt->GetBinContent(iBin + 1) / (hRecPrompt->GetBinContent(iBin + 1) * fPrompt + hRecNonPrompt->GetBinContent(iBin + 1) * (1 - fPrompt));
relAmplB[iBin - 2] = hRecNonPrompt->GetBinContent(iBin + 1) / (hRecPrompt->GetBinContent(iBin + 1) * fPrompt + hRecNonPrompt->GetBinContent(iBin + 1) * (1 - fPrompt));
Expand Down Expand Up @@ -1389,7 +1390,7 @@

if (totalRange) {
// baseline evaluated considering: the two first points, the last two points and four points in the middle (corresponding to the outer points)
if (nBinsPhi >= 32) {

Check failure on line 1393 in PWGHF/HFC/Macros/DhCorrelationExtraction.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.
baseline =
((histo->GetBinContent(1)) * (1. / TMath::Power(histo->GetBinError(1), 2)) +
(histo->GetBinContent(2)) * (1. / TMath::Power(histo->GetBinError(2), 2)) +
Expand Down Expand Up @@ -1431,7 +1432,7 @@
(1. / TMath::Power(histo->GetBinError(binPhiHalfPlus2), 2)));
} else {
// baseline evaluated using the 4 middle points in the transverese region
if (nBinsPhi >= 32) {

Check failure on line 1435 in PWGHF/HFC/Macros/DhCorrelationExtraction.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.
baseline =
((histo->GetBinContent(binPhiHalfMinus1)) * (1. / TMath::Power(histo->GetBinError(binPhiHalfMinus1), 2)) +
(histo->GetBinContent(binPhiHalf)) * (1. / TMath::Power(histo->GetBinError(binPhiHalf), 2)) +
Expand Down Expand Up @@ -1469,7 +1470,7 @@

if (totalRange) {
// baseline evaluated considering: the two first points, the last two points and four points in the middle (corresponding to the outer points)
if (nBinsPhi >= 32) {

Check failure on line 1473 in PWGHF/HFC/Macros/DhCorrelationExtraction.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.
errBaseline = 1. /
TMath::Sqrt((1. / TMath::Power(histo->GetBinError(1), 2)) +
(1. / TMath::Power(histo->GetBinError(2), 2)) +
Expand All @@ -1495,7 +1496,7 @@
(1. / TMath::Power(histo->GetBinError(binPhiHalfPlus1), 2)) +
(1. / TMath::Power(histo->GetBinError(binPhiHalfPlus2), 2)));
} else {
if (nBinsPhi >= 32) {

Check failure on line 1499 in PWGHF/HFC/Macros/DhCorrelationExtraction.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.
errBaseline = 1. /
TMath::Sqrt((1. / TMath::Power(histo->GetBinError(binPhiHalfMinus1), 2)) +
(1. / TMath::Power(histo->GetBinError(binPhiHalf), 2)) +
Expand Down
1 change: 0 additions & 1 deletion PWGHF/HFC/Macros/DhCorrelationFitter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <TMinuit.h>
#include <TPaveText.h>
#include <TString.h>
#include <TText.h>
#include <TVirtualFitter.h>
#include <TVirtualPad.h>

Expand All @@ -35,7 +34,7 @@
#include <RtypesCore.h>

#include <cstdio>
#include <iostream>

Check failure on line 37 in PWGHF/HFC/Macros/DhCorrelationFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream]

Do not include iostream. Use O2 logging instead.

DhCorrelationFitter::DhCorrelationFitter() : // default constructor
fHist(nullptr),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <Framework/ASoA.h>
#include <Framework/ASoAHelpers.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/BinningPolicy.h>
#include <Framework/Configurable.h>
Expand Down
4 changes: 1 addition & 3 deletions PWGHF/HFC/Tasks/taskFlow.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <CCDB/BasicCCDBManager.h>
#include <CCDB/CcdbApi.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
#include <DataFormatsParameters/GRPMagField.h>
#include <DetectorsCommonDataFormats/AlignParam.h>
#include <FT0Base/Geometry.h>
Expand All @@ -41,6 +40,7 @@
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Array2D.h>
#include <Framework/BinningPolicy.h>
#include <Framework/Configurable.h>
#include <Framework/DataTypes.h>
Expand All @@ -50,13 +50,11 @@
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/StepTHn.h>
#include <Framework/runDataProcessing.h>
#include <MathUtils/Utils.h>

#include <THn.h>
#include <TPDGCode.h>
#include <TParticlePDG.h>
#include <TString.h>

#include <sys/types.h>
Expand Down
6 changes: 0 additions & 6 deletions PWGHF/TableProducer/candidateSelectorCd.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
#include "PWGHF/DataModel/CandidateSelectionTables.h"

#include "Common/Core/TrackSelectorPID.h"
#include "Common/DataModel/PIDResponseCombined.h"

#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
Expand All @@ -31,14 +29,10 @@
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/runDataProcessing.h>

#include <TH2.h>

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

Expand Down
2 changes: 2 additions & 0 deletions PWGHF/TableProducer/candidateSelectorToXiPi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@
#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelectorPID.h"

#include <CCDB/CcdbApi.h>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Array2D.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
Expand Down
Loading