Merge branch 'TauSubstructure' into 'master'

tauRecTools: move TauPi0ClusterScaler to src

See merge request atlas/athena!33934

Reconstruction/tauRecTools/Root/LinkDef.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "tauRecTools/TauCalibrateLC.h"
@@ -25,10 +25,6 @@
 #pragma link off all functions;
 #pragma link C++ nestedclass;
 
-#endif
-
-#ifdef __CINT__
-
 #pragma link C++ class TauCalibrateLC+;
 #pragma link C++ class TauCommonCalcVars+;
 #pragma link C++ class TauSubstructureVariables+;

Reconstruction/tauRecTools/Root/TauPi0ClusterScaler.cxx → Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx

@@ -12,7 +12,7 @@
 
 #include <vector>
 
-#include "tauRecTools/TauPi0ClusterScaler.h"
+#include "TauPi0ClusterScaler.h"
 #include "xAODTau/TauJet.h"
 #include "xAODPFlow/PFO.h"
 #include "tauRecTools/ITauToolBase.h"

Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx

@@ -8,8 +8,10 @@
 #include "../TauShotFinder.h"
 #include "../TauPi0ClusterCreator.h"
 #include "../TauPi0CreateROI.h"
+#include "../TauPi0ClusterScaler.h"
 #include "../TauVertexVariables.h"
 #endif
+
 #include "tauRecTools/TauCalibrateLC.h"
 #include "tauRecTools/TauCommonCalcVars.h"
 #include "tauRecTools/TauSubstructureVariables.h"
@@ -18,7 +20,6 @@
 #include "tauRecTools/TauTrackClassifier.h"
 #include "tauRecTools/TauTrackRNNClassifier.h"
 #include "tauRecTools/CombinedP4FromRecoTaus.h"
-#include "tauRecTools/TauPi0ClusterScaler.h"
 #include "tauRecTools/TauPi0ScoreCalculator.h"
 #include "tauRecTools/TauPi0Selector.h"
 #include "tauRecTools/TauWPDecorator.h"
@@ -37,6 +38,7 @@ DECLARE_COMPONENT( TauElectronVetoVariables )
 DECLARE_COMPONENT( TauShotFinder )
 DECLARE_COMPONENT( TauPi0ClusterCreator )
 DECLARE_COMPONENT( TauPi0CreateROI )
+DECLARE_COMPONENT( TauPi0ClusterScaler )
 DECLARE_COMPONENT( TauVertexVariables )
 #endif
 
@@ -50,7 +52,6 @@ DECLARE_COMPONENT( tauRecTools::TrackRNN )
 DECLARE_COMPONENT( CombinedP4FromRecoTaus )
 DECLARE_COMPONENT( TauSubstructureVariables )
 DECLARE_COMPONENT( TauCommonCalcVars )
-DECLARE_COMPONENT( TauPi0ClusterScaler )
 DECLARE_COMPONENT( TauPi0ScoreCalculator )
 DECLARE_COMPONENT( TauPi0Selector )
 DECLARE_COMPONENT( TauWPDecorator )