CLHEP version set explicitely to 1.5.0.0

diff --git a/AliGeant4/config/setup.csh b/AliGeant4/config/setup.csh
index 298cda4b2ea5cce3aabf4c36cfdb258609c505ba..5f7b420c06de29dac50c77415e42c3dc7fae713d 100755 (executable)
--- a/AliGeant4/config/setup.csh
+++ b/AliGeant4/config/setup.csh
@@ -323,16 +323,8 @@ endif
 # ==================================
 #
 
-if ( -d $LHCXX_BASE/CLHEP/new ) then
-  setenv CLHEP_BASE_DIR $LHCXX_BASE/CLHEP/new
-  if ( $SYSTEM == "OSF1" ) then
-    # temporarily needed 
-    setenv CLHEP_BASE_DIR $LHCXX_BASE/CLHEP/1.5.0.0
-  endif
-  if ( $SYSTEM == "SunOS" ) then
-    # temporarily needed 
-    setenv CLHEP_BASE_DIR $LHCXX_BASE/CLHEP/1.5.0.0
-  endif
+if ( -d $LHCXX_BASE/CLHEP/1.5.0.0 ) then
+  setenv CLHEP_BASE_DIR $LHCXX_BASE/CLHEP/1.5.0.0
 else
   echo "WARNING: CLHEP has not been found in the default path."
   if ( "$VERBOSE" == "YES" ) then

diff --git a/AliGeant4/config/setup.sh b/AliGeant4/config/setup.sh
index f4c5057149019e655c8c30bd9cac1b12e9329674..7dc7a3a2ed0aee908d23b164f9ba6f73e60e05f8 100755 (executable)
--- a/AliGeant4/config/setup.sh
+++ b/AliGeant4/config/setup.sh
@@ -323,16 +323,8 @@ fi
 # ==================================
 #
 
-if [ -d $LHCXX_BASE/CLHEP/new ]; then
-  export CLHEP_BASE_DIR=$LHCXX_BASE/CLHEP/new
-  if [ "$SYSTEM" = "OSF1" ]; then
-    # temporarily needed 
-    export CLHEP_BASE_DIR=$LHCXX_BASE/CLHEP/1.5.0.0
-  fi
-  if [ "$SYSTEM" = "SunOS" ]; then
-    # temporarily needed 
-    export CLHEP_BASE_DIR=$LHCXX_BASE/CLHEP/1.5.0.0
-  fi
+if [ -d $LHCXX_BASE/CLHEP/1.5.0.0 ]; then
+  export CLHEP_BASE_DIR=$LHCXX_BASE/CLHEP/1.5.0.0
 else
   echo "WARNING: CLHEP has not been found in the default path."
   if [ "$VERBOSE" = "YES" ]; then