Skip to content

Commit 13463ac

Browse files
authored
[PWGCF] FemtoDream: Small fixes for Cascades (#13992)
1 parent 92fb65d commit 13463ac

File tree

2 files changed

+25
-28
lines changed

2 files changed

+25
-28
lines changed

PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskReso.cxx

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,12 +1301,10 @@ struct FemtoDreamProducerTaskReso {
13011301
const auto& bachTrackCasc = casc.template bachelor_as<TrackType>();
13021302

13031303
if (confIsActivateXi.value) {
1304-
// xiCuts.fillQA<0, aod::femtodreamparticle::ParticleType::kCascade, aod::femtodreamparticle::ParticleType::kCascadeV0Child, aod::femtodreamparticle::ParticleType::kCascadeBachelor>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
1304+
xiCuts.fillQA<0, aod::femtodreamparticle::ParticleType::kCascade, aod::femtodreamparticle::ParticleType::kCascadeV0Child, aod::femtodreamparticle::ParticleType::kCascadeBachelor>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
13051305

13061306
if (xiCuts.isSelectedMinimal(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc)) {
1307-
1308-
// xiCuts.fillQA<1, aod::femtodreamparticle::ParticleType::kCascade, aod::femtodreamparticle::ParticleType::kCascadeV0Child, aod::femtodreamparticle::ParticleType::kCascadeBachelor>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
1309-
// auto cutContainerCasc = xiCuts.getCutContainer<aod::femtodreamparticle::cutContainerType>(col, casc, v0daugh, posTrackCasc, negTrackCasc, bachTrackCasc);
1307+
xiCuts.fillQA<1, aod::femtodreamparticle::ParticleType::kCascade, aod::femtodreamparticle::ParticleType::kCascadeV0Child, aod::femtodreamparticle::ParticleType::kCascadeBachelor>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
13101308
auto cutContainerCasc = xiCuts.getCutContainer<aod::femtodreamparticle::cutContainerType>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
13111309

13121310
// Fill positive child
@@ -1401,14 +1399,12 @@ struct FemtoDreamProducerTaskReso {
14011399
// continue;
14021400
} // if xiCuts.isSelectedMinimal
14031401
} // if confIsActivateXi
1404-
/*
1405-
if (confIsActivateOmega.value){
1402+
if (confIsActivateOmega.value) {
14061403
omegaCuts.fillQA<0, aod::femtodreamparticle::ParticleType::kOmega, aod::femtodreamparticle::ParticleType::kOmegaV0Child, aod::femtodreamparticle::ParticleType::kOmegaBachelor>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
14071404

14081405
if (omegaCuts.isSelectedMinimal(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc)) {
14091406

14101407
omegaCuts.fillQA<1, aod::femtodreamparticle::ParticleType::kOmega, aod::femtodreamparticle::ParticleType::kOmegaV0Child, aod::femtodreamparticle::ParticleType::kOmegaBachelor>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
1411-
// auto cutContainerCasc = xiCuts.getCutContainer<aod::femtodreamparticle::cutContainerType>(col, casc, v0daugh, posTrackCasc, negTrackCasc, bachTrackCasc);
14121408
auto cutContainerCasc = omegaCuts.getCutContainer<aod::femtodreamparticle::cutContainerType>(col, casc, posTrackCasc, negTrackCasc, bachTrackCasc);
14131409

14141410
// Fill positive child
@@ -1500,11 +1496,9 @@ struct FemtoDreamProducerTaskReso {
15001496
fillDebugCascade(casc, col); // QA for Cascade
15011497
}
15021498

1503-
1504-
//continue;
1505-
} //if omegaCuts.isSelectedMinimal
1506-
} //if confIsActivateOmega
1507-
*/
1499+
// continue;
1500+
} // if omegaCuts.isSelectedMinimal
1501+
} // if confIsActivateOmega
15081502
} // loop over cascades
15091503
} // at least one cascade active
15101504

PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,26 @@
1111
/// \file femtoDreamPairTaskTrackTrack.cxx
1212
/// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
1313
/// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
14-
#include <sys/stat.h>
15-
#include <cstdint>
16-
#include <vector>
17-
#include <string>
18-
#include "Framework/AnalysisTask.h"
19-
#include "Framework/runDataProcessing.h"
20-
#include "Framework/HistogramRegistry.h"
21-
#include "Framework/ASoAHelpers.h"
22-
#include "Framework/RunningWorkflowInfo.h"
23-
#include "Framework/Expressions.h"
2414
#include "PWGCF/DataModel/FemtoDerived.h"
25-
#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
26-
#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
27-
#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
2815
#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
2916
#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
17+
#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
18+
#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
19+
#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
3020
#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
21+
22+
#include "Framework/ASoAHelpers.h"
23+
#include "Framework/AnalysisTask.h"
24+
#include "Framework/Expressions.h"
25+
#include "Framework/HistogramRegistry.h"
26+
#include "Framework/RunningWorkflowInfo.h"
27+
#include "Framework/runDataProcessing.h"
28+
29+
#include <sys/stat.h>
30+
31+
#include <cstdint>
32+
#include <string>
33+
#include <vector>
3134
using namespace o2;
3235
using namespace o2::aod;
3336
using namespace o2::soa;
@@ -327,9 +330,9 @@ struct femtoDreamPairTaskTrackCascade {
327330
auto SliceTrk1 = part1->sliceByCached(aod::femtodreamparticle::fdCollisionId, collision1.globalIndex(), cache);
328331
auto SliceCasc2 = part2->sliceByCached(aod::femtodreamparticle::fdCollisionId, collision2.globalIndex(), cache);
329332
for (auto& [p1, p2] : combinations(CombinationsFullIndexPolicy(SliceTrk1, SliceCasc2))) {
330-
const auto& posChild = parts.iteratorAt(p2.index() - 3);
331-
const auto& negChild = parts.iteratorAt(p2.index() - 2);
332-
const auto& bachChild = parts.iteratorAt(p2.index() - 1);
333+
const auto& posChild = parts.iteratorAt(p2.globalIndex() - 3);
334+
const auto& negChild = parts.iteratorAt(p2.globalIndex() - 2);
335+
const auto& bachChild = parts.iteratorAt(p2.globalIndex() - 1);
333336
// check cuts on Cascade children
334337
if (Cascade2.UseChildCuts) {
335338
if (!(((posChild.cut() & Cascade2.ChildPos_CutBit) == Cascade2.ChildPos_CutBit) &&

0 commit comments

Comments
 (0)