From f3f84ed99c0bcbbadff61b2e99e5cb0d2896b826 Mon Sep 17 00:00:00 2001
From: Ulrich Schwickerath <ulrich.schwickerath@gmail.com>
Date: Sun, 2 Feb 2025 19:57:29 +0100
Subject: [PATCH] switch default to opendata
---
Makefile | 4 ++--
env/delphi.csh.template | 14 ++++++++------
env/delphi.sh.template | 13 +++++++------
make_cernlib | 21 ++++++++++++++-------
runtime/perl/Delphi/Fatmen.pm | 2 +-
runtime/perl/Delphi/FatmenCastor.pm | 2 +-
6 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index e99852fb..85d77689 100644
--- a/Makefile
+++ b/Makefile
@@ -52,11 +52,11 @@ logs:
cernlib_im: profiles setup logs
echo "starting cernlib with imake"
- . delphi.sh; ./make_cernlib $(CERNVER) 0 $(LEGACY) > logs/make_cernlib-imake.log 2>&1 || ( cat logs/make_cernlib-cmake.log; ${FALSE} )
+ . delphi.sh; ./make_cernlib $(CERNVER) 0 OFF $(LEGACY) > logs/make_cernlib-imake.log 2>&1 || ( cat logs/make_cernlib-cmake.log; ${FALSE} )
cernlib_cm: profiles setup logs
echo "starting cernlib with cmake"
- . delphi.sh; ./make_cernlib $(CERNVER) 1 $(LEGACY) > logs/make_cernlib-cmake.log 2>&1 || ( cat logs/make_cernlib-cmake.log; ${FALSE} )
+ . delphi.sh; ./make_cernlib $(CERNVER) 1 ON $(LEGACY) > logs/make_cernlib-cmake.log 2>&1 || ( cat logs/make_cernlib-cmake.log; ${FALSE} )
cernlib: profiles setup logs
echo "starting cernlib, imake build may fail"
diff --git a/env/delphi.csh.template b/env/delphi.csh.template
index 1717daea..32ae702c 100644
--- a/env/delphi.csh.template
+++ b/env/delphi.csh.template
@@ -89,9 +89,9 @@ setenv DELPHI_DAT ${GROUP_DIR}/dstana/${PRO}/dat
setenv DELPHI_BIN ${GROUP_DIR}/bin
setenv DELPHI_CRA ${DELPHI_PAM}
setenv DELPHI_PATH ${DELPHI_BIN}
-if (-e /eos/opendata/delphi/condition-data ) then
- setenv DELPHI_DDB /eos/opendata/delphi/condition-data
-else if (-e /eos/experiment/delphi/castor2015/ddb ) then
+
+setenv DELPHI_DDB /eos/opendata/delphi/condition-data
+if (-e /eos/experiment/delphi/castor2015/ddb ) then
setenv DELPHI_DDB /eos/experiment/delphi/castor2015/ddb
endif
@@ -126,9 +126,8 @@ if ( -e ${DELPHI_INSTALL_DIR}/pdl ) then
endif
# data location
-if ( -e /eos/opendata/delphi ) then
- setenv DELPHI_DATA_ROOT "/eos/opendata/delphi"
-else if ( -e /eos/experiment/delphi/castor2015 ) then
+setenv DELPHI_DATA_ROOT "/eos/opendata/delphi"
+if ( -e /eos/experiment/delphi/castor2015 ) then
setenv DELPHI_DATA_ROOT "/eos/experiment/delphi/castor2015"
endif
@@ -179,3 +178,6 @@ setenv OS `uname -s`
# define dellevel as alias
alias dellevel 'eval `dellevel.pl \!* -c`'
+
+# XRootD setup default to opendata
+setenv XROOTD_VMP eospublic.cern.ch:/eos/opendata/=/eos/opendata/
diff --git a/env/delphi.sh.template b/env/delphi.sh.template
index 2363efe7..2f9c4677 100644
--- a/env/delphi.sh.template
+++ b/env/delphi.sh.template
@@ -117,9 +117,8 @@ export DELPHI_CRA=${DELPHI_PAM}
export DELPHI_PATH=${DELPHI_BIN}
# ddb location
-if test -e /eos/opendata/delphi/condition-data ; then
- export DELPHI_DDB=/eos/opendata/delphi/condition-data
-elif test -e /eos/experiment/delphi/castor2015/ddb ; then
+export DELPHI_DDB=/eos/opendata/delphi/condition-data
+if test -e /eos/experiment/delphi/castor2015/ddb ; then
export DELPHI_DDB=/eos/experiment/delphi/castor2015/ddb
fi
@@ -152,9 +151,8 @@ if test -e ${DELPHI_INSTALL_DIR}/pdl ; then
fi
# data location
-if test -e /eos/opendata/delphi ; then
- export DELPHI_DATA_ROOT="/eos/opendata/delphi"
-elif test -e /eos/experiment/delphi/castor2015 ; then
+export DELPHI_DATA_ROOT="/eos/opendata/delphi"
+if test -e /eos/experiment/delphi/castor2015 ; then
export DELPHI_DATA_ROOT="/eos/experiment/delphi/castor2015"
fi
@@ -203,3 +201,6 @@ unset x
# add also $OS variable
export OS=`uname -s`
+
+# XRootD setup default to opendata
+export XROOTD_VMP=eospublic.cern.ch:/eos/opendata/=/eos/opendata/
diff --git a/make_cernlib b/make_cernlib
index c4a9d4d6..c91861be 100755
--- a/make_cernlib
+++ b/make_cernlib
@@ -9,11 +9,15 @@ unset FFLAGS
unset CCOMP
unset FCOMP
unset LDFLAGS
+#export CC=clang
+#export CXX=clang
+#export CCOMP=clang
# if $CERN is set we use that one, else we build from here
export version=$1
export use_cmake=$2
-export LEGACY=$3
+export CERNLIB_SHIFT=$3
+export LEGACY=$4
arch=`uname -s`
if [ "x$arch" = "xDarwin" ]; then
@@ -42,9 +46,12 @@ mkdir build
cd build
pwd
ls -l
-git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
+#git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
+#cd cernlib
+#git checkout tags/cernlib-$version
+git clone https://:@gitlab.cern.ch:8443/schwicke/cernlib.git
cd cernlib
-git checkout tags/cernlib-$version
+git checkout xrootd
# select 2022 extensions
echo '#define CERNLIB_2022 yes' >> config/host.def
@@ -54,18 +61,18 @@ if [ "x$use_cmake" = "x1" ]; then
cd build
if [ -z $LEGACY ]; then
if [ "x$arch" = "xDarwin" ]; then
- cmake -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_POSITION_INDEPENDENT_CODE=OFF -DCERNLIB_BUILD_SHARED=OFF -DCERNLIB_ENABLE_TEST=ON -DCMAKE_INSTALL_DIR=/ ..
+ cmake -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_POSITION_INDEPENDENT_CODE=OFF -DCERNLIB_BUILD_SHARED=OFF -DCERNLIB_ENABLE_TEST=ON -DCMAKE_INSTALL_DIR=/ -DCERNLIB_SHIFT=${CERNLIB_SHIFT} ..
rc=$?
else
- cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=OFF ..
+ cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=OFF -DCERNLIB_SHIFT=${CERNLIB_SHIFT} ..
rc=$?
fi
else
- cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_FORCE_32=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=OFF ..
+ cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_FORCE_32=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=OFF -DCERNLIB_SHIFT=${CERNLIB_SHIFT} ..
rc=$?
fi
if [ $rc -eq 0 ]; then
- make -j 20
+ make -j
rc=$?
if [ $rc -eq 0 ]; then
cmake --install . --prefix ${CERN}/${version}-cm
diff --git a/runtime/perl/Delphi/Fatmen.pm b/runtime/perl/Delphi/Fatmen.pm
index f5ff9ffe..5fb340d0 100644
--- a/runtime/perl/Delphi/Fatmen.pm
+++ b/runtime/perl/Delphi/Fatmen.pm
@@ -95,7 +95,7 @@ sub ExpandContent($$){
#
# check where we area reading the data from
#
- our $DELPHI_DATA_ROOT="/eos/experiment/delphi/castor2015";
+ our $DELPHI_DATA_ROOT="/eos/opendata/delphi";
$DELPHI_DATA_ROOT=$ENV{"DELPHI_DATA_ROOT"} if (defined $ENV{"DELPHI_DATA_ROOT"} && (-d $ENV{"DELPHI_DATA_ROOT"}));
#
# inflate the "Cont" fields
diff --git a/runtime/perl/Delphi/FatmenCastor.pm b/runtime/perl/Delphi/FatmenCastor.pm
index 336f95a3..956e23e3 100644
--- a/runtime/perl/Delphi/FatmenCastor.pm
+++ b/runtime/perl/Delphi/FatmenCastor.pm
@@ -123974,7 +123974,7 @@ sub ExpandContent($$){
#
# check where we area reading the data from
#
- our $DELPHI_DATA_ROOT="/eos/experiment/delphi/castor2015";
+ our $DELPHI_DATA_ROOT="/eos/opendata/delphi";
$DELPHI_DATA_ROOT=$ENV{"DELPHI_DATA_ROOT"} if (defined $ENV{"DELPHI_DATA_ROOT"} && (-d $ENV{"DELPHI_DATA_ROOT"}));
#
# inflate the "Cont" fields
--
GitLab