Skip to content

Commit 3b0a321

Browse files
Refactor correlation logic and update context parameter
1 parent 6030614 commit 3b0a321

1 file changed

Lines changed: 10 additions & 34 deletions

File tree

‎PWGCF/TwoParticleCorrelations/Tasks/hParticleCorrelation.cxx‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2832,39 +2832,16 @@ struct HParticleCorrelationSameEvent {
28322832
float tofNSigma = 0.0f;
28332833
float massHypothesis = 0.0f;
28342834

2835-
if constexpr (pairType == kHPhi) {
2835+
if constexpr (pairType == kHPhi || (pairType == kHKStar && dauType == kPosDau) || (pairType == kHKStarBar && dauType == kNegDau) ||
2836+
(pairType == kHLambda && dauType == kNegDau) || (pairType == kHLambdaBar && dauType == kPosDau)) {
28362837
tpcNSigma = track.tpcNSigmaKa();
28372838
tofNSigma = track.tofNSigmaKa();
28382839
massHypothesis = MassKPlus;
2839-
} else if constexpr (pairType == kHKStar && dauType == kPosDau) {
2840-
tpcNSigma = track.tpcNSigmaKa();
2841-
tofNSigma = track.tofNSigmaKa();
2842-
massHypothesis = MassKPlus;
2843-
} else if constexpr (pairType == kHKStar && dauType == kNegDau) {
2844-
tpcNSigma = track.tpcNSigmaPi();
2845-
tofNSigma = track.tofNSigmaPi();
2846-
massHypothesis = MassPiPlus;
2847-
} else if constexpr (pairType == kHKStarBar && dauType == kPosDau) {
2840+
} else if constexpr ((pairType == kHKStar && dauType == kNegDau) || (pairType == kHKStarBar && dauType == kPosDau)) {
28482841
tpcNSigma = track.tpcNSigmaPi();
28492842
tofNSigma = track.tofNSigmaPi();
28502843
massHypothesis = MassPiPlus;
2851-
} else if constexpr (pairType == kHKStarBar && dauType == kNegDau) {
2852-
tpcNSigma = track.tpcNSigmaKa();
2853-
tofNSigma = track.tofNSigmaKa();
2854-
massHypothesis = MassKPlus;
2855-
} else if constexpr (pairType == kHLambda && dauType == kPosDau) {
2856-
tpcNSigma = track.tpcNSigmaPr();
2857-
tofNSigma = track.tofNSigmaPr();
2858-
massHypothesis = MassProton;
2859-
} else if constexpr (pairType == kHLambda && dauType == kNegDau) {
2860-
tpcNSigma = track.tpcNSigmaKa();
2861-
tofNSigma = track.tofNSigmaKa();
2862-
massHypothesis = MassKPlus;
2863-
} else if constexpr (pairType == kHLambdaBar && dauType == kPosDau) {
2864-
tpcNSigma = track.tpcNSigmaKa();
2865-
tofNSigma = track.tofNSigmaKa();
2866-
massHypothesis = MassKPlus;
2867-
} else if constexpr (pairType == kHLambdaBar && dauType == kNegDau) {
2844+
} else if constexpr ((pairType == kHLambda && dauType == kPosDau) || (pairType == kHLambdaBar && dauType == kNegDau)) {
28682845
tpcNSigma = track.tpcNSigmaPr();
28692846
tofNSigma = track.tofNSigmaPr();
28702847
massHypothesis = MassProton;
@@ -3304,7 +3281,7 @@ struct HParticleCorrelationSameEvent {
33043281
void executeCorrelation(H& histReg, const T& triggers, const A& associatesLowPt, const B& associatesHighPt, CorrCountArray& corrCountPerColl, ResoRegionCountArray& resoRegionCountsPerColl)
33053282
{
33063283
// Trigger Selection
3307-
int nTrigger = 0;
3284+
// int nTrigger = 0;
33083285
int triggerSelTag = kTrackAccepted;
33093286

33103287
// Option 1 : Trigger tracks wont be accepted as daughter track of reconstructed resonance.
@@ -3333,7 +3310,7 @@ struct HParticleCorrelationSameEvent {
33333310
}
33343311
// fillTrigQA
33353312
fillCorrParticleQA<eventType, pairType, kQA, kTrigger>(histReg, trigger);
3336-
++nTrigger;
3313+
// ++nTrigger;
33373314

33383315
// triggerTrackIndexList.push_back(triggerTrack.globalIndex());
33393316
executeTrigAssocCorrelation<FilterTrkType, eventType, pairType, kAssocLowPt>(histReg, trigger, associatesLowPt, triggerGIList, corrCountPerColl, resoRegionCountsPerColl);
@@ -3498,7 +3475,6 @@ struct HParticleCorrelationSameEvent {
34983475
ResoRegionCountArray resoRegionCountsPerColl{};
34993476

35003477
seEventQA.fill(HIST("SE/Events/EventSelection"), static_cast<float>(kEventPassedMinSelectedTracks));
3501-
nTrack = 0;
35023478

35033479
// Get the Partitions
35043480
auto triggerTracksPerColl = triggerTracks->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
@@ -5290,10 +5266,10 @@ struct HParticleCorrelationMixedEvent {
52905266
PROCESS_SWITCH(HParticleCorrelationMixedEvent, processMixEventInDeriveData, "Process Mix event in derive data", true);
52915267
};
52925268

5293-
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
5269+
WorkflowSpec defineDataProcessing(ConfigContext const& context)
52945270
{
52955271
return WorkflowSpec{
5296-
adaptAnalysisTask<HParticleCorrelationResonanceProducer>(cfgc),
5297-
adaptAnalysisTask<HParticleCorrelationSameEvent>(cfgc),
5298-
adaptAnalysisTask<HParticleCorrelationMixedEvent>(cfgc)};
5272+
adaptAnalysisTask<HParticleCorrelationResonanceProducer>(context),
5273+
adaptAnalysisTask<HParticleCorrelationSameEvent>(context),
5274+
adaptAnalysisTask<HParticleCorrelationMixedEvent>(context)};
52995275
}

0 commit comments

Comments
 (0)