Merge branch 'apearce-remove-tupletoolannpid' into 'master'

Don't run TupleToolANNPID.

See merge request !381

DaVinciTests/tests/options/TurboMC_2015.py

@@ -17,6 +17,9 @@ from TeslaTools import TeslaTruthUtils
 hlt2_line = 'Hlt2CharmHadDstp2D0Pip_D02KmPipTurbo'
 
 dtt = DecayTreeTuple('TupleDstToD0pi_D0ToKpi')
+# Don't run TupleToolANNPID; we don't have access to Run 2 tunings on the
+# master branch
+dtt.ToolList = ['TupleToolGeometry', 'TupleToolKinematic', 'TupleToolPid']
 dtt.Inputs = ['{0}/Particles'.format(hlt2_line)]
 dtt.Decay = '[D*(2010)+ -> ^(D0 -> ^K- ^pi+) ^pi+]CC'
 dtt.addBranches({

DaVinciTests/tests/options/TurboMC_2016.py

@@ -17,6 +17,9 @@ from TeslaTools import TeslaTruthUtils
 hlt2_line = 'Hlt2CharmHadDstp2D0Pip_D02KmPipTurbo'
 
 dtt = DecayTreeTuple('TupleDstToD0pi_D0ToKpi')
+# Don't run TupleToolANNPID; we don't have access to Run 2 tunings on the
+# master branch
+dtt.ToolList = ['TupleToolGeometry', 'TupleToolKinematic', 'TupleToolPid']
 dtt.Inputs = ['{0}/Particles'.format(hlt2_line)]
 dtt.Decay = '[D*(2010)+ -> ^(D0 -> ^K- ^pi+) ^pi+]CC'
 dtt.addBranches({

DaVinciTests/tests/options/TurboMC_2016_uDST.py

@@ -24,6 +24,9 @@ from TeslaTools import TeslaTruthUtils
 hlt2_line = 'Hlt2CharmHadLcpToPpKmPipTurbo'
 
 dtt = DecayTreeTuple('TupleLcTopKpi')
+# Don't run TupleToolANNPID; we don't have access to Run 2 tunings on the
+# master branch
+dtt.ToolList = ['TupleToolGeometry', 'TupleToolKinematic', 'TupleToolPid']
 dtt.Inputs = ['{0}/Particles'.format(hlt2_line)]
 dtt.Decay = '[Lambda_c+ -> ^p+ ^K- ^pi+]CC'
 dtt.addBranches({
@@ -74,6 +77,7 @@ selseq = SelectionSequence(
     TopSelection=combiner_sel
 )
 sc_dtt = DecayTreeTuple('TupleScToLcpi_LcTopKpi')
+sc_dtt.ToolList = dtt.ToolList
 sc_dtt.Inputs = [combiner_sel.outputLocation()]
 sc_dtt.Decay = '[(Sigma_c++|Sigma_c0) -> ^(Lambda_c+ -> ^p+ ^K- ^pi+) ^X]CC'
 sc_dtt.addBranches({