Skip to content

Commit 0d789ce

Browse files
author
Laura Serksnyte
committed
changes
1 parent c240e93 commit 0d789ce

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

‎PWGCF/FemtoDream/Core/femtoDreamEventHisto.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class FemtoDreamEventHisto
3737
mHistogramRegistry->add("Event/hZvtx", "; vtx_{z} (cm); Entries", kTH1F, {{300, -12.5, 12.5}});
3838
mHistogramRegistry->add("Event/hMultPercentile", "; Multiplicity Percentile (FT0M); Entries", kTH1F, {{110, 0, 110}});
3939
mHistogramRegistry->add("Event/hMultNTr", "; Multiplicity (MultNtr); Entries", kTH1F, {{200, 0, 200}});
40+
mHistogramRegistry->add("Event/hSphericity", ";Sphericity", kTH1F, {{102, -0.1, 1.1}});
4041
mHistogramRegistry->add("Event/hMultNTrVsZvtx", "; Multiplicity (MultNtr); vtx_{z} (cm)", kTH2F, {{200, 0, 200}, {300, -12.5, 12.5}});
4142
mHistogramRegistry->add("Event/hMultNTrVsMultPercentile", "; Multiplicity (MultNtr); Multiplicity Percentile (FT0M)", kTH2F, {{200, 0, 200}, {110, 0, 110}});
4243
mHistogramRegistry->add("Event/hMultPercentileVsZvtx", "; Multiplicity Percentile (FT0M); vtx_{z} (cm)", kTH2F, {{110, 0, 110}, {300, -12.5, 12.5}});
@@ -56,6 +57,7 @@ class FemtoDreamEventHisto
5657
mHistogramRegistry->fill(HIST("Event/hZvtx"), col.posZ());
5758
mHistogramRegistry->fill(HIST("Event/hMultPercentile"), col.multV0M());
5859
mHistogramRegistry->fill(HIST("Event/hMultNTr"), col.multNtr());
60+
mHistogramRegistry->fill(HIST("Event/hSphericity"), col.sphericity());
5961
mHistogramRegistry->fill(HIST("Event/hMultNTrVsZvtx"), col.multNtr(), col.posZ());
6062
mHistogramRegistry->fill(HIST("Event/hMultNTrVsMultPercentile"), col.multNtr(), col.multV0M());
6163
mHistogramRegistry->fill(HIST("Event/hMultPercentileVsZvtx"), col.multV0M(), col.posZ());

‎PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskForSpecificAnalysis.cxx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,7 @@ struct FemtoDreamProducerTaskForSpecificAnalysis {
328328
/// \param col subscribe to the collision table (Data)
329329
/// \param parts subscribe to the femtoDreamParticleTable
330330
void processCollisionsWithNTracksAndNV0(const o2::aod::FDCollision& col,
331-
o2::aod::FDMCCollisions&,
332-
const o2::aod::FDParticles& parts,
333-
o2::aod::FDMCParticles&)
331+
const o2::aod::FDParticles& parts)
334332
{
335333
eventRegistry.fill(HIST("hStatistiscs"), 0);
336334
auto thegroupSelectedParts = selectedParts->sliceByCached(aod::femtodreamparticle::fdCollisionId, col.globalIndex(), cache);

‎PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,23 @@ struct femtoDreamTripletTaskTrackTrackTrack {
4343
SliceCache cache;
4444
Preslice<aod::FDParticles> perCol = aod::femtodreamparticle::fdCollisionId;
4545

46-
using MaskedCollisions = soa::Join<aod::FDCollisions, aod::FDColMasks>;
46+
47+
Configurable<float> confSphericityMin{"confSphericityMin", 0.6, "Minimum Sphericity Percentile"};
48+
Configurable<float> confSphericityMax{"confSphericityMax", 1, "Maximum Sphericity Percentile"};
49+
50+
Filter EventSphericity = aod::femtodreamcollision::sphericity >= confSphericityMin && aod::femtodreamcollision::sphericity <= confSphericityMax;
51+
using FilteredFDCollisions = soa::Filtered<aod::FDCollisions>;
52+
using FilteredFDCollision = FilteredFDCollisions::iterator;
53+
54+
using MaskedCollisions = soa::Filtered<soa::Join<aod::FDCollisions, aod::FDColMasks>>;
4755
using MaskedCollision = MaskedCollisions::iterator;
4856

4957

50-
using MCCollisions = soa::Join<aod::FDCollisions, aod::FDMCCollLabels>;
58+
using MCCollisions = soa::Filtered<soa::Join<aod::FDCollisions, aod::FDMCCollLabels>>;
5159
using MCCollision = MCCollisions::iterator;
5260

5361

54-
using MaskedMCCollisions = soa::Join<aod::FDCollisions, aod::FDMCCollLabels, aod::FDColMasks>;
62+
using MaskedMCCollisions = soa::Filtered<soa::Join<aod::FDCollisions, aod::FDMCCollLabels, aod::FDColMasks>>;
5563
using MaskedMCCollision = MaskedMCCollisions::iterator;
5664

5765
aod::femtodreamcollision::BitMaskType MaskBit = -1;
@@ -87,7 +95,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
8795
Configurable<o2::aod::femtodreamparticle::cutContainerType> ConfCutPart{"ConfCutPart", 5542474, "Track - Selection bit from cutCulator"};
8896

8997
/// Partition for selected particles
90-
Partition<aod::FDParticles> SelectedParts = ((aod::femtodreamparticle::phi > float(0.369) && aod::femtodreamparticle::phi < float(0.678)) ||
98+
Partition<aod::FDParticles> SelectedParts = /*((aod::femtodreamparticle::phi > float(0.369) && aod::femtodreamparticle::phi < float(0.678)) ||
9199
(aod::femtodreamparticle::phi > float(0.718) && aod::femtodreamparticle::phi < float(1.027)) ||
92100
(aod::femtodreamparticle::phi > float(1.067) && aod::femtodreamparticle::phi < float(1.376)) ||
93101
(aod::femtodreamparticle::phi > float(1.416) && aod::femtodreamparticle::phi < float(1.725)) ||
@@ -104,7 +112,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
104112
(aod::femtodreamparticle::phi > float(5.256) && aod::femtodreamparticle::phi < float(5.565)) ||
105113
(aod::femtodreamparticle::phi > float(5.605) && aod::femtodreamparticle::phi < float(5.914)) ||
106114
(aod::femtodreamparticle::phi > float(5.954) && aod::femtodreamparticle::phi < float(6.263)) ||
107-
(aod::femtodreamparticle::phi > float(0.02) && aod::femtodreamparticle::phi < float(0.329)))&&
115+
(aod::femtodreamparticle::phi > float(0.02) && aod::femtodreamparticle::phi < float(0.329)))&&*/
108116
//((aod::femtodreamparticle::eta > ConfRejectEtaAt0) || (aod::femtodreamparticle::eta < -ConfRejectEtaAt0)) &&
109117
(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kTrack)) &&
110118
ifnode(aod::femtodreamparticle::pt * (nexp(aod::femtodreamparticle::eta) + nexp(-1.f * aod::femtodreamparticle::eta)) / 2.f <= ConfPIDthrMom, ncheckbit(aod::femtodreamparticle::pidcut, ConfTPCPIDBit), ncheckbit(aod::femtodreamparticle::pidcut, ConfTPCTOFPIDBit)) &&
@@ -347,7 +355,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
347355
/// process function to call doSameEvent with Data
348356
/// \param col subscribe to the collision table (Data)
349357
/// \param parts subscribe to the femtoDreamParticleTable
350-
void processSameEvent(o2::aod::FDCollision& col,
358+
void processSameEvent(FilteredFDCollision& col,
351359
o2::aod::FDParticles& parts)
352360
{
353361
fillCollision<false>(col);
@@ -475,7 +483,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
475483
/// process function for to call doMixedEvent with Data
476484
/// @param cols subscribe to the collisions table (Data)
477485
/// @param parts subscribe to the femtoDreamParticleTable
478-
void processMixedEvent(o2::aod::FDCollisions& cols,
486+
void processMixedEvent(FilteredFDCollisions& cols,
479487
o2::aod::FDParticles& parts)
480488
{
481489
for (auto& [collision1, collision2, collision3] : soa::selfCombinations(colBinning, ConfNEventsMix, -1, cols, cols, cols)) {

0 commit comments

Comments
 (0)