Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare v02-03-03 patch release #176

Merged
merged 6 commits into from
Mar 11, 2024
Merged

Prepare v02-03-03 patch release #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3af4b43
Bump versions of all packages to the latest tags
tmadlener Mar 8, 2024
eae9ca8
Bump ilcsoft version
tmadlener Mar 8, 2024
6822fdb
Disable deprecated ROOT build option
tmadlener Mar 8, 2024
b8e59fd
Add latest version of k4geo / lcgeo
tmadlener Mar 11, 2024
aa9563f
Make sure that k4geo populates env correctly
tmadlener Mar 11, 2024
a7842ff
Build DD4hep examples as part of DD4hep
tmadlener Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
484 changes: 484 additions & 0 deletions doc/release_notes_ilcsoft_v02-03-03.md
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions ilcsoft/dd4hep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ def __init__(self, userInput):
self.download.gituser = 'AIDASoft'
self.download.gitrepo = 'DD4hep'

self.reqfiles = [ ["lib/libDDCore.so", "lib/libDDCore.dylib" ]]
self.reqfiles = [ ["lib/libDDCore.so", "lib/libDDCore.dylib" ],
["lib/libSimpleDetector.so", "lib/libSimpleDetector.dylib" ]]

self.reqmodules = [ "ROOT" , "LCIO", "GEAR", "Geant4" , "CLHEP" ,"Boost" , "EDM4hep" ]

self.envcmake["DD4HEP_BUILD_EXAMPLES"] = "ON"


def setMode(self, mode):
BaseILC.setMode(self, mode)
Expand Down Expand Up @@ -75,5 +78,7 @@ def postCheckDeps(self):
self.env[ 'DD4HEP' ] = self.installPath
self.env[ 'DD4HEP_ENVINIT' ] = "${DD4HEP}/bin/thisdd4hep.sh"
self.envcmds.append('test -r ${DD4HEP_ENVINIT} && . ${DD4HEP_ENVINIT}')



# The other parts of the environment for the examples are already part of
# the DD4hep environment, since artifacts go into the same directories
self.env["DD4hepExamples"] = self.installPath + "/examples"
3 changes: 3 additions & 0 deletions ilcsoft/dd4hep_examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#
##################################################

import warnings

# custom imports
from .baseilc import BaseILC
from .util import *
Expand All @@ -16,6 +18,7 @@ class DD4hepExamples(BaseILC):
""" Responsible for the DD4hepExamples configuration process. """

def __init__(self, userInput):
warnings.warn("The examples are now built as part of DD4hep", DeprecationWarning, stacklevel=2)
BaseILC.__init__(self, userInput, "DD4hepExamples", "DD4hepExamples")

#self.hasCMakeBuildSupport = False
Expand Down
6 changes: 4 additions & 2 deletions ilcsoft/lcgeo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,7 @@ def postCheckDeps(self):
self.env[ 'lcgeo_DIR' ] = self.installPath
self.env[ 'lcgeo_ENVINIT' ] = "${lcgeo_DIR}/bin/thislcgeo.sh"
self.envcmds.append('test -r ${lcgeo_ENVINIT} && . ${lcgeo_ENVINIT}')



if Version(self.version) >= "00-19":
self.env["k4geo_DIR"] = self.installPath
self.envcmds.append("test -r ${k4geo_DIR}/bin/thisk4geo.sh && . ${k4geo_DIR}/bin/thisk4geo.sh")
6 changes: 4 additions & 2 deletions ilcsoft/root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,17 @@ def compile(self):
self.envcmake['GSL_ROOT_DIR']=gsl.installPath
self.envcmake['GSL_CONFIG_EXECUTABLE']=gsl_bindir+'/gsl-config'

self.envcmake.setdefault( 'gsl_shared', 'ON' )
if Version(self.version) < "6.30":
self.envcmake.setdefault( 'gsl_shared', 'ON' )
self.envcmake.setdefault( 'builtin_gsl', 'OFF' ) # we provide GSL, don't recompile it !

self.envcmake.setdefault( 'gdml', 'ON' )
self.envcmake.setdefault( 'minuit2', 'ON' )
self.envcmake.setdefault( 'roofit', 'ON' )
self.envcmake.setdefault( 'unuran', 'ON' )
self.envcmake.setdefault( 'xrootd', 'ON' )
self.envcmake.setdefault( 'mathmore', 'ON' )
self.envcmake.setdefault( 'builtin_xrootd', 'ON' )
self.envcmake.setdefault( 'builtin_gsl', 'OFF' ) # we provide GSL, don't recompile it !
self.envcmake.setdefault( 'fortran', 'OFF' )
self.envcmake.setdefault( 'mysql', 'OFF' )
self.envcmake.setdefault( 'sqlite', 'OFF' )
Expand Down
2 changes: 0 additions & 2 deletions releases/v02-03/release-ilcsoft.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,6 @@ ilcsoft.module("aidaTT").download.gitrepo="aidaTT"

ilcsoft.install( DDKalTest( DDKalTest_version ))

ilcsoft.install( DD4hepExamples ( DD4hepExamples_version ))

####################################################################
#
# the following tools are installed in afs:
Expand Down
66 changes: 33 additions & 33 deletions releases/v02-03/release-versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
###########################################

# --------- ilcsoft release version ------------------------------------------
ilcsoft_release = "v02-03-02"
ilcsoft_release = "v02-03-03"
# ----------------------------------------------------------------------------

# which cxx standard to use
Expand Down Expand Up @@ -111,95 +111,95 @@

# ======================= PACKAGE VERSIONS ===================================

Geant4_version = "11.1.1"
Geant4_version = "11.2.1"

CLHEP_version = "2.4.6.4"
CLHEP_version = "2.4.7.1"

ROOT_version = "6.28.04"
ROOT_version = "6.30.04"

GSL_version = "2.7"

Qt5_version = "v5.13.1"

CMake_version = "3.23.2"
CMake_version = "3.28.3"

CED_version = "v01-09-04"

SIO_version = "v00-01"
SIO_version = "v00-02"

Boost_version = "1.77.0"
Boost_version = "1.84.0"

Eigen_version = "3.4.0"

# -------------------------------------------

CondDBMySQL_version = "CondDBMySQL_ILC-0-9-7"

ILCUTIL_version = "v01-07-01"
ILCUTIL_version = "v01-07-02"

FastJet_version = "3.4.0"
FastJet_version = "3.4.2"

FastJetcontrib_version = "1.049"
FastJetcontrib_version = "1.054"

# xerces-c (needed by geant4 for building gdml support - required by mokka)
XercesC_version = "v3.2.3"
XERCESC_ROOT_DIR = ilcPath + "/xercesc/" + XercesC_version

# -------------------------------------------

LCIO_version = "v02-20"
LCIO_version = "v02-21"

GEAR_version = "v01-09-01"
GEAR_version = "v01-09-02"

MarlinFastJet_version = "v00-05-03"

KalTest_version = "v02-05-01"
KalTest_version = "v02-05-02"

KalDet_version = "v01-14-01"

aidaTT_version = "v00-10"

DDKalTest_version = "v01-07"
DDKalTest_version = "v01-07-01"

MarlinTrk_version = "v02-09-01"
MarlinTrk_version = "v02-09-02"

MarlinTrkProcessors_version = "v02-12-03"
MarlinTrkProcessors_version = "v02-12-05"

Clupatra_version = "v01-03"
Clupatra_version = "v01-03-01"

KiTrack_version = "v01-10"

KiTrackMarlin_version = "v01-13-02"

ForwardTracking_version = "v01-14-01"
ForwardTracking_version = "v01-14-02"

ConformalTracking_version = "v01-11-01"
ConformalTracking_version = "v01-12"

LICH_version = "v00-01"

GBL_version = "V02-02-01"

LCCD_version = "v01-05-01"
LCCD_version = "v01-05-02"

RAIDA_version = "v01-11"

MarlinUtil_version = "v01-17-01"
MarlinUtil_version = "v01-17-02"

Marlin_version = "v01-19"
Marlin_version = "v01-19-02"

MarlinDD4hep_version = "v00-06-02"

DDMarlinPandora_version = "v00-12"
DDMarlinPandora_version = "v00-12-01"

MarlinReco_version = "v01-34"
MarlinReco_version = "v01-35"

FCalClusterer_version = "v01-00-03"
FCalClusterer_version = "v01-00-06"

ILDPerformance_version = "v01-12"

# ILDConfig_version = "v02-03"

LCFIVertex_version = "v00-08"
LCFIVertex_version = "v00-09"

LCFIPlus_version = "v00-10-01"

Expand Down Expand Up @@ -227,16 +227,16 @@

Garlic_version = "v03-01"

DD4hep_version = "v01-25-01"
DD4hep_version = "v01-28"

DD4hepExamples_version = "v01-25-01"
DD4hepExamples_version = "v01-28"

lcgeo_version = "v00-18-01"
lcgeo_version = "v00-20-00"

podio_version = "v00-16-06"
podio_version = "v00-99"

edm4hep_version = "v00-10"
edm4hep_version = "v00-10-05"

k4edm4hep2lcioconv_version = "v00-05"
k4edm4hep2lcioconv_version = "v00-08-02"

Physsim_version = "v00-04-02"
Physsim_version = "v00-05"
Loading