removed obsolete options AG4_STACKING, AG4_TOY; G4MAKESHLIB setting changed to G4LIB_...

diff --git a/AliGeant4/config/setup.csh b/AliGeant4/config/setup.csh
index 5f4f799..1b78fd3 100755 (executable)
--- a/AliGeant4/config/setup.csh
+++ b/AliGeant4/config/setup.csh
@@ -35,14 +35,6 @@ setenv AG4_VISUALIZE 1
 unsetenv AG4_OPACS
 
 #
-# ====== AG4_STACKING
-# If set: the secondary particles are not tracked immediatelly
-#       when they are created but after the urgent stack is exhausted
-# If not set: the G4 default stacking is used
-setenv AG4_STACKING 1
-#unsetenv AG4_STACKING
-
-#
 # ====== AG4_NOPHYSICS
 # If set: only geantino or charged geantino can be shooted  
 #setenv AG4_NOPHYSICS 1
@@ -182,16 +174,6 @@ if ( "$VERBOSE" == "YES" ) then
   else
     echo "OPACS driver         is NOT selected."
   endif
-  if ("$?AG4_TOY" == 1) then
-    echo "Toy geometry         is     selected"
-  else
-    echo "Full geometry        is     selected"
-  endif
-  if ("$?AG4_STACKING" == 1) then
-    echo "Secondaries will be tracked after the urgent stack is exhausted."
-  else
-    echo "The Geant4 default stackin will be used."
-  endif
   if ("$?AG4_NOPHYSICS" == 1) then
     echo "Only geantino or charged geantino can be shooted."
   else
@@ -283,9 +265,9 @@ else
 endif
 
 if ("$?AG4_MAKESHLIB" == 0) then
-  unsetenv G4MAKESHLIB 
-else 
-  setenv G4MAKESHLIB ${G4INSTALL}/config/makeshlib.sh
+  unsetenv G4LIB_BUILD_SHARED
+else  
+  setenv G4LIB_BUILD_SHARED 1
 endif  
 
 # path to data files needed by hadronic processes

diff --git a/AliGeant4/config/setup.sh b/AliGeant4/config/setup.sh
index 4086708..bbaab1c 100755 (executable)
--- a/AliGeant4/config/setup.sh
+++ b/AliGeant4/config/setup.sh
@@ -35,14 +35,6 @@ export AG4_VISUALIZE=1
 unset AG4_OPACS
 
 #
-# ====== AG4_STACKING
-# If set: the secondary particles are not tracked immediatelly
-#       when they are created but after the urgent stack is exhausted
-# If not set: the G4 default stacking is used
-export AG4_STACKING=1
-#unset AG4_STACKING
-
-#
 # ====== AG4_NOPHYSICS
 # If set: only geantino or charged geantino can be shooted  
 #export AG4_NOPHYSICS=1
@@ -182,16 +174,6 @@ if [ "$VERBOSE" = "YES" ]; then
   else
     echo "OPACS driver         is NOT selected."
   fi
-  if [ $AG4_TOY ]; then
-    echo "Toy geometry         is     selected"
-  else
-    echo "Full geometry        is     selected"
-  fi
-  if [ $AG4_STACKING ]; then
-    echo "The ALICE default stacking will be used."
-  else
-    echo "The Geant4 default stacking will be used."
-  fi
   if [ $AG4_NOPHYSICS ]; then
     echo "Only geantino or charged geantino can be shooted."
   else
@@ -283,9 +265,9 @@ else
 fi
 
 if [ "$AG4_MAKESHLIB" = "" ]; then
-  unset G4MAKESHLIB  
+  unset G4LIB_BUILD_SHARED
 else
-  export G4MAKESHLIB=$G4INSTALL/config/makeshlib.sh
+  export G4LIB_BUILD_SHARED=1
 fi  
 
 # path to data files needed by hadronic processes