Merge branch 'master-fixDFM' into 'master'

readding library in DerivationFrameworkMuons CmakeLists

See merge request !37914

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt

@@ -4,15 +4,19 @@
 atlas_subdir( DerivationFrameworkMuons )
 
 # External dependencies:
-find_package( CLHEP )
 find_package( ROOT COMPONENTS Core MathCore )
 
 # Component(s) in the package:
-atlas_add_component( DerivationFrameworkMuons
+#the library is used by the MCP software https://gitlab.cern.ch/atlas-mcp/MuonPerformanceAnalysis
+atlas_add_library( DerivationFrameworkMuonsLib
    DerivationFrameworkMuons/*.h src/*.cxx src/components/*.cxx
-   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AsgTools AthContainers AthenaBaseComps AthenaKernel CaloEvent CaloGeoHelpers DerivationFrameworkInterfaces ExpressionEvaluationLib FourMomUtils GaudiKernel ICaloTrkMuIdTools InDetTrackSelectionToolLib MCTruthClassifierLib RecoToolInterfaces TrigDecisionToolLib TrigMuonMatchingLib TrkExInterfaces TrkParameters TrkSurfaces muonEvent xAODBase xAODCaloEvent xAODEventInfo xAODJet xAODMuon xAODPrimitives xAODTracking xAODTruth )
+   PUBLIC_HEADERS DerivationFrameworkMuons
+   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthContainers AthenaBaseComps AthenaKernel CaloEvent CaloGeoHelpers DerivationFrameworkInterfaces ExpressionEvaluationLib FourMomUtils GaudiKernel ICaloTrkMuIdTools InDetTrackSelectionToolLib MCTruthClassifierLib RecoToolInterfaces TrigDecisionToolLib TrigMuonMatchingLib TrkExInterfaces TrkParameters TrkSurfaces muonEvent xAODBase xAODCaloEvent xAODEventInfo xAODJet xAODMuon xAODPrimitives xAODTracking xAODTruth )
 
+atlas_add_component( DerivationFrameworkMuons
+   src/components/*.cxx
+   LINK_LIBRARIES GaudiKernel DerivationFrameworkMuonsLib )
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonIDCovMatrixDecorator.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////
@@ -13,7 +13,6 @@
 #include <vector>
 #include <string>
 #include <memory>
-#include "CLHEP/Units/SystemOfUnits.h"
 #include "xAODMuon/MuonContainer.h"
 
 // Constructor

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/dimuonTaggingTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #include <string>
 #include <memory>
 
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "xAODEventInfo/EventInfo.h"
 #include "xAODTracking/TrackingPrimitives.h"
@@ -59,8 +59,8 @@ DerivationFramework::dimuonTaggingTool::dimuonTaggingTool(const std::string& t,
 
   declareProperty("OppositeCharge", m_requireOS=true); 
   declareProperty("PairDPhiMin", m_dPhiMin=-1); 
-  declareProperty("InvariantMassLow", m_invariantMassLow=2.0*CLHEP::GeV); 
-  declareProperty("InvariantMassHigh", m_invariantMassHigh=4.3*CLHEP::GeV); 
+  declareProperty("InvariantMassLow", m_invariantMassLow=2.0*Gaudi::Units::GeV); 
+  declareProperty("InvariantMassHigh", m_invariantMassHigh=4.3*Gaudi::Units::GeV); 
 
   declareProperty("IDTrackThinningConeSize", m_thinningConeSize=0.4);
   declareProperty("BranchPrefix", m_br_prefix="");

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/isolationDecorator.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////
@@ -11,8 +11,6 @@
 #include <vector>
 #include <string>
 
-#include "CLHEP/Units/SystemOfUnits.h"
-
 #include "xAODEventInfo/EventInfo.h"
 #include "xAODTracking/TrackingPrimitives.h"
 #include "xAODPrimitives/IsolationHelpers.h"