From 05f80aaba12eca4ea4fede703371ea6880c38021 Mon Sep 17 00:00:00 2001 From: Jiahui Zhuo <jiahui.zhuo@cern.ch> Date: Wed, 5 Jul 2023 09:21:29 +0200 Subject: [PATCH 1/2] Add test to new ValueOr --- .../option_davinci_tupling_DTF_substitutePID.py | 10 +++++++++- .../tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py index 9aecea2af..65f3d37a3 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py @@ -87,7 +87,15 @@ def main(options: Options): } ) - variables = {"ALL": variables_all} + variables_decay = FunctorCollection( + { + # Test the invalid value for LinAlg::Vec + "DTF_JpsiKst_ENDVERTEX": F.VALUE_OR((-1,-1,-1)) @ DTF_JpsiKst( F.ENDVERTEX_POS ), + "DTF_JpsiPhi_ENDVERTEX": F.VALUE_OR((-1,-1,-1)) @ DTF_JpsiPhi( F.ENDVERTEX_POS ) + } + ) + + variables = {"ALL": variables_all, 'Bs': variables_decay} # Configure Funtuple algorithm tuple_data = Funtuple( diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt index 24d1aab1f..8216f6265 100644 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt @@ -32,6 +32,7 @@ from ROOT import TFile B_vars_stored = ['Bs_DTF_JpsiKst_CHI2DOF', 'Bs_DTF_JpsiKst_ENERGY', 'Bs_DTF_JpsiKst_ID', 'Bs_DTF_JpsiKst_M', 'Bs_DTF_JpsiKst_P', 'Bs_DTF_JpsiPhi_CHI2DOF', 'Bs_DTF_JpsiPhi_ENERGY', 'Bs_DTF_JpsiPhi_ID', 'Bs_DTF_JpsiPhi_M', 'Bs_DTF_JpsiPhi_P', 'Bs_ORIGINAL_CHI2DOF', 'Bs_ORIGINAL_ENERGY', 'Bs_ORIGINAL_ID', 'Bs_ORIGINAL_M', 'Bs_ORIGINAL_P', 'Jpsi_DTF_JpsiKst_CHI2DOF', 'Jpsi_DTF_JpsiKst_ENERGY', 'Jpsi_DTF_JpsiKst_ID', 'Jpsi_DTF_JpsiKst_M', 'Jpsi_DTF_JpsiKst_P', 'Jpsi_DTF_JpsiPhi_CHI2DOF', 'Jpsi_DTF_JpsiPhi_ENERGY', 'Jpsi_DTF_JpsiPhi_ID', 'Jpsi_DTF_JpsiPhi_M', 'Jpsi_DTF_JpsiPhi_P', 'Jpsi_ORIGINAL_CHI2DOF', 'Jpsi_ORIGINAL_ENERGY', 'Jpsi_ORIGINAL_ID', 'Jpsi_ORIGINAL_M', 'Jpsi_ORIGINAL_P', 'KM_DTF_JpsiKst_CHI2DOF', 'KM_DTF_JpsiKst_ENERGY', 'KM_DTF_JpsiKst_ID', 'KM_DTF_JpsiKst_M', 'KM_DTF_JpsiKst_P', 'KM_DTF_JpsiPhi_CHI2DOF', 'KM_DTF_JpsiPhi_ENERGY', 'KM_DTF_JpsiPhi_ID', 'KM_DTF_JpsiPhi_M', 'KM_DTF_JpsiPhi_P', 'KM_ORIGINAL_CHI2DOF', 'KM_ORIGINAL_ENERGY', 'KM_ORIGINAL_ID', 'KM_ORIGINAL_M', 'KM_ORIGINAL_P', 'KP_DTF_JpsiKst_CHI2DOF', 'KP_DTF_JpsiKst_ENERGY', 'KP_DTF_JpsiKst_ID', 'KP_DTF_JpsiKst_M', 'KP_DTF_JpsiKst_P', 'KP_DTF_JpsiPhi_CHI2DOF', 'KP_DTF_JpsiPhi_ENERGY', 'KP_DTF_JpsiPhi_ID', 'KP_DTF_JpsiPhi_M', 'KP_DTF_JpsiPhi_P', 'KP_ORIGINAL_CHI2DOF', 'KP_ORIGINAL_ENERGY', 'KP_ORIGINAL_ID', 'KP_ORIGINAL_M', 'KP_ORIGINAL_P', 'MuM_DTF_JpsiKst_CHI2DOF', 'MuM_DTF_JpsiKst_ENERGY', 'MuM_DTF_JpsiKst_ID', 'MuM_DTF_JpsiKst_M', 'MuM_DTF_JpsiKst_P', 'MuM_DTF_JpsiPhi_CHI2DOF', 'MuM_DTF_JpsiPhi_ENERGY', 'MuM_DTF_JpsiPhi_ID', 'MuM_DTF_JpsiPhi_M', 'MuM_DTF_JpsiPhi_P', 'MuM_ORIGINAL_CHI2DOF', 'MuM_ORIGINAL_ENERGY', 'MuM_ORIGINAL_ID', 'MuM_ORIGINAL_M', 'MuM_ORIGINAL_P', 'MuP_DTF_JpsiKst_CHI2DOF', 'MuP_DTF_JpsiKst_ENERGY', 'MuP_DTF_JpsiKst_ID', 'MuP_DTF_JpsiKst_M', 'MuP_DTF_JpsiKst_P', 'MuP_DTF_JpsiPhi_CHI2DOF', 'MuP_DTF_JpsiPhi_ENERGY', 'MuP_DTF_JpsiPhi_ID', 'MuP_DTF_JpsiPhi_M', 'MuP_DTF_JpsiPhi_P', 'MuP_ORIGINAL_CHI2DOF', 'MuP_ORIGINAL_ENERGY', 'MuP_ORIGINAL_ID', 'MuP_ORIGINAL_M', 'MuP_ORIGINAL_P', 'Phi_DTF_JpsiKst_CHI2DOF', 'Phi_DTF_JpsiKst_ENERGY', 'Phi_DTF_JpsiKst_ID', 'Phi_DTF_JpsiKst_M', 'Phi_DTF_JpsiKst_P', 'Phi_DTF_JpsiPhi_CHI2DOF', 'Phi_DTF_JpsiPhi_ENERGY', 'Phi_DTF_JpsiPhi_ID', 'Phi_DTF_JpsiPhi_M', 'Phi_DTF_JpsiPhi_P', 'Phi_ORIGINAL_CHI2DOF', 'Phi_ORIGINAL_ENERGY', 'Phi_ORIGINAL_ID', 'Phi_ORIGINAL_M', 'Phi_ORIGINAL_P'] B_vars_stored += ['RUNNUMBER', 'EVENTNUMBER'] +B_vars_stored += ['Bs_DTF_JpsiKst_ENDVERTEX', 'Bs_DTF_JpsiPhi_ENDVERTEX'] #sort the expected vars -- GitLab From 8db51a85862b85627c371ac32b3b033ee4eef930 Mon Sep 17 00:00:00 2001 From: Gitlab CI <noreply@cern.ch> Date: Wed, 5 Jul 2023 07:22:00 +0000 Subject: [PATCH 2/2] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/DaVinci/-/jobs/30801995 --- .../tupling/option_davinci_tupling_DTF_substitutePID.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py index 65f3d37a3..d7cdd5009 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py @@ -90,12 +90,14 @@ def main(options: Options): variables_decay = FunctorCollection( { # Test the invalid value for LinAlg::Vec - "DTF_JpsiKst_ENDVERTEX": F.VALUE_OR((-1,-1,-1)) @ DTF_JpsiKst( F.ENDVERTEX_POS ), - "DTF_JpsiPhi_ENDVERTEX": F.VALUE_OR((-1,-1,-1)) @ DTF_JpsiPhi( F.ENDVERTEX_POS ) + "DTF_JpsiKst_ENDVERTEX": F.VALUE_OR((-1, -1, -1)) + @ DTF_JpsiKst(F.ENDVERTEX_POS), + "DTF_JpsiPhi_ENDVERTEX": F.VALUE_OR((-1, -1, -1)) + @ DTF_JpsiPhi(F.ENDVERTEX_POS), } ) - variables = {"ALL": variables_all, 'Bs': variables_decay} + variables = {"ALL": variables_all, "Bs": variables_decay} # Configure Funtuple algorithm tuple_data = Funtuple( -- GitLab