From 9e0a05612b37acf5940de11909e622aa92ba9bc3 Mon Sep 17 00:00:00 2001 From: Walter Lampl <walter.lampl@cern.ch> Date: Tue, 7 Sep 2021 09:04:27 +0200 Subject: [PATCH] Merge branch 'extClusterFlag' into 'master' CaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobProperty See merge request atlas/athena!46267 (cherry picked from commit 9015f09048f14762233a2966ab059c52ecf8ac06) b76d9eba CaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobProperty ad2fd7bc change default value of doExtendedClusterMoments to false e6883364 Revert "change default value of doExtendedClusterMoments to false" d9df8dd0 update content ref master_q221_AOD_content.ref e34abf4a re-add mem & timing lines to master_q221_AOD_content.ref --- .../data/master_q221_AOD_content.ref | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/Tools/PROCTools/data/master_q221_AOD_content.ref b/Tools/PROCTools/data/master_q221_AOD_content.ref index 44f07a51d6e3..e790352465fc 100644 --- a/Tools/PROCTools/data/master_q221_AOD_content.ref +++ b/Tools/PROCTools/data/master_q221_AOD_content.ref @@ -991,8 +991,30 @@ HLT_DimuEF HLT_DimuEFAux. HLT_DisTrkBDTSel HLT_DisTrkBDTSelAux. +HLT_DisTrkBDTSelAuxDyn.disTrk_bdtscore +HLT_DisTrkBDTSelAuxDyn.disTrk_category +HLT_DisTrkBDTSelAuxDyn.disTrk_chi2 +HLT_DisTrkBDTSelAuxDyn.disTrk_chi2ndof_pix +HLT_DisTrkBDTSelAuxDyn.disTrk_d0_wrtVtx +HLT_DisTrkBDTSelAuxDyn.disTrk_eta +HLT_DisTrkBDTSelAuxDyn.disTrk_is_fail +HLT_DisTrkBDTSelAuxDyn.disTrk_iso3_dr01 +HLT_DisTrkBDTSelAuxDyn.disTrk_iso3_dr02 +HLT_DisTrkBDTSelAuxDyn.disTrk_n_hits_innermost +HLT_DisTrkBDTSelAuxDyn.disTrk_n_hits_pix +HLT_DisTrkBDTSelAuxDyn.disTrk_n_hits_sct +HLT_DisTrkBDTSelAuxDyn.disTrk_ndof +HLT_DisTrkBDTSelAuxDyn.disTrk_phi +HLT_DisTrkBDTSelAuxDyn.disTrk_pt +HLT_DisTrkBDTSelAuxDyn.disTrk_refit_chi2 +HLT_DisTrkBDTSelAuxDyn.disTrk_refit_d0_wrtVtx +HLT_DisTrkBDTSelAuxDyn.disTrk_refit_ndof +HLT_DisTrkBDTSelAuxDyn.disTrk_refit_pt +HLT_DisTrkBDTSelAuxDyn.disTrk_refit_z0_wrtVtx +HLT_DisTrkBDTSelAuxDyn.disTrk_z0_wrtVtx HLT_DisTrkCand HLT_DisTrkCandAux. +HLT_DisTrkCandAuxDyn.disTrkCand_category HLT_DisTrkCandAuxDyn.disTrkCand_chi2 HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_ibl HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_pix1 @@ -1006,6 +1028,7 @@ HLT_DisTrkCandAuxDyn.disTrkCand_d0 HLT_DisTrkCandAuxDyn.disTrkCand_d0_wrtVtx HLT_DisTrkCandAuxDyn.disTrkCand_eta HLT_DisTrkCandAuxDyn.disTrkCand_eta_wrtVtx +HLT_DisTrkCandAuxDyn.disTrkCand_is_fail HLT_DisTrkCandAuxDyn.disTrkCand_iso1_dr01 HLT_DisTrkCandAuxDyn.disTrkCand_iso1_dr02 HLT_DisTrkCandAuxDyn.disTrkCand_iso1_dr04 @@ -1133,6 +1156,23 @@ HLT_HIEventShapeEG HLT_HIEventShapeEGAux. HLT_HPtdEdxTrk HLT_HPtdEdxTrkAux. +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_a0beam +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_dedx +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_eta +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p45 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p50 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p55 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p60 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p65 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p70 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p75 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hdedx_hits_1p80 +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hits_inner +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hits_innermost +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hits_pix +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_n_hits_sct +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_phi +HLT_HPtdEdxTrkAuxDyn.HPtdEdxTrk_pt HLT_HitDV HLT_HitDVAux. HLT_HitDVAuxDyn.hitDV_bdt_score -- GitLab