@@ -875,12 +875,13 @@ namespace hf_cand_bplus
875875{
876876DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand2Prong, " _0" ); // D0 index
877877// MC matching result:
878- DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
879- DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // reconstruction level
880- DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision , int8_t ); // reconstruction level
881- DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // generator level
878+ DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // main decay channel, reconstruction level
879+ DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // main decay channel, generator level
880+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // resonant decay channel, reconstruction level
881+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen , int8_t ); // resonant decay channel, generator level
882882DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
883883DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
884+ DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
884885DECLARE_SOA_COLUMN (DebugMcRec, debugMcRec, int8_t ); // debug flag for mis-association reconstruction level
885886DECLARE_SOA_DYNAMIC_COLUMN (ImpactParameterProduct, impactParameterProduct, // Impact parameter product for B+ -> J/Psi K
886887 [](float px0, float py0, float pz0, float px1, float py1, float pz1, float xVtxP, float yVtxP, float zVtxP, float xVtxS, float yVtxS, float zVtxS, float impParK) -> float { return impParK * RecoDecay::impParXY (std::array{xVtxP, yVtxP, zVtxP}, std::array{xVtxS, yVtxS, zVtxS}, RecoDecay::pVec (std::array{px0, py0, pz0}, std::array{px1, py1, pz1})); });
@@ -947,11 +948,13 @@ using HfCandBplus = soa::Join<HfCandBplusExt, HfCandBplusProngs>;
947948// table with results of reconstruction level MC matching
948949DECLARE_SOA_TABLE (HfCandBplusMcRec, " AOD" , " HFCANDBPMCREC" ,
949950 hf_cand_bplus::FlagMcMatchRec,
951+ hf_cand_bplus::FlagMcDecayChanRec,
950952 hf_cand_bplus::OriginMcRec);
951953
952954// table with results of generator level MC matching
953955DECLARE_SOA_TABLE (HfCandBplusMcGen, " AOD" , " HFCANDBPMCGEN" ,
954956 hf_cand_bplus::FlagMcMatchGen,
957+ hf_cand_bplus::FlagMcDecayChanGen,
955958 hf_cand_bplus::OriginMcGen);
956959
957960// specific 3-prong decay properties
@@ -2034,11 +2037,13 @@ namespace hf_cand_lb
20342037{
20352038DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // Lb index
20362039// MC matching result:
2037- DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2038- DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
2039- DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen, int8_t ); // generator level
2040+ DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // main decay channel, reconstruction level
2041+ DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen, int8_t ); // main decay channel, generator level
2042+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec, int8_t ); // resonant decay channel, reconstruction level
2043+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // resonant decay channel, generator level
20402044DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
20412045DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
2046+ DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
20422047DECLARE_SOA_COLUMN (DebugMcRec, debugMcRec, int8_t ); // debug flag for mis-association reconstruction level
20432048// mapping of decay types
20442049enum DecayType { LbToLcPi }; // move this to a dedicated cascade namespace in the future?
@@ -2093,23 +2098,25 @@ using HfCandLb = soa::Join<HfCandLbExt, HfCandLbProngs>;
20932098// table with results of reconstruction level MC matching
20942099DECLARE_SOA_TABLE (HfCandLbMcRec, " AOD" , " HFCANDLBMCREC" , // !
20952100 hf_cand_lb::FlagMcMatchRec,
2101+ hf_cand_lb::FlagMcDecayChanRec,
20962102 hf_cand_lb::OriginMcRec,
20972103 hf_cand_lb::DebugMcRec);
20982104
20992105// table with results of generator level MC matching
21002106DECLARE_SOA_TABLE (HfCandLbMcGen, " AOD" , " HFCANDLBMCGEN" , // !
21012107 hf_cand_lb::FlagMcMatchGen,
2108+ hf_cand_lb::FlagMcDecayChanGen,
21022109 hf_cand_lb::OriginMcGen);
21032110
21042111// specific B0 candidate properties
21052112namespace hf_cand_b0
21062113{
21072114DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // D index
21082115// MC matching result:
2109- DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2110- DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // reconstruction level
2111- DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // generator level
2112- DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // generator level
2116+ DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // main decay channel, reconstruction level
2117+ DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // main decay channel, generator level
2118+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // resonant decay channel, reconstruction level
2119+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // resonant decay channel, generator level
21132120DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
21142121DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
21152122DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
@@ -2186,10 +2193,10 @@ namespace hf_cand_bs
21862193{
21872194DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // Ds index
21882195// MC matching result:
2189- DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2190- DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // reconstruction level
2191- DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // generator level
2192- DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // reconstruction level
2196+ DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // main decay channel, reconstruction level
2197+ DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // main decay channel, generator level
2198+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // resonant decay channel, reconstruction level
2199+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // resonant decay channel, generator level
21932200DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
21942201DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
21952202DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
0 commit comments