diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2369e2a0d752713753f074981bb94e980fa38ced..8a9446205ec197de2b063c771e3ef95ee4cc6269 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,12 +17,14 @@ build_image: # each branch will have an individual Docker image that will be used # in the following stages of the pipeline for testing the code image: - name: gitlab-registry.cern.ch/linuxsupport/alma9-base:latest + #name: gitlab-registry.cern.ch/linuxsupport/alma9-base:latest + name: gitlab-registry.cern.ch/linuxsupport/cc7-base:latest stage: build tags: - k8s-cvmfs script: - - yum -y install man which zlib-devel lz4-devel cmake make gcc gcc-c++ uuid-devel libuuid-devel expat-devel #mesa-libGL-devel libXpm-devel + - yum -y --disablerepo=epel install redhat-lsb redhat-lsb-core man uuid-devel libuuid libuuid-devel mesa-libGL-devel libXpm-devel + # - yum -y install man which zlib-devel lz4-devel cmake make gcc gcc-c++ uuid-devel libuuid-devel expat-devel #mesa-libGL-devel libXpm-devel # - yum -y install redhat-lsb # This doesn't exist in the main release! # --disablerepo=epel redhat-lsb redhat-lsb-core - mkdir build diff --git a/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx b/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx index 02c4a26668f97a0f4adadfdda0fece7821f2e36b..dad71189889bde721c448ccc0c522d409c7dc1a3 100644 --- a/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx +++ b/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx @@ -243,7 +243,8 @@ StatusCode NtupleDumperAlg::initialize() ATH_CHECK(m_trackingGeometryTool.retrieve()); ATH_CHECK(m_trackTruthMatchingTool.retrieve()); ATH_CHECK(m_fiducialParticleTool.retrieve()); - ATH_CHECK(m_vertexingTool.retrieve()); + // TODO - fix vertexing + // ATH_CHECK(m_vertexingTool.retrieve()); ATH_CHECK(m_mappingTool.retrieve()); ATH_CHECK(m_spacePointContainerKey.initialize()); diff --git a/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.h b/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.h index 85d36d67e1380f88be6114e1fe8384a37391ccbc..06142aa14356be830264c4cff22f3ecb9a8398c4 100644 --- a/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.h +++ b/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.h @@ -22,7 +22,8 @@ #include "FaserActsKalmanFilter/ITrackTruthMatchingTool.h" #include "TrackerSimEvent/FaserSiHitCollection.h" #include "xAODEventInfo/EventInfo.h" -#include "FaserActsVertexing/IVertexingTool.h" +// TODO - fix vertexing +//#include "FaserActsVertexing/IVertexingTool.h" #include "GeneratorObjects/McEventCollection.h" #include <boost/dynamic_bitset.hpp> @@ -113,7 +114,8 @@ private: ToolHandle<IFaserActsTrackingGeometryTool> m_trackingGeometryTool {this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"}; ToolHandle<ITrackTruthMatchingTool> m_trackTruthMatchingTool {this, "TrackTruthMatchingTool", "TrackTruthMatchingTool"}; ToolHandle<IFiducialParticleTool> m_fiducialParticleTool {this, "FiducialParticleTool", "FiducialParticleTool"}; - ToolHandle<FaserTracking::IVertexingTool> m_vertexingTool { this, "VertexingTool", "FaserTracking::PointOfClosestApproachSearchTool"}; + // TODO - fix vertexing + // ToolHandle<FaserTracking::IVertexingTool> m_vertexingTool { this, "VertexingTool", "FaserTracking::PointOfClosestApproachSearchTool"}; ToolHandle<IWaveformCableMappingTool> m_mappingTool { this, "WaveformCableMappingTool", "WaveformCableMappingTool" }; const TrackerDD::SCT_DetectorManager* m_detMgr {nullptr};