Skip to content

Please consider the following formatting changes to #12472 #2

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

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #12472 #2

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
2 changes: 1 addition & 1 deletion PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
#include "TLorentzVector.h"

Check failure on line 29 in PWGCF/Femto3D/Tasks/femto3dPairTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector] 

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
Expand Down Expand Up @@ -55,7 +55,7 @@
Configurable<bool> _requestVertexITSTPC{"requestVertexITSTPC", false, ""};
Configurable<int> _requestVertexTOForTRDmatched{"requestVertexTOFmatched", 0, "0 -> no selectio; 1 -> vertex is matched to TOF or TRD; 2 -> matched to both;"};
Configurable<bool> _requestNoCollInTimeRangeStandard{"requestNoCollInTimeRangeStandard", false, ""};
Configurable<bool>_requestIsGoodITSLayersAll{"requestIsGoodITSLayersAll", false, "cut time intervals with dead ITS staves"};
Configurable<bool> _requestIsGoodITSLayersAll{"requestIsGoodITSLayersAll", false, "cut time intervals with dead ITS staves"};
Configurable<std::pair<float, float>> _IRcut{"IRcut", std::pair<float, float>{0.f, 100.f}, "[min., max.] IR range to keep events within"};
Configurable<std::pair<int, int>> _OccupancyCut{"OccupancyCut", std::pair<int, int>{0, 10000}, "[min., max.] occupancy range to keep events within"};

Expand Down Expand Up @@ -177,9 +177,9 @@
void init(o2::framework::InitContext&)
{

if (_centBins.value.size() < 2)

Check failure on line 180 in PWGCF/Femto3D/Tasks/femto3dPairTask.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.
LOGF(fatal, "The configured number of multiplicity/centrality bins in the array is less than 2 !!!");
if (_kTbins.value.size() < 2)

Check failure on line 182 in PWGCF/Femto3D/Tasks/femto3dPairTask.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.
LOGF(fatal, "The configured number of kT bins in the array is less than 2 !!!");
if (_vertexNbinsToMix.value < 1)
LOGF(fatal, "The configured number of VertexZ bins is less than 1 !!!");
Expand Down Expand Up @@ -234,7 +234,7 @@
if (_fill3dAddHistos == 1) {
auto hAdd3dHistos = registry.add<TH3>(Form("Cent%i/qLCMSvskStar_cent%i_kT%i", i, i, j), Form("qLCMSvskStar_cent%i_kT%i", i, j), kTH3F, {{CF3DqLCMSBinning, "q_out (GeV/c)"}, {CF3DqLCMSBinning, "q_side (GeV/c)"}, {CF3DqLCMSBinning, "q_long (GeV/c)"}});
Add3dHistosperMult.push_back(std::move(hAdd3dHistos));
} else if (_fill3dAddHistos == 2) {

Check failure on line 237 in PWGCF/Femto3D/Tasks/femto3dPairTask.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 hAdd3dHistos = registry.add<TH3>(Form("Cent%i/qLCMSvsGout_cent%i_kT%i", i, i, j), Form("qLCMSvsGout_cent%i_kT%i", i, j), kTH3F, {{CF3DqLCMSBinning, "q_out (GeV/c)"}, {CF3DqLCMSBinning, "q_side (GeV/c)"}, {CF3DqLCMSBinning, "q_long (GeV/c)"}});
Add3dHistosperMult.push_back(std::move(hAdd3dHistos));
}
Expand All @@ -248,7 +248,7 @@
if (_fillDetaDphi > -1) {
TString suffix[] = {"_nocut", "_cut"};

for (int f = 0; f < 2; f++) {

Check failure on line 251 in PWGCF/Femto3D/Tasks/femto3dPairTask.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.
std::vector<std::shared_ptr<TH2>> DoubleTrack_SE_histos_perMult;
std::vector<std::shared_ptr<TH2>> DoubleTrack_ME_histos_perMult;

Expand Down Expand Up @@ -311,7 +311,7 @@
if (_fill3dCF && kTbin > SEhistos_3D[multBin].size())
LOGF(fatal, "kTbin value obtained for a pair exceeds the configured number of kT bins (3D)");

if (_fillDetaDphi % 2 == 0)

Check failure on line 314 in PWGCF/Femto3D/Tasks/femto3dPairTask.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.
DoubleTrack_SE_histos_BC[multBin][kTbin]->Fill(_dPhiMode.value == 0 ? Pair->GetPhiStarDiff(_radiusTPC) : Pair->GetAvgPhiStarDiff(), Pair->GetEtaDiff());

if (_deta > 0 && _dphi > 0 && (_dPhiMode.value == 0 ? Pair->IsClosePair(_deta, _dphi, _radiusTPC) : Pair->IsClosePair(_deta, _dphi)))
Expand Down Expand Up @@ -344,8 +344,8 @@
if (_fill3dCF && multBin > SEhistos_3D.size())
LOGF(fatal, "multBin value passed to the mixTracks function exceeds the configured number of Cent. bins (3D)");

for (auto ii : tracks1) {

Check failure on line 347 in PWGCF/Femto3D/Tasks/femto3dPairTask.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.
for (auto iii : tracks2) {

Check failure on line 348 in PWGCF/Femto3D/Tasks/femto3dPairTask.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.

Pair->SetPair(ii, iii);
float pair_kT = Pair->GetKt();
Expand All @@ -359,7 +359,7 @@
if (_fill3dCF && kTbin > SEhistos_3D[multBin].size())
LOGF(fatal, "kTbin value obtained for a pair exceeds the configured number of kT bins (3D)");

if (_fillDetaDphi % 2 == 0) {

Check failure on line 362 in PWGCF/Femto3D/Tasks/femto3dPairTask.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 (!SE_or_ME)
DoubleTrack_SE_histos_BC[multBin][kTbin]->Fill(_dPhiMode.value == 0 ? Pair->GetPhiStarDiff(_radiusTPC) : Pair->GetAvgPhiStarDiff(), Pair->GetEtaDiff());
else
Expand Down Expand Up @@ -397,7 +397,7 @@
MEhistos_3D[multBin][kTbin]->Fill(qLCMS.X(), qLCMS.Y(), qLCMS.Z());
if (_fill3dAddHistos == 1)
Add3dHistos[multBin][kTbin]->Fill(qLCMS.X(), qLCMS.Y(), qLCMS.Z(), Pair->GetKstar());
else if (_fill3dAddHistos == 2)

Check failure on line 400 in PWGCF/Femto3D/Tasks/femto3dPairTask.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.
Add3dHistos[multBin][kTbin]->Fill(qLCMS.X(), qLCMS.Y(), qLCMS.Z(), Pair->GetGammaOut());
}
}
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct FemtoCorrelationsMC {
Configurable<bool> _requestVertexITSTPC{"requestVertexITSTPC", false, ""};
Configurable<int> _requestVertexTOForTRDmatched{"requestVertexTOFmatched", 0, "0 -> no selectio; 1 -> vertex is matched to TOF or TRD; 2 -> matched to both;"};
Configurable<bool> _requestNoCollInTimeRangeStandard{"requestNoCollInTimeRangeStandard", false, ""};
Configurable<bool>_requestIsGoodITSLayersAll{"requestIsGoodITSLayersAll", false, "cut time intervals with dead ITS staves"};
Configurable<bool> _requestIsGoodITSLayersAll{"requestIsGoodITSLayersAll", false, "cut time intervals with dead ITS staves"};
Configurable<std::pair<float, float>> _IRcut{"IRcut", std::pair<float, float>{0.f, 100.f}, "[min., max.] IR range to keep events within"};
Configurable<std::pair<int, int>> _OccupancyCut{"OccupancyCut", std::pair<int, int>{0, 10000}, "[min., max.] occupancy range to keep events within"};

Expand Down Expand Up @@ -417,7 +417,7 @@ struct FemtoCorrelationsMC {
continue;
if (_requestIsGoodITSLayersAll && !collision.isGoodITSLayersAll())
continue;

if (selectedtracks_1.find(collision.globalIndex()) == selectedtracks_1.end()) {
if (IsIdentical)
continue;
Expand Down
11 changes: 7 additions & 4 deletions PWGCF/Femto3D/Tasks/femto3dQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct QAHistograms {
Configurable<bool> _requestVertexITSTPC{"requestVertexITSTPC", false, ""};
Configurable<int> _requestVertexTOForTRDmatched{"requestVertexTOFmatched", 0, "0 -> no selectio; 1 -> vertex is matched to TOF or TRD; 2 -> matched to both;"};
Configurable<bool> _requestNoCollInTimeRangeStandard{"requestNoCollInTimeRangeStandard", false, ""};
Configurable<bool>_requestIsGoodITSLayersAll{"requestIsGoodITSLayersAll", false, "cut time intervals with dead ITS staves"};
Configurable<bool> _requestIsGoodITSLayersAll{"requestIsGoodITSLayersAll", false, "cut time intervals with dead ITS staves"};
Configurable<std::pair<float, float>> _IRcut{"IRcut", std::pair<float, float>{0.f, 100.f}, "[min., max.] IR range to keep events within"};
Configurable<std::pair<int, int>> _OccupancyCut{"OccupancyCut", std::pair<int, int>{0, 10000}, "[min., max.] occupancy range to keep events within"};

Expand Down Expand Up @@ -250,9 +250,12 @@ struct QAHistograms {
registry.fill(HIST("ITSchi2"), track.itsChi2NCl());
registry.fill(HIST("TPCchi2"), track.tpcChi2NCl());

if (ITShisto) ITShisto->Fill(track.p(), o2::aod::singletrackselector::getITSNsigma(track, _particlePDG));
if (TPChisto) TPChisto->Fill(track.p(), o2::aod::singletrackselector::getTPCNsigma(track, _particlePDG));
if (TOFhisto) TOFhisto->Fill(track.p(), o2::aod::singletrackselector::getTOFNsigma(track, _particlePDG));
if (ITShisto)
ITShisto->Fill(track.p(), o2::aod::singletrackselector::getITSNsigma(track, _particlePDG));
if (TPChisto)
TPChisto->Fill(track.p(), o2::aod::singletrackselector::getTPCNsigma(track, _particlePDG));
if (TOFhisto)
TOFhisto->Fill(track.p(), o2::aod::singletrackselector::getTOFNsigma(track, _particlePDG));

if constexpr (FillExtra) {
registry.fill(HIST("TPCSignal"), track.tpcInnerParam(), track.tpcSignal());
Expand Down
Loading