Commit 84d28a23 authored by Andrii Verbytskyi's avatar Andrii Verbytskyi
Browse files

Reverted the change in AddFlowByShift.cxx and updated CR year

parent 27595979
/*
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 "AthenaKernel/errorcheck.h"
......
......@@ -254,7 +254,7 @@ StatusCode AddFlowByShifting::execute() {
partit != (*mainvtx).particles_end(HepMC::children); partit++ ) {
// Process particles from main vertex
auto parent = (*partit);
HepMC::GenParticle* parent = (*partit);
CLHEP::HepLorentzVector momentum(parent->momentum().px(),
parent->momentum().py(),
parent->momentum().pz(),
......
......@@ -7,6 +7,8 @@ string( STRIP ${_version} _version )
project( AthDataQuality VERSION ${_version} LANGUAGES CXX )
unset( _version )
# Set the version of tdaq-common to use for the build:
set( TDAQ-COMMON_VERSION "04-00-00" CACHE STRING
"The version of tdaq-common to use for the build" )
......@@ -31,6 +33,10 @@ find_package( PNG )
find_package( TBB )
find_package( TIFF )
add_definitions(-DHEPMC3)
find_package( hepmc3 COMPONENTS HepMC HepMCsearch HINTS /cvmfs/sft.cern.ch/lcg/releases/LCG_96b/hepmc3/3.1.2/x86_64-centos7-gcc8-opt/)
SET(HEPMC3_USE TRUE)
# Make CMake find the project specific code we have here:
list( INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake )
......
......@@ -6,7 +6,9 @@ file( READ ${CMAKE_SOURCE_DIR}/version.txt _version )
string( STRIP ${_version} _version )
project( Athena VERSION ${_version} LANGUAGES C CXX Fortran )
unset( _version )
add_definitions(-DHEPMC3)
find_package( hepmc3 COMPONENTS HepMC HepMCsearch HINTS /cvmfs/sft.cern.ch/lcg/releases/LCG_96b/hepmc3/3.1.2/x86_64-centos7-gcc8-opt/)
SET(HEPMC3_USE TRUE)
# Set the versions of the TDAQ externals to pick up for the build:
if( NOT LCG_NIGHTLY )
if( NOT "$ENV{LCG_NIGHTLY}" STREQUAL "" )
......
......@@ -18,7 +18,9 @@ find_package( VP1LightExternals REQUIRED )
# a wrong value for PYTHONHOME. And nothing in VP1Light builds
# against Python to correct it.
find_package( Python COMPONENTS Interpreter )
add_definitions(-DHEPMC3)
find_package( hepmc3 COMPONENTS HepMC HepMCsearch HINTS /cvmfs/sft.cern.ch/lcg/releases/LCG_96b/hepmc3/3.1.2/x86_64-centos7-gcc8-opt/)
SET(HEPMC3_USE TRUE)
# Build options to customize the compilation of ATLAS packages
option( BUILDVP1LIGHT "Build ATLAS packages for VP1 Light" ON )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment