@@ -876,7 +876,7 @@ namespace hf_cand_bplus
876876DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand2Prong, " _0" ); // D0 index
877877// MC matching result:
878878DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
879- DECLARE_SOA_COLUMN (ChannelMcMatchRec, channelMcMatchRec , int8_t ); // reconstruction level
879+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // reconstruction level
880880DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
881881DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen, int8_t ); // generator level
882882DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
@@ -2183,11 +2183,12 @@ namespace hf_cand_b0
21832183DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // D index
21842184// MC matching result:
21852185DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2186- DECLARE_SOA_COLUMN (ChannelMcMatchRec, channelMcMatchRec, int8_t ); // reconstruction level
2187- DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
2186+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec, int8_t ); // reconstruction level
21882187DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen, int8_t ); // generator level
2188+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // generator level
21892189DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
21902190DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
2191+ DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
21912192DECLARE_SOA_COLUMN (DebugMcRec, debugMcRec, int8_t ); // debug flag for mis-association reconstruction level
21922193
21932194// mapping of decay types
@@ -2247,24 +2248,27 @@ using HfCandB0 = soa::Join<HfCandB0Ext, HfCandB0Prongs>;
22472248DECLARE_SOA_TABLE (HfCandB0McRec, " AOD" , " HFCANDB0MCREC" ,
22482249 hf_cand_b0::FlagMcMatchRec,
22492250 hf_cand_b0::OriginMcRec,
2251+ hf_cand_b0::FlagMcDecayChanRec,
22502252 hf_cand_b0::DebugMcRec);
22512253
22522254// table with results of generator level MC matching
22532255DECLARE_SOA_TABLE (HfCandB0McGen, " AOD" , " HFCANDB0MCGEN" ,
22542256 hf_cand_b0::FlagMcMatchGen,
2255- hf_cand_b0::OriginMcGen);
2257+ hf_cand_b0::OriginMcGen,
2258+ hf_cand_b0::FlagMcDecayChanGen);
22562259
22572260// specific Bs candidate properties
22582261namespace hf_cand_bs
22592262{
22602263DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // Ds index
22612264// MC matching result:
22622265DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2263- DECLARE_SOA_COLUMN (ChannelMcMatchRec, channelMcMatchRec, int8_t ); // reconstruction level
2264- DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
2266+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec, int8_t ); // reconstruction level
22652267DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen, int8_t ); // generator level
2268+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // reconstruction level
22662269DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
22672270DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
2271+ DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
22682272DECLARE_SOA_COLUMN (DebugMcRec, debugMcRec, int8_t ); // debug flag for mis-association reconstruction level
22692273DECLARE_SOA_DYNAMIC_COLUMN (ImpactParameterProduct, impactParameterProduct, // Impact parameter product for Bs -> J/Psi phi
22702274 [](float pxJpsiDauPos, float pyJpsiDauPos, float pzJpsiDauPos, float pxJpsiDauNeg, float pyJpsiDauNeg, float pzJpsiDauNeg, float pxLfTrack0, float pyLfTrack0, float pzLfTrack0, float pxLfTrack1, float pyLfTrack1, float pzLfTrack1, float xVtxP, float yVtxP, float zVtxP, float xVtxS, float yVtxS, float zVtxS) -> float {
@@ -2342,11 +2346,13 @@ using HfCandBs = soa::Join<HfCandBsExt, HfCandBsProngs>;
23422346
23432347// table with results of reconstruction level MC matching
23442348DECLARE_SOA_TABLE (HfCandBsMcRec, " AOD" , " HFCANDBSMCREC" ,
2345- hf_cand_bs::FlagMcMatchRec);
2349+ hf_cand_bs::FlagMcMatchRec,
2350+ hf_cand_bs::FlagMcDecayChanRec);
23462351
23472352// table with results of generator level MC matching
23482353DECLARE_SOA_TABLE (HfCandBsMcGen, " AOD" , " HFCANDBSMCGEN" ,
2349- hf_cand_bs::FlagMcMatchGen);
2354+ hf_cand_bs::FlagMcMatchGen,
2355+ hf_cand_bs::FlagMcDecayChanGen);
23502356
23512357namespace hf_cand_4prong
23522358{
0 commit comments