From 9477b1af8f4c2bec427309132a6286a6fda9a34c Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Wed, 8 Dec 2021 20:11:09 -0800
Subject: [PATCH] Athena 22.0.49 compatibility
---
.gitlab-ci.yml | 4 ++--
.../Reconstruction/scripts/submit_faser_reco.sh | 2 +-
Generators/FaserCosmicGenerator/README.md | 2 +-
README.md | 4 +---
version.txt | 2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cba605b..0aef82de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ build_image:
- mkdir build
- cd build
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
- - set +e && asetup --input=../../calypso/asetup.faser Athena,22.0.40; set -e
+ - set +e && asetup --input=../../calypso/asetup.faser Athena,22.0.49; set -e
- cmake ../../calypso
- make -j 3
artifacts:
@@ -41,7 +41,7 @@ test_unittest:
- yum -y install man
- cd build
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
- - set +e && asetup --input=../../calypso/asetup.faser Athena,22.0.40; set -e
+ - set +e && asetup --input=../../calypso/asetup.faser Athena,22.0.49; set -e
- set +e && source `find . -name 'setup.sh'`; set -e
- ctest -j3
dependencies:
diff --git a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
index 6bb4b895..64cca556 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
+++ b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
@@ -89,7 +89,7 @@ asetup
source build/x8*/setup.sh
#
# Do this by hand
-# asetup --input="$release_directory/calypso/asetup.faser" Athena,22.0.40
+# asetup --input="$release_directory/calypso/asetup.faser" Athena,22.0.49
# source "$release_directory/build/x8*/setup.sh"
#
#
diff --git a/Generators/FaserCosmicGenerator/README.md b/Generators/FaserCosmicGenerator/README.md
index 512c32c6..49199a3c 100644
--- a/Generators/FaserCosmicGenerator/README.md
+++ b/Generators/FaserCosmicGenerator/README.md
@@ -2,7 +2,7 @@
## Setup
-In Athena 22.0.40, the scipy module is missing from the LCG environment for some reason.
+In Athena 22.0.49, the scipy module is missing from the LCG environment for some reason.
To use the generator, the following command is required after the usual steps to setup the release:
diff --git a/README.md b/README.md
index c2900525..39456152 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ git clone --recursive https://:@gitlab.cern.ch:8443/$USERNAME/calypso.git
#The next three lines are used to setup the ATLAS release environment
export ATLAS_LOCAL_ROOT_BASE=/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase
source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh
-asetup --input=calypso/asetup.faser Athena,22.0.40
+asetup --input=calypso/asetup.faser Athena,22.0.49
#create build directory
mkdir build
@@ -43,6 +43,4 @@ It can be convenient to alias the "asetup --input=calypso/asetup.faser" to somet
** `ConfigFlags.GeoModel.FaserVersion = "FASER-TB00"` and `ConfigFlags.IOVDb.GlobalTag = OFLCOND-FASER-TB00` enables the 2021 Test-beam setup.
-* The "FaserActsKalmanFilter" package is temporarily disabled.
-
* The command `lsetup "lcgenv -p LCG_98python3_ATLAS_8 x86_64-centos7-gcc8-opt sqlite"` may be necessary to avoid errors when generating a database
diff --git a/version.txt b/version.txt
index cdbc1587..14012564 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-22.0.40
+22.0.49
--
GitLab