Merge branch 'ExternalsUpdate-master-20221202' into 'master'

Externals Updates, master branch (2022.12.02.)

See merge request atlas/athena!58948

PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonObj.h

@@ -20,36 +20,41 @@ namespace MCP {
    /// Basic object to cache all relevant information from the track
    struct TrackCalibObj{
         TrackCalibObj() = default;
-        TrackCalibObj(const xAOD::TrackParticle* track, TrackType t, int charge, DataYear year, bool isData):
-          type{t},
-          is_valid{ track != nullptr},
-          uncalib_pt{ is_valid? track->pt()*MeVtoGeV : 0},
-          calib_pt{uncalib_pt},
-          eta{is_valid? track->eta() : FLT_MAX},
-          phi{is_valid? track->phi() : FLT_MAX},
-          mass{is_valid? track->m() : 0},
-          charge{charge},
-          year{year},
-          isData{isData},
-          pars {is_valid? track->definingParameters() : AmgVector(5)()},
-          covariance{is_valid ? track->definingParametersCovMatrix() : AmgSymMatrix(5)()}
-          {}
-
-        TrackCalibObj(const xAOD::TrackParticle* track, TrackType t, int charge, double eta, double phi, DataYear year, bool isData):
-          type{t},
-          is_valid{ track != nullptr},
-          uncalib_pt{ is_valid? track->pt()*MeVtoGeV : 0},
-          calib_pt{uncalib_pt},
-          eta{eta},
-          phi{phi},
-          mass{is_valid? track->m() : 0},
-          charge{charge},
-          year{year},
-          isData{isData},
-          pars {is_valid? track->definingParameters() : AmgVector(5)()},
-          covariance{is_valid ? track->definingParametersCovMatrix() : AmgSymMatrix(5)()}
-          {}
-
+        TrackCalibObj(const xAOD::TrackParticle* track, TrackType t, int charge,
+                      DataYear year, bool isData)
+            : type{t},
+              is_valid{track != nullptr},
+              uncalib_pt{(track != nullptr) ? track->pt() * MeVtoGeV : 0},
+              calib_pt{uncalib_pt},
+              eta{(track != nullptr) ? track->eta() : FLT_MAX},
+              phi{(track != nullptr) ? track->phi() : FLT_MAX},
+              mass{(track != nullptr) ? track->m() : 0},
+              charge{charge},
+              year{year},
+              isData{isData},
+              pars{(track != nullptr) ? track->definingParameters()
+                                      : AmgVector(5)()},
+              covariance{(track != nullptr)
+                             ? track->definingParametersCovMatrix()
+                             : AmgSymMatrix(5)()} {}
+
+        TrackCalibObj(const xAOD::TrackParticle* track, TrackType t, int charge,
+                      double eta, double phi, DataYear year, bool isData)
+            : type{t},
+              is_valid{track != nullptr},
+              uncalib_pt{(track != nullptr) ? track->pt() * MeVtoGeV : 0},
+              calib_pt{uncalib_pt},
+              eta{eta},
+              phi{phi},
+              mass{(track != nullptr) ? track->m() : 0},
+              charge{charge},
+              year{year},
+              isData{isData},
+              pars{(track != nullptr) ? track->definingParameters()
+                                      : AmgVector(5)()},
+              covariance{(track != nullptr)
+                             ? track->definingParametersCovMatrix()
+                             : AmgSymMatrix(5)()} {}
 
         TrackCalibObj(TrackType t, int charge, double pt, double eta, double phi, double mass, AmgVector(5) pars, AmgSymMatrix(5) cov, DataYear year, bool isData):
           type{t},

Projects/AnalysisBase/build.sh

@@ -9,7 +9,7 @@
 ATLAS_PROJECT_NAME="AnalysisBase"
 ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
 ATLAS_BUILDTYPE="RelWithDebInfo"
-ATLAS_EXTRA_CMAKE_ARGS=()
+ATLAS_EXTRA_CMAKE_ARGS=(-DBoost_NO_WARN_NEW_VERSIONS=TRUE)
 ATLAS_EXTRA_MAKE_ARGS=()
 
 # Let "the common script" do all the heavy lifting.

Projects/AnalysisBase/build_externals.sh

@@ -9,7 +9,9 @@
 ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
 ATLAS_EXT_PROJECT_NAME="AnalysisBaseExternals"
 ATLAS_BUILDTYPE="RelWithDebInfo"
-ATLAS_EXTRA_CMAKE_ARGS=(-DATLAS_ONNXRUNTIME_USE_CUDA=FALSE)
+ATLAS_EXTRA_CMAKE_ARGS=(-DATLAS_ONNXRUNTIME_USE_CUDA=FALSE
+                        -DATLAS_DAVIX_PATCH="PATCH_COMMAND;sed;-i.orig;51d;deps/curl/CMakeLists.txt"
+                        -DATLAS_DAVIX_FORCEDOWNLOAD_MESSAGE="Forcing the re-download of Davix (2022.12.04.)")
 ATLAS_EXTRA_MAKE_ARGS=()
 
 # Let "the common script" do all the heavy lifting.

Projects/AnalysisBase/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.144
+AnalysisBaseExternalsVersion = 2.0.145

Projects/AthAnalysis/build.sh

@@ -9,7 +9,7 @@
 ATLAS_PROJECT_NAME="AthAnalysis"
 ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
 ATLAS_BUILDTYPE="RelWithDebInfo"
-ATLAS_EXTRA_CMAKE_ARGS=()
+ATLAS_EXTRA_CMAKE_ARGS=(-DBoost_NO_WARN_NEW_VERSIONS=TRUE)
 ATLAS_EXTRA_MAKE_ARGS=()
 
 # Let "the common script" do all the heavy lifting.

Projects/AthAnalysis/build_externals.sh

@@ -9,8 +9,8 @@
 ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
 ATLAS_EXT_PROJECT_NAME="AthAnalysisExternals"
 ATLAS_BUILDTYPE="RelWithDebInfo"
-ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=101
-                        -DLCG_VERSION_POSTFIX="_ATLAS_26"
+ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=102
+                        -DLCG_VERSION_POSTFIX="b_ATLAS_6"
                         -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v36r6.003/Gaudi-v36r6.003.tar.gz;URL_MD5;e7b279804438a7c68b190084fe2592a7"
                         -DATLAS_ONNXRUNTIME_USE_CUDA=FALSE)
 ATLAS_EXTRA_MAKE_ARGS=()

Projects/AthAnalysis/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthAnalysisExternalsVersion = 2.0.144
+AthAnalysisExternalsVersion = 2.0.145

Projects/AthDataQuality/externals.txt

@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 2.0.144
+AtlasExternalsVersion = 2.0.145

Projects/AthDerivation/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthDerivationExternalsVersion = 2.0.144
+AthDerivationExternalsVersion = 2.0.145

Projects/AthGeneration/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.144
+AthGenerationExternalsVersion = 2.0.145

Projects/AthSimulation/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.144
+AthSimulationExternalsVersion = 2.0.145

Projects/Athena/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.144
+AthenaExternalsVersion = 2.0.145

Projects/DetCommon/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AtlasExternalsVersion = 2.0.144
+AtlasExternalsVersion = 2.0.145

Projects/VP1Light/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.144
+VP1LightExternalsVersion = 2.0.145