Skip to content

Commit 658139d

Browse files
vvolklvvolkl
authored
Fixes for LCG98 (#409)
* add lcg 98 and corresponding fixes * fix * fix * fix * fix * fix
1 parent cffceb4 commit 658139d

File tree

20 files changed

+78
-27
lines changed

20 files changed

+78
-27
lines changed

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
SETUP: ["init_key4hep.sh", 'init_lcg.sh']
11+
SETUP: ["init_key4hep.sh", 'init_lcg_97a_FCC_2.sh', 'init_lcg_98.sh']
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Install CVMFS

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
*.log
1212
build*
13+
fcc-edm
1314
install*
1415
build.*.log
1516
Makefile

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ find_package(DD4hep COMPONENTS DDG4 DDRec REQUIRED)
2929
find_package(Geant4)
3030

3131

32+
3233
# Load macros and functions for Gaudi-based projects
3334
find_package(GaudiProject)
3435
#---------------------------------------------------------------
@@ -75,6 +76,7 @@ install(FILES ${CMAKE_BINARY_DIR}/setup.sh
7576
WORLD_READ)
7677

7778

79+
find_package(FCCEDM)
7880

7981
gaudi_project(FCCSW v0r13
8082
USE Gaudi v33r1 )

‎Detector/DetComponents/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ find_package(Eigen)
1515

1616
gaudi_add_module(DetComponents
1717
src/*.cpp
18-
INCLUDE_DIRS GaudiKernel ROOT DD4hep Geant4 FWCore DetInterface DetSegmentation DetCommon Eigen
19-
LINK_LIBRARIES GaudiKernel ROOT DD4hep ${DD4hep_COMPONENT_LIBRARIES} DetSegmentation DetCommon FWCore)
18+
INCLUDE_DIRS GaudiKernel ROOT DD4hep Geant4 FWCore DetInterface DetSegmentation DetCommon Eigen FCCEDM
19+
LINK_LIBRARIES GaudiKernel ROOT DD4hep ${DD4hep_COMPONENT_LIBRARIES} DetSegmentation DetCommon FWCore FCCEDM)
2020
target_link_libraries(DetComponents ${Geant4_LIBRARIES})
2121
include(CTest)
2222
gaudi_add_test(RedoSegmentationXYZ

‎Detector/DetStudies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ find_package(CLHEP)
1515

1616
gaudi_add_module(DetStudies
1717
src/components/*.cpp
18-
INCLUDE_DIRS GaudiKernel ROOT DD4hep FWCore CLHEP
19-
LINK_LIBRARIES GaudiKernel ROOT DD4hep ${DD4hep_COMPONENT_LIBRARIES} FWCore CLHEP)
18+
INCLUDE_DIRS GaudiKernel ROOT DD4hep FWCore CLHEP FCCEDM
19+
LINK_LIBRARIES GaudiKernel ROOT DD4hep ${DD4hep_COMPONENT_LIBRARIES} FWCore CLHEP FCCEDM)
2020

2121
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/tests DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/DetStudies)
2222

‎Examples/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/options DESTINATION ${CMAKE_INSTALL_
1414

1515
gaudi_add_module(Examples
1616
src/*.cpp
17-
INCLUDE_DIRS ROOT GaudiKernel Geant4 DD4hep SimG4Interface DetInterface DetCommon
18-
LINK_LIBRARIES GaudiAlgLib FWCore DetCommon ROOT GaudiKernel DD4hep
17+
INCLUDE_DIRS ROOT GaudiKernel Geant4 DD4hep SimG4Interface DetInterface DetCommon FCCEDM
18+
LINK_LIBRARIES GaudiAlgLib FWCore DetCommon ROOT GaudiKernel DD4hep FCCEDM
1919
)
2020
target_link_libraries(Examples ${Geant4_LIBRARIES})
2121

‎FWCore/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ gaudi_add_test(ReadTest
3131
FRAMEWORK tests/options/simple_reader.py
3232
DEPENDS ProduceForReadTest)
3333
gaudi_add_test(CheckReadCollectionSize
34-
ENVIRONMENT PYTHONPATH+=${PODIO_PYTHON_DIR}
3534
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
3635
COMMAND python FWCore/tests/scripts/check_coll_after_read.py
3736
DEPENDS ReadTest)

‎FWCore/scripts/fcc_dump_joboptions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def _sanitize(s):
3232
s: str
3333
The sanitized string that should be compatible with gaudirun.py
3434
"""
35+
s = str(s)
3536
s = s.replace('"False"', 'False')
3637
s = s.replace('"True"', 'True')
3738
s = s.replace('"[', '[')

‎FWCore/tests/scripts/check_coll_after_merge.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,14 @@
2727
total_px_pileup = 0
2828
total_px_merged = 0
2929

30-
for s, p in zip(particles_signal, particles_pileup):
31-
30+
for i in range(len(particles_signal)):
31+
s = particles_signal[i]
3232
total_px_signal += s.core().p4.px
33+
for i in range(len(particles_pileup)):
34+
p = particles_pileup[i]
3335
total_px_pileup += p.core().p4.px
34-
for m in particles_merged:
36+
for i in range(len(particles_merged)):
37+
m = particles_merged[i]
3538
total_px_merged += m.core().p4.px
3639

3740
# check that we merged the right particles

‎Sim/SimG4Components/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ gaudi_install_python_modules()
1414

1515
gaudi_add_module(SimG4Components
1616
src/*.cpp
17-
INCLUDE_DIRS Geant4 FWCore SimG4Common SimG4Interface DetCommon DD4hep ROOT
18-
LINK_LIBRARIES GaudiAlgLib FWCore SimG4Common DetCommon DD4hep ROOT)
17+
INCLUDE_DIRS Geant4 FWCore SimG4Common SimG4Interface DetCommon DD4hep ROOT FCCEDM
18+
LINK_LIBRARIES GaudiAlgLib FWCore SimG4Common DetCommon DD4hep ROOT FCCEDM)
1919
target_link_libraries(SimG4Components ${Geant4_LIBRARIES})
2020

2121

‎Sim/SimG4Fast/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ find_package(ROOT COMPONENTS Tree)
1212

1313
gaudi_add_library(SimG4Fast
1414
src/lib/*.cpp
15-
INCLUDE_DIRS SimG4Common FWCore SimG4Components SimG4Interface Geant4 ROOT
16-
LINK_LIBRARIES GaudiAlgLib SimG4Common ROOT
15+
INCLUDE_DIRS SimG4Common FWCore SimG4Components SimG4Interface Geant4 ROOT FCCEDM
16+
LINK_LIBRARIES GaudiAlgLib SimG4Common ROOT FCCEDM
1717
PUBLIC_HEADERS SimG4Fast)
1818
target_link_libraries(SimG4Fast ${Geant4_LIBRARIES})
1919

2020
gaudi_add_module(SimG4FastPlugins
2121
src/components/*.cpp
22-
INCLUDE_DIRS Geant4 SimG4Common SimG4Fast SimG4Interface
23-
LINK_LIBRARIES GaudiAlgLib SimG4Fast SimG4Common)
22+
INCLUDE_DIRS Geant4 SimG4Common SimG4Fast SimG4Interface FCCEDM
23+
LINK_LIBRARIES GaudiAlgLib SimG4Fast SimG4Common FCCEDM)
2424
target_link_libraries(SimG4FastPlugins ${Geant4_LIBRARIES})

‎Test/TestFWCore/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ gaudi_depends_on_subdirs(GaudiAlg GaudiKernel FWCore Generation)
1010

1111
gaudi_add_module(TestFWCorePlugins
1212
src/components/*.cpp
13-
INCLUDE_DIRS FWCore
14-
LINK_LIBRARIES GaudiKernel FWCore)
13+
INCLUDE_DIRS FWCore FCCEDM
14+
LINK_LIBRARIES GaudiKernel FWCore FCCEDM)
1515

1616

1717
include(CTest)

‎Test/TestGeneration/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ gaudi_depends_on_subdirs(GaudiAlg GaudiKernel FWCore Generation)
1313

1414
gaudi_add_module(TestGenerationPlugins
1515
src/components/*.cpp
16-
INCLUDE_DIRS FWCore HepMC
17-
LINK_LIBRARIES GaudiKernel FWCore HepMC)
16+
INCLUDE_DIRS FWCore HepMC FCCEDM
17+
LINK_LIBRARIES GaudiKernel FWCore HepMC FCCEDM)
1818

1919
include(CTest)
2020
gaudi_add_test(EDM2HepMCConverstion

‎Test/TestGeometry/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
1111

1212
gaudi_add_module(TestGeometry
1313
src/components/*.cpp
14-
INCLUDE_DIRS Geant4 FWCore SimG4Interface SimG4Common DetInterface DetCommon TestGeometryLib
15-
LINK_LIBRARIES GaudiKernel FWCore DetCommon TestGeometryLib)
14+
INCLUDE_DIRS Geant4 FWCore SimG4Interface SimG4Common DetInterface DetCommon TestGeometryLib FCCEDM
15+
LINK_LIBRARIES GaudiKernel FWCore DetCommon TestGeometryLib FCCEDM)
1616
target_link_libraries(TestGeometry ${Geant4_LIBRARIES})
1717

1818

‎Test/TestReconstruction/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ find_package(ROOT COMPONENTS Geom)
1515

1616
gaudi_add_module(TestReconstructionPlugins
1717
src/*.cpp
18-
INCLUDE_DIRS FWCore DetInterface TrackingUtils Geant4 DetCommon DetSegmentation GaudiKernel
19-
LINK_LIBRARIES FWCore GaudiAlgLib FWCore TrackingUtils DetCommon DetSegmentation)
18+
INCLUDE_DIRS FWCore DetInterface TrackingUtils Geant4 DetCommon DetSegmentation GaudiKernel FCCEDM
19+
LINK_LIBRARIES FWCore GaudiAlgLib FWCore TrackingUtils DetCommon DetSegmentation FCCEDM)
2020
target_link_libraries(TestReconstructionPlugins ${Geant4_LIBRARIES})
2121

2222
include(CTest)

‎cmake/FindEvtGen.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FIND_PATH(EVTGEN_INCLUDE_DIR NAMES EvtGen/EvtGen.hh
1919

2020
FIND_PATH(EVTGEN_LIBRARY_DIR NAMES libEvtGen.so
2121
HINTS ${searchpath}
22-
PATH_SUFFIXES lib)
22+
PATH_SUFFIXES lib lib64)
2323

2424
set(EVTGEN_LIBRARIES ${EVTGEN_LIBRARY_DIR}/libEvtGen.so ${EVTGEN_LIBRARY_DIR}/libEvtGenExternal.so)
2525

‎init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
init_lcg.sh
1+
init_lcg_97a_FCC_2.sh

‎init_lcg_97a_FCC_2.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
LCGPREFIX=/cvmfs/sft.cern.ch/lcg
2+
export BINARY_TAG=x86_64-centos7-gcc8-opt
3+
LCGPATH=$LCGPREFIX/views/LCG_97a_FCC_2/$BINARY_TAG
4+
source $LCGPATH/bin/thisdd4hep_only.sh
5+
source $LCGPATH/setup.sh
6+
7+
8+
export Gaudi_DIR=$(dirname $(readlink -f "$(which gaudirun.py)"))/../
9+
export CMAKE_PREFIX_PATH=$Gaudi_DIR:$CMAKE_PREFIX_PATH

‎init_lcg_98.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
LCGPREFIX=/cvmfs/sft.cern.ch/lcg
2+
export BINARY_TAG=x86_64-centos7-gcc8-opt
3+
LCGPATH=$LCGPREFIX/views/LCG_98/$BINARY_TAG
4+
source $LCGPATH/bin/thisdd4hep_only.sh
5+
source $LCGPATH/setup.sh
6+
7+
8+
# make sure Gaudi.xenv can be found
9+
10+
export Gaudi_DIR=$(dirname $(readlink -f "$(which gaudirun.py)"))/../
11+
export CMAKE_PREFIX_PATH=$Gaudi_DIR:$CMAKE_PREFIX_PATH
12+
13+
# build FCC-dependencies on top of LCG
14+
15+
if [ ! -d "./fcc-edm" ]
16+
then
17+
git clone --depth=1 https://github.com/hep-fcc/fcc-edm
18+
cd fcc-edm; mkdir build install; cd build;
19+
cmake .. -DCMAKE_INSTALL_PREFIX=../install
20+
make -j `getconf _NPROCESSORS_ONLN` install
21+
cd ../
22+
export CMAKE_PREFIX_PATH=$PWD/install:$CMAKE_PREFIX_PATH
23+
export ROOT_INCLUDE_PATH=$PWD/install/include/datamodel:$PWD/install/:$ROOT_INCLUDE_PATH
24+
export LD_LIBRARY_PATH=$PWD/install/lib/:$PWD/install/lib64/$LD_LIBRARY_PATH
25+
touch .gaudi_project_ignore
26+
cd ../
27+
fi
28+
29+

‎init_lcg.sh renamed to ‎test_lcg.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@ source $LCGPATH/bin/thisdd4hep_only.sh
66
export Gaudi_DIR=/cvmfs/sft.cern.ch/lcg/releases/Gaudi/v33r1-2775b/x86_64-centos7-gcc8-opt
77
export CMAKE_PREFIX_PATH=$Gaudi_DIR:$CMAKE_PREFIX_PATH
88
source /cvmfs/sft.cern.ch/lcg/views/LCG_97a_FCC_2/x86_64-centos7-gcc8-opt/setup.sh
9+
10+
export FCCSWBASEDIR=/cvmfs/sft.cern.ch/lcg/releases/fccsw/0.13-5b877/x86_64-centos7-gcc8-opt/
11+
export FCCSWSHAREDIR=$FCCSWBASEDIR/share/FCCSW
12+
export FCC_DETECTORS=$FCCSWSHAREDIR
13+
export FCC_PYTHIACARDS=$FCCSWSHAREDIR
14+
export FCCSW=/cvmfs/sft.cern.ch/lcg/releases/fccsw/0.13-5b877/x86_64-centos7-gcc8-opt/share/FCCSW
15+

0 commit comments

Comments
 (0)