Skip to content

Commit 3adade1

Browse files
nzardoshnzardosh
authored
[PWGHF,PWGJE] Adding B+ to the jet framework and renaming 3P->Lc in Derived HF tables (#8792)
1 parent af69988 commit 3adade1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+933
-312
lines changed

‎PWGHF/DataModel/DerivedTables.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
246246
DECLARE_CAND_3P_TABLES(_hf_type_, _hf_description_, _hf_namespace_)
247247

248248
DECLARE_2P_TABLES(D0, "D0", d0, 2);
249-
DECLARE_3P_TABLES(3P, "3P", 3p, 3);
249+
DECLARE_3P_TABLES(Lc, "LC", lc, 3);
250250
DECLARE_3P_TABLES(Bplus, "BP", bplus, 4);
251251

252252
// ================
@@ -560,7 +560,7 @@ DECLARE_SOA_TABLE_STAGED(HfBplusMcs, "HFBPMC", //! Table with MC candidate info
560560
// PxProng0, PyProng0, PzProng0,... (same for 1, 2), we can keep Pt, Eta, Phi instead
561561
// XY: CpaXY, DecayLengthXY, ErrorDecayLengthXY
562562
// normalised: DecayLengthNormalised, DecayLengthXYNormalised, ImpactParameterNormalised0
563-
DECLARE_SOA_TABLE_STAGED(Hf3PPars, "HF3PPAR", //! Table with candidate properties used for selection
563+
DECLARE_SOA_TABLE_STAGED(HfLcPars, "HFLCPAR", //! Table with candidate properties used for selection
564564
hf_cand::Chi2PCA,
565565
hf_cand::NProngsContributorsPV,
566566
hf_cand_par::Cpa,
@@ -593,9 +593,9 @@ DECLARE_SOA_TABLE_STAGED(Hf3PPars, "HF3PPAR", //! Table with candidate propertie
593593
hf_cand_par::NSigTofPr2,
594594
hf_cand_par::NSigTpcTofPi2,
595595
hf_cand_par::NSigTpcTofPr2,
596-
o2::soa::Marker<Marker3P>);
596+
o2::soa::Marker<MarkerLc>);
597597

598-
DECLARE_SOA_TABLE_STAGED(Hf3PParEs, "HF3PPARE", //! Table with additional candidate properties used for selection
598+
DECLARE_SOA_TABLE_STAGED(HfLcParEs, "HFLCPARE", //! Table with additional candidate properties used for selection
599599
hf_cand::XSecondaryVertex,
600600
hf_cand::YSecondaryVertex,
601601
hf_cand::ZSecondaryVertex,
@@ -618,21 +618,21 @@ DECLARE_SOA_TABLE_STAGED(Hf3PParEs, "HF3PPARE", //! Table with additional candid
618618
hf_cand::ErrorImpactParameter1,
619619
hf_cand::ErrorImpactParameter2,
620620
hf_cand_par::Ct,
621-
o2::soa::Marker<Marker3P>);
621+
o2::soa::Marker<MarkerLc>);
622622

623-
DECLARE_SOA_TABLE_STAGED(Hf3PSels, "HF3PSEL", //! Table with candidate selection flags
623+
DECLARE_SOA_TABLE_STAGED(HfLcSels, "HFLCSEL", //! Table with candidate selection flags
624624
hf_cand_sel::CandidateSelFlag,
625-
o2::soa::Marker<Marker3P>);
625+
o2::soa::Marker<MarkerLc>);
626626

627-
DECLARE_SOA_TABLE_STAGED(Hf3PMls, "HF3PML", //! Table with candidate selection ML scores
627+
DECLARE_SOA_TABLE_STAGED(HfLcMls, "HFLCML", //! Table with candidate selection ML scores
628628
hf_cand_mc::MlScores,
629-
o2::soa::Marker<Marker3P>);
629+
o2::soa::Marker<MarkerLc>);
630630

631-
DECLARE_SOA_TABLE_STAGED(Hf3PMcs, "HF3PMC", //! Table with MC candidate info
631+
DECLARE_SOA_TABLE_STAGED(HfLcMcs, "HFLCMC", //! Table with MC candidate info
632632
hf_cand_mc::FlagMcMatchRec,
633633
hf_cand_mc::OriginMcRec,
634634
hf_cand_mc::IsCandidateSwapped,
635-
o2::soa::Marker<Marker3P>);
635+
o2::soa::Marker<MarkerLc>);
636636

637637
} // namespace o2::aod
638638

‎PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ using namespace o2::analysis::hf_derived;
4343
/// Writes the full information in an output TTree
4444
struct HfDerivedDataCreatorLcToPKPi {
4545
// Candidates
46-
Produces<o2::aod::Hf3PBases> rowCandidateBase;
47-
Produces<o2::aod::Hf3PPars> rowCandidatePar;
48-
Produces<o2::aod::Hf3PParEs> rowCandidateParE;
49-
Produces<o2::aod::Hf3PSels> rowCandidateSel;
50-
Produces<o2::aod::Hf3PMls> rowCandidateMl;
51-
Produces<o2::aod::Hf3PIds> rowCandidateId;
52-
Produces<o2::aod::Hf3PMcs> rowCandidateMc;
46+
Produces<o2::aod::HfLcBases> rowCandidateBase;
47+
Produces<o2::aod::HfLcPars> rowCandidatePar;
48+
Produces<o2::aod::HfLcParEs> rowCandidateParE;
49+
Produces<o2::aod::HfLcSels> rowCandidateSel;
50+
Produces<o2::aod::HfLcMls> rowCandidateMl;
51+
Produces<o2::aod::HfLcIds> rowCandidateId;
52+
Produces<o2::aod::HfLcMcs> rowCandidateMc;
5353
// Collisions
54-
Produces<o2::aod::Hf3PCollBases> rowCollBase;
55-
Produces<o2::aod::Hf3PCollIds> rowCollId;
54+
Produces<o2::aod::HfLcCollBases> rowCollBase;
55+
Produces<o2::aod::HfLcCollIds> rowCollId;
5656
// MC collisions
57-
Produces<o2::aod::Hf3PMcCollBases> rowMcCollBase;
58-
Produces<o2::aod::Hf3PMcCollIds> rowMcCollId;
59-
Produces<o2::aod::Hf3PMcRCollIds> rowMcRCollId;
57+
Produces<o2::aod::HfLcMcCollBases> rowMcCollBase;
58+
Produces<o2::aod::HfLcMcCollIds> rowMcCollId;
59+
Produces<o2::aod::HfLcMcRCollIds> rowMcRCollId;
6060
// MC particles
61-
Produces<o2::aod::Hf3PPBases> rowParticleBase;
62-
Produces<o2::aod::Hf3PPIds> rowParticleId;
61+
Produces<o2::aod::HfLcPBases> rowParticleBase;
62+
Produces<o2::aod::HfLcPIds> rowParticleId;
6363

6464
// Switches for filling tables
6565
Configurable<bool> fillCandidateBase{"fillCandidateBase", true, "Fill candidate base properties"};

‎PWGJE/Core/JetCandidateUtilities.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -373,30 +373,30 @@ float getCandidateInvariantMass(T const& candidate)
373373
}
374374

375375
template <typename T, typename U, typename V>
376-
void fillCandidateCollisionTable(T const& collision, U const& candidates, V& CandiateCollisionTable, int32_t& CandidateCollisionTableIndex)
376+
void fillCandidateCollisionTable(T const& collision, U const& /*candidates*/, V& CandiateCollisionTable, int32_t& CandidateCollisionTableIndex)
377377
{
378378
if constexpr (jethfutilities::isHFTable<U>()) {
379-
jethfutilities::fillHFCollisionTable(collision, candidates, CandiateCollisionTable, CandidateCollisionTableIndex);
379+
jethfutilities::fillHFCollisionTable(collision, CandiateCollisionTable, CandidateCollisionTableIndex);
380380
} else if constexpr (jetdqutilities::isDielectronTable<U>()) {
381381
jetdqutilities::fillDielectronCollisionTable(collision, CandiateCollisionTable, CandidateCollisionTableIndex); // if more dilepton tables are added we would need a fillDQCollisionTable
382382
}
383383
}
384384

385385
template <typename T, typename U, typename V>
386-
void fillCandidateMcCollisionTable(T const& mcCollision, U const& candidates, V& CandiateMcCollisionTable, int32_t& CandidateMcCollisionTableIndex)
386+
void fillCandidateMcCollisionTable(T const& mcCollision, U const& /*candidates*/, V& CandiateMcCollisionTable, int32_t& CandidateMcCollisionTableIndex)
387387
{
388388
if constexpr (jethfutilities::isHFMcTable<U>()) {
389-
jethfutilities::fillHFMcCollisionTable(mcCollision, candidates, CandiateMcCollisionTable, CandidateMcCollisionTableIndex);
389+
jethfutilities::fillHFMcCollisionTable(mcCollision, CandiateMcCollisionTable, CandidateMcCollisionTableIndex);
390390
} else if constexpr (jetdqutilities::isDielectronMcTable<U>()) {
391391
jetdqutilities::fillDielectronMcCollisionTable(mcCollision, CandiateMcCollisionTable, CandidateMcCollisionTableIndex);
392392
}
393393
}
394394

395-
template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P>
396-
void fillCandidateTable(T const& candidate, int32_t collisionIndex, U& BaseTable, V& HFParTable, M& HFParETable, N& HFSelectionFlagTable, O& HFMlTable, P& HFMCDTable, int32_t& candidateTableIndex)
395+
template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P, typename Q, typename S>
396+
void fillCandidateTable(T const& candidate, int32_t collisionIndex, U& BaseTable, V& HFParTable, M& HFParETable, N& HFParDaughterTable, O& HFSelectionFlagTable, P& HFMlTable, Q& HFMlDaughterTable, S& HFMCDTable, int32_t& candidateTableIndex)
397397
{
398398
if constexpr (jethfutilities::isHFCandidate<T>()) {
399-
jethfutilities::fillHFCandidateTable<isMc>(candidate, collisionIndex, BaseTable, HFParTable, HFParETable, HFSelectionFlagTable, HFMlTable, HFMCDTable, candidateTableIndex);
399+
jethfutilities::fillHFCandidateTable<isMc>(candidate, collisionIndex, BaseTable, HFParTable, HFParETable, HFParDaughterTable, HFSelectionFlagTable, HFMlTable, HFMlDaughterTable, HFMCDTable, candidateTableIndex);
400400
} else if constexpr (jetdqutilities::isDielectronCandidate<T>()) {
401401
jetdqutilities::fillDielectronCandidateTable(candidate, collisionIndex, BaseTable, candidateTableIndex);
402402
}

‎PWGJE/Core/JetDQUtilities.h‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,7 @@ auto slicedPerDielectronCollision(T const& table, U const& /*candidates*/, V con
188188
template <typename T>
189189
int getDielectronCandidateCollisionId(T const& candidate)
190190
{
191-
if constexpr (isDielectronCandidate<T>()) {
192-
return candidate.reducedeventId();
193-
} else {
194-
return -1;
195-
}
191+
return candidate.reducedeventId();
196192
}
197193

198194
/**
@@ -275,11 +271,7 @@ float getDielectronTablePDGMass()
275271
template <typename T>
276272
float getDielectronCandidateInvariantMass(T const& candidate)
277273
{
278-
if constexpr (isDielectronCandidate<T>()) {
279-
return candidate.mass();
280-
} else {
281-
return -1.0;
282-
}
274+
return candidate.mass();
283275
}
284276

285277
template <typename T, typename U>

0 commit comments

Comments
 (0)