Skip to content

Commit 2b8d86a

Browse files
committed
First full version of derived data consumer. Implemented preprocessor macro to avoid rewriting 20*4 histogram fills by hand (now fixed at compile time). Still not works with current JetPolarizationIons definition (collIdx has trouble with Preslice, as it is a non-monotonic. Possibly O2 is mixing the TimeFrames and combining multiple GlobalIndices in a same subfolder of the derived data)
1 parent cd43870 commit 2b8d86a

File tree

4 files changed

+96
-90
lines changed

4 files changed

+96
-90
lines changed

PWGLF/DataModel/lambdaJetPolarizationIons.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ DECLARE_SOA_TABLE(RingJets, "AOD", "RINGJETS", // Renamed to follow convention o
6363
lambdajetpol::JetPhi,
6464
lambdajetpol::JetNConstituents);
6565

66-
DECLARE_SOA_TABLE(RingLaV0s, "AOD", "RINGLAV0S",
66+
DECLARE_SOA_TABLE(RingLaV0s, "AOD", "RINGLAV0S", // Had to write this in a shorter form because the derived data did not accept long names
6767
lambdajetpol::CollIdx,
6868
lambdajetpol::V0Pt,
6969
lambdajetpol::V0Eta,

PWGLF/Tasks/Strangeness/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ SOURCES lambdaJetPolarizationIons.cxx
171171
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGJECore FastJet::FastJet FastJet::Contrib O2Physics::EventFilteringUtils O2Physics::AnalysisCCDB
172172
COMPONENT_NAME Analysis)
173173

174+
o2physics_add_dpl_workflow(lambdajetpolarizationionsderived
175+
SOURCES lambdaJetPolarizationIonsDerived.cxx
176+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
177+
COMPONENT_NAME Analysis)
178+
174179
o2physics_add_dpl_workflow(lambdaspincorrderived
175180
SOURCES lambdaspincorrderived.cxx
176181
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore

PWGLF/Tasks/Strangeness/lambdaJetPolarizationIons.cxx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,7 @@ struct lambdajetpolarizationions {
15361536
const uint64_t collIdx = collision.globalIndex();
15371537
if (v0Selections.rejectTPCsectorBoundary) initCCDB(bc); // Substituted call from collision to bc for raw data
15381538

1539-
bool hasValidV0 = false; // Bool to know if event information can be saved.
1539+
// bool hasValidV0 = false; // Bool to know if event information can be saved.
15401540
for (auto const& v0 : fullV0s){
15411541
V0SelCounter.resetForNewV0();
15421542
V0SelCounter.fill(); // Fill for all v0 candidates
@@ -1552,7 +1552,7 @@ struct lambdajetpolarizationions {
15521552
if (analyseAntiLambda) isAntiLambda = passesLambdaLambdaBarHypothesis(v0, collision, false);
15531553

15541554
if (!isLambda && !isAntiLambda) continue; // Candidate is not considered to be a Lambda (TODO: expand this to a full if block with QA about rejections)
1555-
hasValidV0 = true;
1555+
// hasValidV0 = true;
15561556

15571557
if (doArmenterosQA) histos.fill(HIST("GeneralQA/h2dArmenterosSelected"), v0.alpha(), v0.qtarm()); // cross-check
15581558
if (isLambda && isAntiLambda) histos.fill(HIST("hAmbiguousLambdaCandidates"), 0);
@@ -1739,10 +1739,11 @@ struct lambdajetpolarizationions {
17391739
} // end CompleteTopoQA
17401740
} // end V0s loop
17411741
// Only fills collision when there is a valid V0 in it: (TODO: could probably do the same for the jets table)
1742-
if (hasValidV0){
1742+
// if (hasValidV0){
17431743
// LOG(INFO) << "Filling tableCollisions";
1744-
tableCollisions(collIdx, centrality); // (TODO: add InteractionRate info and other useful cuts for later on in the analysis!)
1745-
}
1744+
// Current logic now fills tables independently of collision having V0s, for the Jets table to match correctly
1745+
tableCollisions(collIdx, centrality); // (TODO: add InteractionRate info and other useful cuts for later on in the analysis!)
1746+
// }
17461747
}
17471748

17481749
PROCESS_SWITCH(lambdajetpolarizationions, processJetsData, "Process jets and produce derived data in Run 3 Data", true);

0 commit comments

Comments
 (0)