Merge branch '21.2-TAUP3dev-24112018' into '21.2'

Update TAUP3 to include 2p taus with pT>27 GeV

See merge request atlas/athena!16302

Former-commit-id: d4fb24115fa703af2232c3c6d0adda4f60c65206

PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP3.py

@@ -133,7 +133,7 @@ thinningTools += TAUP3TruthThinningTools
 # Skimming tool
 # =============================================
 muRequirement    = "( count( (Muons.pt > 22.0*GeV) && Muons.DFCommonGoodMuon && (Muons.muonType==0)) >= 1 )"
-tauRequirement   = "( count( (TauJets.pt > 18.0*GeV || TauJets.ptFinalCalib > 18.0*GeV) && (abs(TauJets.charge)==1.0) && ((TauJets.nTracks == 1) || (TauJets.nTracks == 3)) ) >= 1 )"
+tauRequirement   = "( count( ((TauJets.pt > 18.0*GeV || TauJets.ptFinalCalib > 18.0*GeV) &&  (abs(TauJets.charge)==1.0 && (TauJets.nTracks == 1 || TauJets.nTracks == 3)) ) || (TauJets.nTracks == 2 && TauJets.BDTJetScoreSigTrans > 0.03 && (TauJets.pt > 27.0*GeV || TauJets.ptFinalCalib > 27.0*GeV) ) ) >= 1 )"
 
 expression       = muRequirement + " && " + tauRequirement