Skip to content

Commit ab8634f

Browse files
author
smonira
committed
removal of unused v0cascade task from femtouniverse
1 parent 6d42fed commit ab8634f

4 files changed

Lines changed: 53 additions & 638 deletions

File tree

‎PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ class FemtoUniverseDetaDphiStar
193193
}
194194
}
195195
if constexpr (kPartOneType == o2::aod::femtouniverseparticle::ParticleType::kTrack && kPartTwoType == o2::aod::femtouniverseparticle::ParticleType::kV0) {
196+
/// Track-V0 combination
196197
for (int i = 0; i < 2; i++) {
197198
std::string dirName = static_cast<std::string>(DirNames[1]);
198199
histdetadpisame[i][0] = mHistogramRegistry->add<TH2>((dirName + static_cast<std::string>(HistNamesSame[0][i])).c_str(), "; #Delta #eta; #Delta #phi", o2::framework::HistType::kTH2F, {{fDeltaEtaAxis}, {fDeltaPhiStarAxis}});
@@ -592,45 +593,6 @@ class FemtoUniverseDetaDphiStar
592593
}
593594
}
594595
return pass;
595-
} else if constexpr (kPartOneType == o2::aod::femtouniverseparticle::ParticleType::kV0 && kPartTwoType == o2::aod::femtouniverseparticle::ParticleType::kCascade) {
596-
/// V0-Cascade combination
597-
if (part1.partType() != o2::aod::femtouniverseparticle::ParticleType::kV0 || part2.partType() != o2::aod::femtouniverseparticle::ParticleType::kCascade) {
598-
LOG(fatal) << "FemtoUniverseDetaDphiStar: passed arguments don't agree with FemtoUniverseDetaDphiStar instantiation! Please provide kV0,kCascade candidates.";
599-
return false;
600-
}
601-
602-
bool pass = false;
603-
static constexpr int V0CascChildTable[][2] = {{-1, -1}, {-1, -2}, {-1, -3}, {-2, -1}, {-2, -2}, {-2, -3}};
604-
for (int i = 0; i < 3; i++) {
605-
auto indexOfDaughterV0 = (ChosenEventType == femto_universe_container::EventType::mixed ? part1.globalIndex() : part1.index()) + V0CascChildTable[i][0];
606-
auto indexOfDaughterCasc = (ChosenEventType == femto_universe_container::EventType::mixed ? part2.globalIndex() : part2.index()) + V0CascChildTable[i][1];
607-
auto daughterV0 = particles.begin() + indexOfDaughterV0;
608-
auto daughterCasc = particles.begin() + indexOfDaughterCasc;
609-
if (isSameSignCPR && (daughterV0.mAntiLambda() != daughterCasc.mAntiLambda())) // mAntiLambda() is used here as sign getter
610-
continue;
611-
auto deta = daughterV0.eta() - daughterCasc.eta();
612-
auto dphiAvg = averagePhiStar(*daughterV0, *daughterCasc, i);
613-
if (ChosenEventType == femto_universe_container::EventType::same) {
614-
histdetadpisame[i][0]->Fill(deta, dphiAvg);
615-
} else if (ChosenEventType == femto_universe_container::EventType::mixed) {
616-
histdetadpimixed[i][0]->Fill(deta, dphiAvg);
617-
} else {
618-
LOG(fatal) << "FemtoUniverseDetaDphiStar: passed arguments don't agree with FemtoUniverseDetaDphiStar's type of events! Please provide same or mixed.";
619-
}
620-
621-
if ((dphiAvg > cutDeltaPhiStarMin) && (dphiAvg < cutDeltaPhiStarMax) && (deta > cutDeltaEtaMin) && (deta < cutDeltaEtaMax)) {
622-
pass = true;
623-
} else {
624-
if (ChosenEventType == femto_universe_container::EventType::same) {
625-
histdetadpisame[i][1]->Fill(deta, dphiAvg);
626-
} else if (ChosenEventType == femto_universe_container::EventType::mixed) {
627-
histdetadpimixed[i][1]->Fill(deta, dphiAvg);
628-
} else {
629-
LOG(fatal) << "FemtoUniverseDetaDphiStar: passed arguments don't agree with FemtoUniverseDetaDphiStar's type of events! Please provide same or mixed.";
630-
}
631-
}
632-
}
633-
return pass;
634596
} else if constexpr (kPartOneType == o2::aod::femtouniverseparticle::ParticleType::kTrack && kPartTwoType == o2::aod::femtouniverseparticle::ParticleType::kD0) {
635597
/// Track-D0 combination
636598
// check if provided particles are in agreement with the class instantiation

‎PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,23 +133,6 @@ class FemtoUniversePairCleaner
133133
return false;
134134
}
135135
return part1.globalIndex() != part2.globalIndex();
136-
} else if constexpr (kPartOneType == o2::aod::femtouniverseparticle::ParticleType::kV0 && kPartTwoType == o2::aod::femtouniverseparticle::ParticleType::kCascade) {
137-
/// V0-Cascade combination where part1 is a V0 and part2 is a cascade
138-
if (part1.partType() != o2::aod::femtouniverseparticle::ParticleType::kV0 || part2.partType() != o2::aod::femtouniverseparticle::ParticleType::kCascade) {
139-
LOG(fatal) << "FemtoUniversePairCleaner: passed arguments don't agree with FemtoUniversePairCleaner instantiation! Please provide first argument kV0 candidate and second argument kCascade candidate.";
140-
return false;
141-
}
142-
// part1 v0 children
143-
const auto& posChild1 = particles.iteratorAt(part1.index() - 2);
144-
const auto& negChild1 = particles.iteratorAt(part1.index() - 1);
145-
// part2 cascade children
146-
const auto& posChild2 = particles.iteratorAt(part2.index() - 3);
147-
const auto& negChild2 = particles.iteratorAt(part2.index() - 2);
148-
const auto& bachelor2 = particles.iteratorAt(part2.index() - 1);
149-
if (posChild1.globalIndex() == posChild2.globalIndex() || negChild1.globalIndex() == negChild2.globalIndex() || posChild1.globalIndex() == bachelor2.globalIndex() || negChild1.globalIndex() == bachelor2.globalIndex()) {
150-
return false;
151-
}
152-
return part1.globalIndex() != part2.globalIndex();
153136
} else if constexpr (kPartOneType == o2::aod::femtouniverseparticle::ParticleType::kTrack && kPartTwoType == o2::aod::femtouniverseparticle::ParticleType::kD0) {
154137
/// Track-D0 combination part1 is hadron and part2 is D0
155138
if (part2.partType() != o2::aod::femtouniverseparticle::ParticleType::kD0) {
Lines changed: 52 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,56 @@
1-
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2-
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3-
# All rights not expressly granted are reserved.
1+
#Copyright 2019 - 2020 CERN and copyright holders of ALICE O2.
2+
#See https: // alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
#All rights not expressly granted are reserved.
44
#
5-
# This software is distributed under the terms of the GNU General Public
6-
# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
5+
#This software is distributed under the terms of the GNU General Public
6+
#License v3(GPL Version 3), copied verbatim in the file "COPYING".
77
#
8-
# In applying this license CERN does not waive the privileges and immunities
9-
# granted to it by virtue of its status as an Intergovernmental Organization
8+
#In applying this license CERN does not waive the privileges and immunities
9+
#granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

12-
o2physics_add_dpl_workflow(femtouniverse-pair-track-track
13-
SOURCES femtoUniversePairTaskTrackTrack.cxx
14-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
15-
COMPONENT_NAME Analysis)
16-
17-
o2physics_add_dpl_workflow(femtouniverse-pair-track-track-mc-truth
18-
SOURCES femtoUniversePairTaskTrackTrackMcTruth.cxx
19-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
20-
COMPONENT_NAME Analysis)
21-
22-
o2physics_add_dpl_workflow(femtouniverse-pair-track-track-extended
23-
SOURCES femtoUniversePairTaskTrackTrackExtended.cxx
24-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
25-
COMPONENT_NAME Analysis)
26-
27-
o2physics_add_dpl_workflow(femtouniverse-pair-track-track-mult-kt-extended
28-
SOURCES femtoUniversePairTaskTrackTrackMultKtExtended.cxx
29-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
30-
COMPONENT_NAME Analysis)
31-
32-
o2physics_add_dpl_workflow(femtouniverse-pair-track-nucleus
33-
SOURCES femtoUniversePairTaskTrackNucleus.cxx
34-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
35-
COMPONENT_NAME Analysis)
36-
37-
o2physics_add_dpl_workflow(femtouniverse-pair-track-v0-helicity
38-
SOURCES femtoUniversePairTaskTrackV0Helicity.cxx
39-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
40-
COMPONENT_NAME Analysis)
41-
42-
o2physics_add_dpl_workflow(femtouniverse-pair-track-track-threedrelmom-mult-kt-extended
43-
SOURCES femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
44-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
45-
COMPONENT_NAME Analysis)
46-
47-
o2physics_add_dpl_workflow(femto-universe-pair-task-track-track-spher-har-mult-kt-extended
48-
SOURCES femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
49-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
50-
COMPONENT_NAME Analysis)
51-
52-
o2physics_add_dpl_workflow(femto-universe-pair-task-track-track-spher-har-mult-kt-extended-its-pid
53-
SOURCES femtoUniversePairTaskTrackTrackSpherHarMultKtExtendedItsPid.cxx
54-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
55-
COMPONENT_NAME Analysis)
56-
57-
o2physics_add_dpl_workflow(femtouniverse-debug-track
58-
SOURCES femtoUniverseDebugTrack.cxx
59-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
60-
COMPONENT_NAME Analysis)
61-
62-
o2physics_add_dpl_workflow(femtouniverse-pair-track-v0-extended
63-
SOURCES femtoUniversePairTaskTrackV0Extended.cxx
64-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
65-
COMPONENT_NAME Analysis)
66-
67-
o2physics_add_dpl_workflow(femtouniverse-pair-track-cascade-extended
68-
SOURCES femtoUniversePairTaskTrackCascadeExtended.cxx
69-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
70-
COMPONENT_NAME Analysis)
71-
72-
o2physics_add_dpl_workflow(femtouniverse-pair-v0-cascade-extended
73-
SOURCES femtoUniversePairTaskV0CascadeExtended.cxx
74-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
75-
COMPONENT_NAME Analysis)
76-
77-
o2physics_add_dpl_workflow(femtouniverse-pair-track-d0
78-
SOURCES femtoUniversePairTaskTrackD0.cxx
79-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
80-
COMPONENT_NAME Analysis)
81-
82-
o2physics_add_dpl_workflow(femtouniverse-pair-track-phi
83-
SOURCES femtoUniversePairTaskTrackPhi.cxx
84-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
85-
COMPONENT_NAME Analysis)
86-
87-
o2physics_add_dpl_workflow(femtouniverse-debug-v0
88-
SOURCES femtoUniverseDebugV0.cxx
89-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
90-
COMPONENT_NAME Analysis)
91-
92-
o2physics_add_dpl_workflow(femtouniverse-hash
93-
SOURCES femtoUniverseHashTask.cxx
94-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
95-
COMPONENT_NAME Analysis)
96-
97-
o2physics_add_dpl_workflow(femtouniverse-pair-track-track-m-c
98-
SOURCES femtoUniversePairTaskTrackTrackMC.cxx
99-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
100-
COMPONENT_NAME Analysis)
101-
102-
o2physics_add_dpl_workflow(femtouniverse-efficiency-task
103-
SOURCES femtoUniverseEfficiencyTask.cxx
104-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
105-
COMPONENT_NAME Analysis)
106-
107-
o2physics_add_dpl_workflow(femtouniverse-efficiency-base
108-
SOURCES femtoUniverseEfficiencyBase.cxx
109-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
110-
COMPONENT_NAME Analysis)
111-
112-
o2physics_add_executable(femtouniverse-cutculator
113-
SOURCES femtoUniverseCutCulator.cxx
114-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
115-
COMPONENT_NAME Analysis)
12+
o2physics_add_dpl_workflow(femtouniverse - pair - track - track SOURCES femtoUniversePairTaskTrackTrack.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
13+
14+
o2physics_add_dpl_workflow(femtouniverse - pair - track - track - mc - truth SOURCES femtoUniversePairTaskTrackTrackMcTruth.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
15+
16+
o2physics_add_dpl_workflow(femtouniverse - pair - track - track - extended SOURCES femtoUniversePairTaskTrackTrackExtended.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
17+
18+
o2physics_add_dpl_workflow(femtouniverse - pair - track - track - mult - kt - extended SOURCES femtoUniversePairTaskTrackTrackMultKtExtended.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
19+
20+
o2physics_add_dpl_workflow(femtouniverse - pair - track - nucleus SOURCES femtoUniversePairTaskTrackNucleus.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
21+
22+
o2physics_add_dpl_workflow(femtouniverse - pair - track - v0 - helicity SOURCES femtoUniversePairTaskTrackV0Helicity.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
23+
24+
o2physics_add_dpl_workflow(femtouniverse - pair - track - track - threedrelmom - mult - kt - extended SOURCES femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
25+
26+
o2physics_add_dpl_workflow(femto - universe - pair - task - track - track - spher - har - mult - kt - extended SOURCES femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
27+
28+
o2physics_add_dpl_workflow(femto - universe - pair - task - track - track - spher - har - mult - kt - extended - its - pid SOURCES femtoUniversePairTaskTrackTrackSpherHarMultKtExtendedItsPid.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
29+
30+
o2physics_add_dpl_workflow(femtouniverse - debug - track SOURCES femtoUniverseDebugTrack.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
31+
32+
o2physics_add_dpl_workflow(femtouniverse - pair - track - v0 - extended SOURCES femtoUniversePairTaskTrackV0Extended.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
33+
34+
o2physics_add_dpl_workflow(femtouniverse - pair - track - cascade - extended SOURCES femtoUniversePairTaskTrackCascadeExtended.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
35+
36+
o2physics_add_dpl_workflow(femtouniverse - pair - track - d0 SOURCES femtoUniversePairTaskTrackD0.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
37+
38+
o2physics_add_dpl_workflow(femtouniverse - pair - track - phi SOURCES femtoUniversePairTaskTrackPhi.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
39+
40+
o2physics_add_dpl_workflow(femtouniverse - debug - v0 SOURCES femtoUniverseDebugV0.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
41+
42+
o2physics_add_dpl_workflow(femtouniverse - hash
43+
SOURCES femtoUniverseHashTask.cxx
44+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
45+
COMPONENT_NAME Analysis)
46+
47+
o2physics_add_dpl_workflow(femtouniverse - pair - track - track - m - c SOURCES femtoUniversePairTaskTrackTrackMC.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
48+
49+
o2physics_add_dpl_workflow(femtouniverse - efficiency - task SOURCES femtoUniverseEfficiencyTask.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
50+
51+
o2physics_add_dpl_workflow(femtouniverse - efficiency - base SOURCES femtoUniverseEfficiencyBase.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
52+
53+
o2physics_add_executable(femtouniverse - cutculator
54+
SOURCES femtoUniverseCutCulator.cxx
55+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
56+
COMPONENT_NAME Analysis)

0 commit comments

Comments
 (0)