diff --git a/Reconstruction/tauRec/python/tauRecFlags.py b/Reconstruction/tauRec/python/tauRecFlags.py
index 4921378e371b794b115f799fbc030184177fa71f..586f9a66f48cd6327dd1974ed9c73c66050d7180 100644
--- a/Reconstruction/tauRec/python/tauRecFlags.py
+++ b/Reconstruction/tauRec/python/tauRecFlags.py
@@ -107,7 +107,7 @@ class tauRecRNNTrackClassificationConfig(JobProperty):
"""
statusOn=True
allowedTypes=['string']
- StoredValue="RNNTrackClassifier.2021-04-28_14-53-11_90_15_30.json"
+ StoredValue="RNNTrackClassifier_2021-07-19_14-25-14_90_25_30.json"
class tauRecDecayModeNNClassifierConfig(JobProperty):
"""Config file for TauDecayModeNNClassifier
diff --git a/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx b/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx
index ddf8464cb07cf1072373539aadc1fcfe904d057e..a79a9906a850ccbd8a03b7877aaea58570c46b0a 100644
--- a/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx
+++ b/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx
@@ -259,8 +259,8 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks,
}
valueMap["log(trackPt)"] = std::vector<double>(n_timeSteps);
- valueMap["log(tauPtIntermediateAxis)"] = std::vector<double>(n_timeSteps);
- valueMap["(trackPt/tauPtIntermediateAxis[0])"] = std::vector<double>(n_timeSteps);
+ valueMap["log(jetSeedPt)"] = std::vector<double>(n_timeSteps);
+ valueMap["trackPt/tauPtIntermediateAxis"] = std::vector<double>(n_timeSteps);
valueMap["trackEta"] = std::vector<double>(n_timeSteps);
valueMap["z0sinthetaTJVA"] = std::vector<double>(n_timeSteps);
valueMap["z0sinthetaSigTJVA"] = std::vector<double>(n_timeSteps);
@@ -275,7 +275,7 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks,
valueMap["numberOfPixelSharedHits"] = std::vector<double>(n_timeSteps);
valueMap["numberOfSCTSharedHits"] = std::vector<double>(n_timeSteps);
valueMap["numberOfTRTHits"] = std::vector<double>(n_timeSteps);
- valueMap["eProbabilityNNorHT"] = std::vector<double>(n_timeSteps);
+ valueMap["eProbabilityHT"] = std::vector<double>(n_timeSteps);
valueMap["nPixHits"] = std::vector<double>(n_timeSteps);
valueMap["nSCTHits"] = std::vector<double>(n_timeSteps);
valueMap["dz0_TV_PV0"] = std::vector<double>(n_timeSteps);
@@ -286,7 +286,7 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks,
valueMap["charge"] = std::vector<double>(n_timeSteps);
// tau variable
- double log_ptIntermediateAxis = std::log( xTau.ptIntermediateAxis() );
+ double log_ptJetSeed = std::log( xTau.ptJetSeed() );
// vertex variables
double dz0_TV_PV0 = 0., sumpt_TV = 0., sumpt2_TV = 0., sumpt_PV0 = 0., sumpt2_PV0 = 0.;
@@ -310,7 +310,6 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks,
// track variables
unsigned int i = 0;
- static const SG::AuxElement::ConstAccessor<float> acc_eProbabilityNN("eProbabilityNN");
for(xAOD::TauTrack* xTrack : vTracks)
{
@@ -324,15 +323,11 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks,
uint8_t nSCTSharedHits = 0; ATH_CHECK( xTrackParticle->summaryValue(nSCTSharedHits, xAOD::numberOfSCTSharedHits) );
uint8_t nSCTDeadSensors = 0; ATH_CHECK( xTrackParticle->summaryValue(nSCTDeadSensors, xAOD::numberOfSCTDeadSensors) );
uint8_t nTRTHits = 0; ATH_CHECK( xTrackParticle->summaryValue(nTRTHits, xAOD::numberOfTRTHits) );
- // currently not used, to be considered for future trainings
- //uint8_t nTRTHighThresholdHits = 0; ATH_CHECK( xTrackParticle->summaryValue(nTRTHighThresholdHits, xAOD::numberOfTRTHighThresholdHits) );
float eProbabilityHT; ATH_CHECK( xTrackParticle->summaryValue( eProbabilityHT, xAOD::eProbabilityHT) );
- float eProbabilityNN = acc_eProbabilityNN(*xTrackParticle);
- float eProbabilityNNorHT = (xTrackParticle->pt()>2000.) ? eProbabilityNN : eProbabilityHT;
valueMap["log(trackPt)"][i] = std::log( xTrackParticle->pt() );
- valueMap["log(tauPtIntermediateAxis)"][i] = log_ptIntermediateAxis;
- valueMap["(trackPt/tauPtIntermediateAxis[0])"][i] = xTrackParticle->pt()/xTau.ptIntermediateAxis();
+ valueMap["log(jetSeedPt)"][i] = log_ptJetSeed;
+ valueMap["trackPt/tauPtIntermediateAxis"][i] = xTrackParticle->pt()/xTau.ptIntermediateAxis();
valueMap["trackEta"][i] = xTrackParticle->eta();
valueMap["z0sinthetaTJVA"][i] = xTrack->z0sinthetaTJVA();
valueMap["z0sinthetaSigTJVA"][i] = xTrack->z0sinthetaSigTJVA();
@@ -347,7 +342,7 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks,
valueMap["numberOfPixelSharedHits"][i] = (double) nPixelSharedHits;
valueMap["numberOfSCTSharedHits"][i] = (double) nSCTSharedHits;
valueMap["numberOfTRTHits"][i] = (double) nTRTHits;
- valueMap["eProbabilityNNorHT"][i] = eProbabilityNNorHT;
+ valueMap["eProbabilityHT"][i] = eProbabilityHT;
valueMap["nPixHits"][i] = (double) (nPixelHits + nPixelDeadSensors);
valueMap["nSCTHits"][i] = (double) (nSCTHits + nSCTDeadSensors);
valueMap["dz0_TV_PV0"][i] = dz0_TV_PV0;
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref b/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
index d15ded161df89a473cd1aec9c530a664648834a9..851baef8f07037413dfd99406990530c3a72b4a7 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
@@ -420,14 +420,14 @@
330470 1183932465 456 541 3 11 0 11 17 0 17
330470 1183933264 514 450 2 4 0 4 10 0 10
330470 1183934061 556 608 1 15 0 15 31 0 31
- 330470 1183934188 559 638 0 11 0 11 28 0 28
+ 330470 1183934188 559 640 0 11 0 11 28 0 28
330470 1183935176 505 635 1 7 0 7 21 0 21
330470 1183935243 406 422 3 15 0 15 26 0 26
330470 1183936048 505 442 0 13 0 13 24 0 24
330470 1183937915 358 330 0 5 0 5 9 0 9
330470 1183937927 530 536 2 8 0 8 24 0 24
330470 1183938712 427 382 1 2 0 2 20 0 20
- 330470 1183938824 345 395 2 3 0 3 11 0 11
+ 330470 1183938824 345 394 2 3 0 3 11 0 11
330470 1183939219 533 500 2 9 0 9 16 0 16
330470 1183939285 273 161 0 5 0 5 8 0 8
330470 1183939881 561 508 3 6 0 6 22 0 22