@@ -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
@@ -2110,11 +2113,13 @@ namespace hf_cand_lb
21102113{
21112114DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // Lb index
21122115// MC matching result:
2113- DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2114- DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
2115- DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen, 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
21162120DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
21172121DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
2122+ DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
21182123DECLARE_SOA_COLUMN (DebugMcRec, debugMcRec, int8_t ); // debug flag for mis-association reconstruction level
21192124// mapping of decay types
21202125enum DecayType { LbToLcPi }; // move this to a dedicated cascade namespace in the future?
@@ -2169,23 +2174,25 @@ using HfCandLb = soa::Join<HfCandLbExt, HfCandLbProngs>;
21692174// table with results of reconstruction level MC matching
21702175DECLARE_SOA_TABLE (HfCandLbMcRec, " AOD" , " HFCANDLBMCREC" , // !
21712176 hf_cand_lb::FlagMcMatchRec,
2177+ hf_cand_lb::FlagMcDecayChanRec,
21722178 hf_cand_lb::OriginMcRec,
21732179 hf_cand_lb::DebugMcRec);
21742180
21752181// table with results of generator level MC matching
21762182DECLARE_SOA_TABLE (HfCandLbMcGen, " AOD" , " HFCANDLBMCGEN" , // !
21772183 hf_cand_lb::FlagMcMatchGen,
2184+ hf_cand_lb::FlagMcDecayChanGen,
21782185 hf_cand_lb::OriginMcGen);
21792186
21802187// specific B0 candidate properties
21812188namespace hf_cand_b0
21822189{
21832190DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // D index
21842191// MC matching result:
2185- DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2186- DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // reconstruction level
2187- DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // generator level
2188- DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // generator level
2192+ DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // main decay channel, reconstruction level
2193+ DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // main decay channel, generator level
2194+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // resonant decay channel, reconstruction level
2195+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // resonant decay channel, generator level
21892196DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
21902197DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
21912198DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
@@ -2262,10 +2269,10 @@ namespace hf_cand_bs
22622269{
22632270DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfCand3Prong, " _0" ); // Ds index
22642271// MC matching result:
2265- DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // reconstruction level
2266- DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // reconstruction level
2267- DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // generator level
2268- DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // reconstruction level
2272+ DECLARE_SOA_COLUMN (FlagMcMatchRec, flagMcMatchRec, int8_t ); // main decay channel, reconstruction level
2273+ DECLARE_SOA_COLUMN (FlagMcMatchGen, flagMcMatchGen , int8_t ); // main decay channel, generator level
2274+ DECLARE_SOA_COLUMN (FlagMcDecayChanRec, flagMcDecayChanRec , int8_t ); // resonant decay channel, reconstruction level
2275+ DECLARE_SOA_COLUMN (FlagMcDecayChanGen, flagMcDecayChanGen, int8_t ); // resonant decay channel, generator level
22692276DECLARE_SOA_COLUMN (OriginMcRec, originMcRec, int8_t ); // particle origin, reconstruction level
22702277DECLARE_SOA_COLUMN (OriginMcGen, originMcGen, int8_t ); // particle origin, generator level
22712278DECLARE_SOA_COLUMN (FlagWrongCollision, flagWrongCollision, int8_t ); // reconstruction level
0 commit comments