Skip to content

Commit da4c102

Browse files
huinaibinghuinaibing
committed
fix issues
1 parent d27f63e commit da4c102

1 file changed

Lines changed: 30 additions & 27 deletions

File tree

‎PWGCF/Flow/Tasks/pidFlowPtCorr.cxx‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include <Framework/AnalysisHelpers.h>
4747
#include <Framework/AnalysisTask.h>
4848
#include <Framework/Configurable.h>
49+
#include <Framework/DataTypes.h>
4950
#include <Framework/Expressions.h>
5051
#include <Framework/HistogramRegistry.h>
5152
#include <Framework/HistogramSpec.h>
@@ -68,6 +69,8 @@
6869
#include <TRandom3.h>
6970
#include <TString.h>
7071

72+
#include <Rtypes.h>
73+
7174
#include <algorithm>
7275
#include <array>
7376
#include <chrono>
@@ -267,11 +270,11 @@ struct TimeAssociatedChargedTrack : Track {
267270
{
268271
}
269272
float targetPt, targetEta, targetPhi, targetDCAxy, targetDCAz;
270-
float pt() const { return targetPt; }
271-
float eta() const { return targetEta; }
272-
float phi() const { return targetPhi; }
273-
float dcaXY() const { return targetDCAxy; }
274-
float dcaZ() const { return targetDCAz; }
273+
[[nodiscard]] float pt() const { return targetPt; }
274+
[[nodiscard]] float eta() const { return targetEta; }
275+
[[nodiscard]] float phi() const { return targetPhi; }
276+
[[nodiscard]] float dcaXY() const { return targetDCAxy; }
277+
[[nodiscard]] float dcaZ() const { return targetDCAz; }
275278
};
276279
template <typename T>
277280
T timeAssociationOption(InitContext& context, std::string const& task, std::string const& option)
@@ -363,22 +366,22 @@ struct PidFlowChargedTimeProducer {
363366
timeGlobalSelection = getGlobalTrackSelection();
364367
}
365368
timeSDDSelection = getGlobalTrackSelectionSDD();
366-
const float ptMin = timeAssociationOption<float>(context, "track-selection", "ptMin");
367-
const float ptMax = timeAssociationOption<float>(context, "track-selection", "ptMax");
368-
const float etaMin = timeAssociationOption<float>(context, "track-selection", "etaMin");
369-
const float etaMax = timeAssociationOption<float>(context, "track-selection", "etaMax");
369+
const auto ptMin = timeAssociationOption<float>(context, "track-selection", "ptMin");
370+
const auto ptMax = timeAssociationOption<float>(context, "track-selection", "ptMax");
371+
const auto etaMin = timeAssociationOption<float>(context, "track-selection", "etaMin");
372+
const auto etaMax = timeAssociationOption<float>(context, "track-selection", "etaMax");
370373
for (auto const& selection : {&timeGlobalSelection, &timeSDDSelection}) {
371374
selection->SetPtRange(ptMin, ptMax);
372375
selection->SetEtaRange(etaMin, etaMax);
373376
}
374-
std::string metadata = "association=TrackAssoc;table=PidFlowTimeTracks;charged-only;PID=none;local-density=none;source=Tracks;propagation=target-DCA,USEMatCorrNONE;PV=not-refitted;unique=" + std::to_string(cfgRequireUniqueTimeAssociation);
375-
metadata += ";isRun3=" + std::to_string(timeIsRun3) + ";itsMatching=" + std::to_string(matching) + ";dcaSetup=" + std::to_string(dcaSetup) + ";compatibilityIU=" + std::to_string(compatibilityIU);
377+
std::string metadata = "association=TrackAssoc;table=PidFlowTimeTracks;charged-only;PID=none;local-density=none;source=Tracks;propagation=target-DCA,USEMatCorrNONE;PV=not-refitted;unique=" + std::to_string(static_cast<int>(cfgRequireUniqueTimeAssociation));
378+
metadata += ";isRun3=" + std::to_string(static_cast<int>(timeIsRun3)) + ";itsMatching=" + std::to_string(matching) + ";dcaSetup=" + std::to_string(dcaSetup) + ";compatibilityIU=" + std::to_string(static_cast<int>(compatibilityIU));
376379
metadata += ";pt=" + std::to_string(ptMin) + "," + std::to_string(ptMax) + ";eta=" + std::to_string(etaMin) + "," + std::to_string(etaMax);
377380
metadata += ";producer.nSigmaForTimeCompat=" + std::to_string(timeAssociationOption<float>(context, "track-to-collision-association", "nSigmaForTimeCompat"));
378381
metadata += ";producer.timeMargin=" + std::to_string(timeAssociationOption<float>(context, "track-to-collision-association", "timeMargin"));
379382
metadata += ";producer.bcWindowForOneSigma=" + std::to_string(timeAssociationOption<int>(context, "track-to-collision-association", "bcWindowForOneSigma"));
380-
metadata += ";producer.usePVAssociation=" + std::to_string(timeAssociationOption<bool>(context, "track-to-collision-association", "usePVAssociation"));
381-
metadata += ";producer.includeUnassigned=" + std::to_string(timeAssociationOption<bool>(context, "track-to-collision-association", "includeUnassigned"));
383+
metadata += ";producer.usePVAssociation=" + std::to_string(static_cast<int>(timeAssociationOption<bool>(context, "track-to-collision-association", "usePVAssociation")));
384+
metadata += ";producer.includeUnassigned=" + std::to_string(static_cast<int>(timeAssociationOption<bool>(context, "track-to-collision-association", "includeUnassigned")));
382385
chargedTimeAssociationConfig->SetTitle(metadata.c_str());
383386
LOG(info) << "Charged time association: " << metadata;
384387
if (!cfgTimeAssociationQA) {
@@ -453,7 +456,7 @@ struct PidFlowChargedTimeProducer {
453456

454457
template <typename TTracks>
455458
std::vector<unsigned int> chargedTimeMultiplicity(aod::TrackAssoc const& pairs, TTracks const& tracks,
456-
aod::Collisions const& collisions, aod::BCsWithTimestamps const& bcs, aod::AmbiguousTracks const& ambiguousTracks)
459+
aod::Collisions const& collisions, aod::BCsWithTimestamps const& bcs, aod::AmbiguousTracks const& ambiguousTracks)
457460
{
458461
std::vector<unsigned int> counts(tracks.size(), 0);
459462
std::vector<int64_t> lastCollision(tracks.size(), -1);
@@ -937,10 +940,10 @@ struct PidFlowPtCorr {
937940

938941
enum PidResponseBin {
939942
kPidRespPion = 0,
940-
kPidRespKaon,
941-
kPidRespProton,
942-
kPidRespOther,
943-
kPidRespNTrueBins,
943+
kPidRespKaon = 1,
944+
kPidRespProton = 2,
945+
kPidRespOther = 3,
946+
kPidRespNTrueBins = 4,
944947
kPidRespUnidentified = kPidRespOther,
945948
kPidRespNRecoBins = kPidRespNTrueBins
946949
};
@@ -1068,8 +1071,8 @@ struct PidFlowPtCorr {
10681071
auto& h = pidQualityQAHists[i];
10691072
h.tpcPIDClustersVsPt[stage]->Fill(pt, nPIDClusters);
10701073
if (std::isfinite(tpcNSigma[i])) {
1071-
const double values[]{pt, cent, static_cast<double>(nPIDClusters), tpcNSigma[i]};
1072-
h.tpcNSigmaVsPIDClusters[stage]->Fill(values);
1074+
const std::array<double, 4> values{pt, cent, static_cast<double>(nPIDClusters), tpcNSigma[i]};
1075+
h.tpcNSigmaVsPIDClusters[stage]->Fill(values.data());
10731076
}
10741077
}
10751078
}
@@ -1123,8 +1126,8 @@ struct PidFlowPtCorr {
11231126
}
11241127
h.itsNSigmaVsPt[stage]->Fill(pt, itsNSigma[i]);
11251128
if (std::isfinite(tpcNSigma[i])) {
1126-
const double values[]{pt, cent, tpcNSigma[i], itsNSigma[i]};
1127-
h.tpcVsITSNSigma[stage]->Fill(values);
1129+
const std::array<double, 4> values{pt, cent, tpcNSigma[i], itsNSigma[i]};
1130+
h.tpcVsITSNSigma[stage]->Fill(values.data());
11281131
}
11291132
}
11301133
}
@@ -3671,7 +3674,7 @@ struct PidFlowPtCorr {
36713674
std::vector<unsigned int> originalUses(sources.size(), 0), timeUses(sources.size(), 0);
36723675
const auto sourceIndex = [&](int64_t trackId) {
36733676
const int64_t index = trackId - sources.offset();
3674-
if (index < 0 || index >= static_cast<int64_t>(sources.size())) {
3677+
if (index < 0 || index >= sources.size()) {
36753678
LOGF(fatal, "Association comparison track index is outside the full source track table");
36763679
}
36773680
return index;
@@ -3692,7 +3695,7 @@ struct PidFlowPtCorr {
36923695
for (auto const& track : originalTracks) {
36933696
// Reproduce processData's framework filter and final charged cuts,
36943697
// without requiring or evaluating any PID tables.
3695-
if (!(track.isGlobalTrack() || track.isGlobalTrackSDD()) || !(std::fabs(track.eta()) < trkQualityOpts.cfgCutEta.value) ||
3698+
if (!(track.isGlobalTrack() || track.isGlobalTrackSDD() != 0) || !(std::fabs(track.eta()) < trkQualityOpts.cfgCutEta.value) ||
36963699
!trackSelectedForFlow(track) || !isWithinRefPtRange(track.pt())) {
36973700
continue;
36983701
}
@@ -3708,15 +3711,15 @@ struct PidFlowPtCorr {
37083711
}
37093712
++timeUses[sourceIndex(track.trackId())];
37103713
fillKinematics(track, 1);
3711-
if (originalIds.count(track.trackId()) != 0) {
3714+
if (originalIds.contains(track.trackId())) {
37123715
++common;
37133716
fillKinematics(track, 2);
37143717
} else {
37153718
fillKinematics(track, 4);
37163719
}
37173720
}
37183721
for (auto const& track : originalTracks) {
3719-
if (originalIds.count(track.globalIndex()) != 0 && timeIds.count(track.globalIndex()) == 0) {
3722+
if (originalIds.contains(track.globalIndex()) && !timeIds.contains(track.globalIndex())) {
37203723
fillKinematics(track, 3);
37213724
}
37223725
}
@@ -3948,7 +3951,7 @@ struct PidFlowPtCorr {
39483951
registry.fill(HIST("timeAssociation/hPtCentMcSelected"), track.pt(), cent);
39493952
}
39503953
const int64_t labelIndex = track.trackId() - labels.offset();
3951-
if (labelIndex < 0 || labelIndex >= static_cast<int64_t>(labels.size())) {
3954+
if (labelIndex < 0 || labelIndex >= labels.size()) {
39523955
LOGF(fatal, "Time-associated source track index is outside McTrackLabels");
39533956
}
39543957
auto source = labels.rawIteratorAt(labelIndex);

0 commit comments

Comments
 (0)