Merge branch 'AM_invalidvalue_tistos' into 'master'

Followup from Rec!3375 (improve invalid value handling for tistos)

See merge request !893

DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_tistos.qmt

@@ -33,7 +33,7 @@ from DaVinciTests.QMTest.DaVinciExclusions import preprocessor, counter_preproce
 import sys, os, glob
 from ROOT import TFile
 
-B_vars_stored =['phi2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Km2_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km2_PT', 'Kp2_PT', 'Bs_Hlt1_Hlt1TrackMVADecision_TOS', 'Bs_PT', 'Kp2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Km1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'phi1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Kp2_Hlt1_Hlt1TrackMVADecision_TOS', 'Kp2_Hlt1_Hlt1TrackMVADecision_TIS', 'Kp2_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Bs_Hlt1_Hlt1TrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TrackMVADecision_TOS', 'phi2_Hlt1_Hlt1TrackMVADecision_TOS', 'Kp1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Kp1_Hlt1_Hlt1TrackMVADecision_TOS', 'Km1_Hlt1_Hlt1TrackMVADecision_TIS', 'Km1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'phi2_PT', 'Kp1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TrackMVADecision_TIS', 'phi2_Hlt1_Hlt1TrackMVADecision_TIS', 'phi1_PT', 'Hlt1_Hlt1TrackMVADecision', 'Hlt1_TCK', 'Kp1_Hlt1_Hlt1TrackMVADecision_TIS', 'Hlt1_Hlt1TwoTrackMVADecision', 'Kp1_PT', 'Km2_Hlt1_Hlt1TrackMVADecision_TIS', 'Bs_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km1_Hlt1_Hlt1TrackMVADecision_TOS', 'Km2_Hlt1_Hlt1TrackMVADecision_TOS', 'Km1_PT', 'Bs_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi2_Hlt1_Hlt1TwoTrackMVADecision_TOS']
+B_vars_stored =['phi2_Hlt1TwoTrackMVADecision_TIS', 'Km2_Hlt1TwoTrackMVADecision_TOS', 'Km2_PT', 'Kp2_PT', 'Bs_Hlt1TrackMVADecision_TOS', 'Bs_PT', 'Kp2_Hlt1TwoTrackMVADecision_TIS', 'Km1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1TwoTrackMVADecision_TOS', 'phi1_Hlt1TwoTrackMVADecision_TIS', 'Kp2_Hlt1TrackMVADecision_TOS', 'Kp2_Hlt1TrackMVADecision_TIS', 'Kp2_Hlt1TwoTrackMVADecision_TOS', 'Bs_Hlt1TrackMVADecision_TIS', 'phi1_Hlt1TrackMVADecision_TOS', 'phi2_Hlt1TrackMVADecision_TOS', 'Kp1_Hlt1TwoTrackMVADecision_TOS', 'Km2_Hlt1TwoTrackMVADecision_TIS', 'Kp1_Hlt1TrackMVADecision_TOS', 'Km1_Hlt1TrackMVADecision_TIS', 'Km1_Hlt1TwoTrackMVADecision_TOS', 'phi2_PT', 'Kp1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1TrackMVADecision_TIS', 'phi2_Hlt1TrackMVADecision_TIS', 'phi1_PT', 'Hlt1_Hlt1TrackMVADecision', 'Hlt1_TCK', 'Kp1_Hlt1TrackMVADecision_TIS', 'Hlt1_Hlt1TwoTrackMVADecision', 'Kp1_PT', 'Km2_Hlt1TrackMVADecision_TIS', 'Bs_Hlt1TwoTrackMVADecision_TOS', 'Km1_Hlt1TrackMVADecision_TOS', 'Km2_Hlt1TrackMVADecision_TOS', 'Km1_PT', 'Bs_Hlt1TwoTrackMVADecision_TIS', 'phi2_Hlt1TwoTrackMVADecision_TOS']
 B_vars_stored += ['RUNNUMBER', 'EVENTNUMBER']
 
 #sort the expected vars
@@ -55,8 +55,8 @@ if len(B_excluded_2) != 0: raise Exception('Number of stored variables is greate
 
 entry_num = 0
 for entry in t_B:
-    tos = entry.Bs_Hlt1_Hlt1TrackMVADecision_TOS
-    tis = entry.Bs_Hlt1_Hlt1TrackMVADecision_TIS
+    tos = entry.Bs_Hlt1TrackMVADecision_TOS
+    tis = entry.Bs_Hlt1TrackMVADecision_TIS
     dec = entry.Hlt1_Hlt1TrackMVADecision
     #None of the candidates we ran are TOB i.e. (!tis and !tos and dec)
     # we check that (tis | tos) == dec