diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-mc-reconstructible-reconstructed.py b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-mc-reconstructible-reconstructed.py index d2d8c54d63e5d3b45956086417a0d455b8c39a6f..5f4d888d69a357476378a3832af505833e4a6c67 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-mc-reconstructible-reconstructed.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-mc-reconstructible-reconstructed.py @@ -60,13 +60,13 @@ def main(options: Options): relations_neutral=relations_neutral) #The option extra_info below is set to False by default in the functor collection. vars_rted = FC.MCReconstructed( - mcreconstructed_alg=mcrted_all, extra_info=False) + mcreconstructed_alg=mcrted_all, extra_info=True) #Note: # - Instead of importing functorcollections (FC.MCReconstructed), one # can directly add track related information using the helper class (DaVinciMCTools.MCReconstructed). # - A new functor can be added for e.g. vars_rtible["MC_HASUT"] = mcrtible(F.NEW_TRACK_FUNCTOR) - vars_rted['TRACK_TYPE[TRACK_INDX]'] = mcrted_all.TrackType - vars_rted['TRACK_HASUT[TRACK_INDX]'] = mcrted_all.HasUT + vars_rted['EXTRA_TRACK_TYPE[TRACK_INDX]'] = mcrted_all.TrackType + vars_rted['EXTRA_TRACK_HASUT[TRACK_INDX]'] = mcrted_all.HasUT print('Reconstructed functors:', vars_rted.functor_dict.keys()) # Variables diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_mc_recinfo.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_mc_recinfo.qmt index c5edbd2f23d348bd13a347ae16c4e505db895b85..afd6dcb1d08c7d5a50efb222a2c715472fcd0e9a 100644 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_mc_recinfo.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_mc_recinfo.qmt @@ -29,7 +29,7 @@ import sys, os from ROOT import TFile -B_vars_stored = ['B0_N_RECO_TRACKS', 'B0_RECONSTRUCTED', 'B0_TRACK_HASUT', 'B0_TRACK_INDX', 'B0_TRACK_MCASSOCWEIGHTS', 'B0_TRACK_TYPE', 'Dm_N_RECO_TRACKS', 'Dm_RECONSTRUCTED', 'Dm_TRACK_HASUT', 'Dm_TRACK_INDX', 'Dm_TRACK_MCASSOCWEIGHTS', 'Dm_TRACK_TYPE', 'Kplus_EXTRA_MC_HASUT', 'Kplus_EXTRA_MC_HASVELO', 'Kplus_MC_ACCT', 'Kplus_MC_ACCT1', 'Kplus_MC_ACCT1S', 'Kplus_MC_ACCT1X', 'Kplus_MC_ACCT2', 'Kplus_MC_ACCT2S', 'Kplus_MC_ACCT2X', 'Kplus_MC_ACCT3', 'Kplus_MC_ACCT3S', 'Kplus_MC_ACCT3X', 'Kplus_MC_ACCUT', 'Kplus_MC_ACCUT1', 'Kplus_MC_ACCUT2', 'Kplus_MC_ACCVELO', 'Kplus_MC_ACCVELO_AND_T', 'Kplus_MC_HAST', 'Kplus_MC_HAST1', 'Kplus_MC_HAST1S', 'Kplus_MC_HAST1X', 'Kplus_MC_HAST2', 'Kplus_MC_HAST2S', 'Kplus_MC_HAST2X', 'Kplus_MC_HAST3', 'Kplus_MC_HAST3S', 'Kplus_MC_HAST3X', 'Kplus_MC_HASUT', 'Kplus_MC_HASUT1', 'Kplus_MC_HASUT2', 'Kplus_MC_HASVELO', 'Kplus_MC_HASVELO_AND_T', 'Kplus_MC_RECONSTRUCTIBLE', 'Kplus_N_RECO_TRACKS', 'Kplus_RECONSTRUCTED', 'Kplus_TRACK_HASUT', 'Kplus_TRACK_INDX', 'Kplus_TRACK_MCASSOCWEIGHTS', 'Kplus_TRACK_TYPE', 'pim1_EXTRA_MC_HASUT', 'pim1_EXTRA_MC_HASVELO', 'pim1_MC_ACCT', 'pim1_MC_ACCT1', 'pim1_MC_ACCT1S', 'pim1_MC_ACCT1X', 'pim1_MC_ACCT2', 'pim1_MC_ACCT2S', 'pim1_MC_ACCT2X', 'pim1_MC_ACCT3', 'pim1_MC_ACCT3S', 'pim1_MC_ACCT3X', 'pim1_MC_ACCUT', 'pim1_MC_ACCUT1', 'pim1_MC_ACCUT2', 'pim1_MC_ACCVELO', 'pim1_MC_ACCVELO_AND_T', 'pim1_MC_HAST', 'pim1_MC_HAST1', 'pim1_MC_HAST1S', 'pim1_MC_HAST1X', 'pim1_MC_HAST2', 'pim1_MC_HAST2S', 'pim1_MC_HAST2X', 'pim1_MC_HAST3', 'pim1_MC_HAST3S', 'pim1_MC_HAST3X', 'pim1_MC_HASUT', 'pim1_MC_HASUT1', 'pim1_MC_HASUT2', 'pim1_MC_HASVELO', 'pim1_MC_HASVELO_AND_T', 'pim1_MC_RECONSTRUCTIBLE', 'pim1_N_RECO_TRACKS', 'pim1_RECONSTRUCTED', 'pim1_TRACK_HASUT', 'pim1_TRACK_INDX', 'pim1_TRACK_MCASSOCWEIGHTS', 'pim1_TRACK_TYPE', 'pim2_EXTRA_MC_HASUT', 'pim2_EXTRA_MC_HASVELO', 'pim2_MC_ACCT', 'pim2_MC_ACCT1', 'pim2_MC_ACCT1S', 'pim2_MC_ACCT1X', 'pim2_MC_ACCT2', 'pim2_MC_ACCT2S', 'pim2_MC_ACCT2X', 'pim2_MC_ACCT3', 'pim2_MC_ACCT3S', 'pim2_MC_ACCT3X', 'pim2_MC_ACCUT', 'pim2_MC_ACCUT1', 'pim2_MC_ACCUT2', 'pim2_MC_ACCVELO', 'pim2_MC_ACCVELO_AND_T', 'pim2_MC_HAST', 'pim2_MC_HAST1', 'pim2_MC_HAST1S', 'pim2_MC_HAST1X', 'pim2_MC_HAST2', 'pim2_MC_HAST2S', 'pim2_MC_HAST2X', 'pim2_MC_HAST3', 'pim2_MC_HAST3S', 'pim2_MC_HAST3X', 'pim2_MC_HASUT', 'pim2_MC_HASUT1', 'pim2_MC_HASUT2', 'pim2_MC_HASVELO', 'pim2_MC_HASVELO_AND_T', 'pim2_MC_RECONSTRUCTIBLE', 'pim2_N_RECO_TRACKS', 'pim2_RECONSTRUCTED', 'pim2_TRACK_HASUT', 'pim2_TRACK_INDX', 'pim2_TRACK_MCASSOCWEIGHTS', 'pim2_TRACK_TYPE', 'pip_EXTRA_MC_HASUT', 'pip_EXTRA_MC_HASVELO', 'pip_MC_ACCT', 'pip_MC_ACCT1', 'pip_MC_ACCT1S', 'pip_MC_ACCT1X', 'pip_MC_ACCT2', 'pip_MC_ACCT2S', 'pip_MC_ACCT2X', 'pip_MC_ACCT3', 'pip_MC_ACCT3S', 'pip_MC_ACCT3X', 'pip_MC_ACCUT', 'pip_MC_ACCUT1', 'pip_MC_ACCUT2', 'pip_MC_ACCVELO', 'pip_MC_ACCVELO_AND_T', 'pip_MC_HAST', 'pip_MC_HAST1', 'pip_MC_HAST1S', 'pip_MC_HAST1X', 'pip_MC_HAST2', 'pip_MC_HAST2S', 'pip_MC_HAST2X', 'pip_MC_HAST3', 'pip_MC_HAST3S', 'pip_MC_HAST3X', 'pip_MC_HASUT', 'pip_MC_HASUT1', 'pip_MC_HASUT2', 'pip_MC_HASVELO', 'pip_MC_HASVELO_AND_T', 'pip_MC_RECONSTRUCTIBLE', 'pip_N_RECO_TRACKS', 'pip_RECONSTRUCTED', 'pip_TRACK_HASUT', 'pip_TRACK_INDX', 'pip_TRACK_MCASSOCWEIGHTS', 'pip_TRACK_TYPE'] +B_vars_stored = ['B0_EXTRA_TRACK_HASUT', 'B0_EXTRA_TRACK_TYPE', 'B0_N_RECO_TRACKS', 'B0_RECONSTRUCTED', 'B0_TRACK_CHI2', 'B0_TRACK_CHI2DOF', 'B0_TRACK_FLAG', 'B0_TRACK_GHOSTPROB', 'B0_TRACK_HAST', 'B0_TRACK_HASUT', 'B0_TRACK_HASVELO', 'B0_TRACK_HISTORY', 'B0_TRACK_INDX', 'B0_TRACK_MCASSOCWEIGHTS', 'B0_TRACK_NDOF', 'B0_TRACK_NFTHITS', 'B0_TRACK_NHITS', 'B0_TRACK_NUTHITS', 'B0_TRACK_NVPHITS', 'B0_TRACK_PID_E', 'B0_TRACK_PID_K', 'B0_TRACK_PID_MU', 'B0_TRACK_PID_P', 'B0_TRACK_PID_PI', 'B0_TRACK_QOVERP', 'B0_TRACK_REFPOINT_X', 'B0_TRACK_REFPOINT_Y', 'B0_TRACK_REFPOINT_Z', 'B0_TRACK_TYPE', 'Dm_EXTRA_TRACK_HASUT', 'Dm_EXTRA_TRACK_TYPE', 'Dm_N_RECO_TRACKS', 'Dm_RECONSTRUCTED', 'Dm_TRACK_CHI2', 'Dm_TRACK_CHI2DOF', 'Dm_TRACK_FLAG', 'Dm_TRACK_GHOSTPROB', 'Dm_TRACK_HAST', 'Dm_TRACK_HASUT', 'Dm_TRACK_HASVELO', 'Dm_TRACK_HISTORY', 'Dm_TRACK_INDX', 'Dm_TRACK_MCASSOCWEIGHTS', 'Dm_TRACK_NDOF', 'Dm_TRACK_NFTHITS', 'Dm_TRACK_NHITS', 'Dm_TRACK_NUTHITS', 'Dm_TRACK_NVPHITS', 'Dm_TRACK_PID_E', 'Dm_TRACK_PID_K', 'Dm_TRACK_PID_MU', 'Dm_TRACK_PID_P', 'Dm_TRACK_PID_PI', 'Dm_TRACK_QOVERP', 'Dm_TRACK_REFPOINT_X', 'Dm_TRACK_REFPOINT_Y', 'Dm_TRACK_REFPOINT_Z', 'Dm_TRACK_TYPE', 'Kplus_EXTRA_MC_HASUT', 'Kplus_EXTRA_MC_HASVELO', 'Kplus_EXTRA_TRACK_HASUT', 'Kplus_EXTRA_TRACK_TYPE', 'Kplus_MC_ACCT', 'Kplus_MC_ACCT1', 'Kplus_MC_ACCT1S', 'Kplus_MC_ACCT1X', 'Kplus_MC_ACCT2', 'Kplus_MC_ACCT2S', 'Kplus_MC_ACCT2X', 'Kplus_MC_ACCT3', 'Kplus_MC_ACCT3S', 'Kplus_MC_ACCT3X', 'Kplus_MC_ACCUT', 'Kplus_MC_ACCUT1', 'Kplus_MC_ACCUT2', 'Kplus_MC_ACCVELO', 'Kplus_MC_ACCVELO_AND_T', 'Kplus_MC_HAST', 'Kplus_MC_HAST1', 'Kplus_MC_HAST1S', 'Kplus_MC_HAST1X', 'Kplus_MC_HAST2', 'Kplus_MC_HAST2S', 'Kplus_MC_HAST2X', 'Kplus_MC_HAST3', 'Kplus_MC_HAST3S', 'Kplus_MC_HAST3X', 'Kplus_MC_HASUT', 'Kplus_MC_HASUT1', 'Kplus_MC_HASUT2', 'Kplus_MC_HASVELO', 'Kplus_MC_HASVELO_AND_T', 'Kplus_MC_RECONSTRUCTIBLE', 'Kplus_N_RECO_TRACKS', 'Kplus_RECONSTRUCTED', 'Kplus_TRACK_CHI2', 'Kplus_TRACK_CHI2DOF', 'Kplus_TRACK_FLAG', 'Kplus_TRACK_GHOSTPROB', 'Kplus_TRACK_HAST', 'Kplus_TRACK_HASUT', 'Kplus_TRACK_HASVELO', 'Kplus_TRACK_HISTORY', 'Kplus_TRACK_INDX', 'Kplus_TRACK_MCASSOCWEIGHTS', 'Kplus_TRACK_NDOF', 'Kplus_TRACK_NFTHITS', 'Kplus_TRACK_NHITS', 'Kplus_TRACK_NUTHITS', 'Kplus_TRACK_NVPHITS', 'Kplus_TRACK_PID_E', 'Kplus_TRACK_PID_K', 'Kplus_TRACK_PID_MU', 'Kplus_TRACK_PID_P', 'Kplus_TRACK_PID_PI', 'Kplus_TRACK_QOVERP', 'Kplus_TRACK_REFPOINT_X', 'Kplus_TRACK_REFPOINT_Y', 'Kplus_TRACK_REFPOINT_Z', 'Kplus_TRACK_TYPE', 'pim1_EXTRA_MC_HASUT', 'pim1_EXTRA_MC_HASVELO', 'pim1_EXTRA_TRACK_HASUT', 'pim1_EXTRA_TRACK_TYPE', 'pim1_MC_ACCT', 'pim1_MC_ACCT1', 'pim1_MC_ACCT1S', 'pim1_MC_ACCT1X', 'pim1_MC_ACCT2', 'pim1_MC_ACCT2S', 'pim1_MC_ACCT2X', 'pim1_MC_ACCT3', 'pim1_MC_ACCT3S', 'pim1_MC_ACCT3X', 'pim1_MC_ACCUT', 'pim1_MC_ACCUT1', 'pim1_MC_ACCUT2', 'pim1_MC_ACCVELO', 'pim1_MC_ACCVELO_AND_T', 'pim1_MC_HAST', 'pim1_MC_HAST1', 'pim1_MC_HAST1S', 'pim1_MC_HAST1X', 'pim1_MC_HAST2', 'pim1_MC_HAST2S', 'pim1_MC_HAST2X', 'pim1_MC_HAST3', 'pim1_MC_HAST3S', 'pim1_MC_HAST3X', 'pim1_MC_HASUT', 'pim1_MC_HASUT1', 'pim1_MC_HASUT2', 'pim1_MC_HASVELO', 'pim1_MC_HASVELO_AND_T', 'pim1_MC_RECONSTRUCTIBLE', 'pim1_N_RECO_TRACKS', 'pim1_RECONSTRUCTED', 'pim1_TRACK_CHI2', 'pim1_TRACK_CHI2DOF', 'pim1_TRACK_FLAG', 'pim1_TRACK_GHOSTPROB', 'pim1_TRACK_HAST', 'pim1_TRACK_HASUT', 'pim1_TRACK_HASVELO', 'pim1_TRACK_HISTORY', 'pim1_TRACK_INDX', 'pim1_TRACK_MCASSOCWEIGHTS', 'pim1_TRACK_NDOF', 'pim1_TRACK_NFTHITS', 'pim1_TRACK_NHITS', 'pim1_TRACK_NUTHITS', 'pim1_TRACK_NVPHITS', 'pim1_TRACK_PID_E', 'pim1_TRACK_PID_K', 'pim1_TRACK_PID_MU', 'pim1_TRACK_PID_P', 'pim1_TRACK_PID_PI', 'pim1_TRACK_QOVERP', 'pim1_TRACK_REFPOINT_X', 'pim1_TRACK_REFPOINT_Y', 'pim1_TRACK_REFPOINT_Z', 'pim1_TRACK_TYPE', 'pim2_EXTRA_MC_HASUT', 'pim2_EXTRA_MC_HASVELO', 'pim2_EXTRA_TRACK_HASUT', 'pim2_EXTRA_TRACK_TYPE', 'pim2_MC_ACCT', 'pim2_MC_ACCT1', 'pim2_MC_ACCT1S', 'pim2_MC_ACCT1X', 'pim2_MC_ACCT2', 'pim2_MC_ACCT2S', 'pim2_MC_ACCT2X', 'pim2_MC_ACCT3', 'pim2_MC_ACCT3S', 'pim2_MC_ACCT3X', 'pim2_MC_ACCUT', 'pim2_MC_ACCUT1', 'pim2_MC_ACCUT2', 'pim2_MC_ACCVELO', 'pim2_MC_ACCVELO_AND_T', 'pim2_MC_HAST', 'pim2_MC_HAST1', 'pim2_MC_HAST1S', 'pim2_MC_HAST1X', 'pim2_MC_HAST2', 'pim2_MC_HAST2S', 'pim2_MC_HAST2X', 'pim2_MC_HAST3', 'pim2_MC_HAST3S', 'pim2_MC_HAST3X', 'pim2_MC_HASUT', 'pim2_MC_HASUT1', 'pim2_MC_HASUT2', 'pim2_MC_HASVELO', 'pim2_MC_HASVELO_AND_T', 'pim2_MC_RECONSTRUCTIBLE', 'pim2_N_RECO_TRACKS', 'pim2_RECONSTRUCTED', 'pim2_TRACK_CHI2', 'pim2_TRACK_CHI2DOF', 'pim2_TRACK_FLAG', 'pim2_TRACK_GHOSTPROB', 'pim2_TRACK_HAST', 'pim2_TRACK_HASUT', 'pim2_TRACK_HASVELO', 'pim2_TRACK_HISTORY', 'pim2_TRACK_INDX', 'pim2_TRACK_MCASSOCWEIGHTS', 'pim2_TRACK_NDOF', 'pim2_TRACK_NFTHITS', 'pim2_TRACK_NHITS', 'pim2_TRACK_NUTHITS', 'pim2_TRACK_NVPHITS', 'pim2_TRACK_PID_E', 'pim2_TRACK_PID_K', 'pim2_TRACK_PID_MU', 'pim2_TRACK_PID_P', 'pim2_TRACK_PID_PI', 'pim2_TRACK_QOVERP', 'pim2_TRACK_REFPOINT_X', 'pim2_TRACK_REFPOINT_Y', 'pim2_TRACK_REFPOINT_Z', 'pim2_TRACK_TYPE', 'pip_EXTRA_MC_HASUT', 'pip_EXTRA_MC_HASVELO', 'pip_EXTRA_TRACK_HASUT', 'pip_EXTRA_TRACK_TYPE', 'pip_MC_ACCT', 'pip_MC_ACCT1', 'pip_MC_ACCT1S', 'pip_MC_ACCT1X', 'pip_MC_ACCT2', 'pip_MC_ACCT2S', 'pip_MC_ACCT2X', 'pip_MC_ACCT3', 'pip_MC_ACCT3S', 'pip_MC_ACCT3X', 'pip_MC_ACCUT', 'pip_MC_ACCUT1', 'pip_MC_ACCUT2', 'pip_MC_ACCVELO', 'pip_MC_ACCVELO_AND_T', 'pip_MC_HAST', 'pip_MC_HAST1', 'pip_MC_HAST1S', 'pip_MC_HAST1X', 'pip_MC_HAST2', 'pip_MC_HAST2S', 'pip_MC_HAST2X', 'pip_MC_HAST3', 'pip_MC_HAST3S', 'pip_MC_HAST3X', 'pip_MC_HASUT', 'pip_MC_HASUT1', 'pip_MC_HASUT2', 'pip_MC_HASVELO', 'pip_MC_HASVELO_AND_T', 'pip_MC_RECONSTRUCTIBLE', 'pip_N_RECO_TRACKS', 'pip_RECONSTRUCTED', 'pip_TRACK_CHI2', 'pip_TRACK_CHI2DOF', 'pip_TRACK_FLAG', 'pip_TRACK_GHOSTPROB', 'pip_TRACK_HAST', 'pip_TRACK_HASUT', 'pip_TRACK_HASVELO', 'pip_TRACK_HISTORY', 'pip_TRACK_INDX', 'pip_TRACK_MCASSOCWEIGHTS', 'pip_TRACK_NDOF', 'pip_TRACK_NFTHITS', 'pip_TRACK_NHITS', 'pip_TRACK_NUTHITS', 'pip_TRACK_NVPHITS', 'pip_TRACK_PID_E', 'pip_TRACK_PID_K', 'pip_TRACK_PID_MU', 'pip_TRACK_PID_P', 'pip_TRACK_PID_PI', 'pip_TRACK_QOVERP', 'pip_TRACK_REFPOINT_X', 'pip_TRACK_REFPOINT_Y', 'pip_TRACK_REFPOINT_Z', 'pip_TRACK_TYPE'] #sort the expected vars B_vars_stored = sorted(B_vars_stored)