removed setting of environment variables removed in G4 V4.0; added silent option

diff --git a/AliGeant4/config/setup.csh b/AliGeant4/config/setup.csh
index 50d9ed2298423bfb69f2f29c46487fbd651681e3..aea0b741174b66309784187a371452d61771cf21 100755 (executable)
--- a/AliGeant4/config/setup.csh
+++ b/AliGeant4/config/setup.csh
@@ -46,12 +46,15 @@ setenv AG4_MAKESHLIB 1
 #
 set VERBOSE = "NO"
 set LOCAL = "NO"
+set SILENT = "NO"
 foreach param ( $* )
   switch ( $param )
     case -g:
       set VERBOSE="YES"; shift; breaksw;
     case local:
       set LOCAL="YES"; shift; breaksw;
+    case silent:
+      set SILENT="YES"; shift; breaksw;
   endsw
 end
 
@@ -292,9 +295,7 @@ if ( "$?AG4_VISUALIZE" == 1 ) then
     echo "* Fukui Renderer (DAWN)..."
   endif
   setenv G4VIS_BUILD_DAWN_DRIVER     1
-  setenv G4VIS_BUILD_DAWNFILE_DRIVER 1
   setenv G4VIS_USE_DAWN              1
-  setenv G4VIS_USE_DAWNFILE          1
   #setenv G4DAWNFILE_VIEWER   david
   setenv DAWN_HOME ${G4_BASE}/tools/bin
   if ( "`echo ${PATH} | grep ${DAWN_HOME} `" == "" ) then
@@ -310,9 +311,6 @@ if ( "$?AG4_VISUALIZE" == 1 ) then
     if ("$?G4VIS_USE_DAWN" == 1) then
       echo "  Dawn driver activated"
     endif
-    if ("$?G4VIS_USE_DAWNFILE" == 1) then
-      echo "  Dawn file driver activated"
-    endif
     if ("$?G4DAWNFILE_VIEWER" == 1) then
       echo "  Dawn file viewer set to ${G4DAWNFILE_VIEWER}"
     endif
@@ -428,9 +426,7 @@ if ( "$?AG4_VISUALIZE" == 1 ) then
     echo "* VRML..."
   endif
   setenv G4VIS_BUILD_VRML_DRIVER        1
-  setenv G4VIS_BUILD_VRMLFILE_DRIVER    1
   setenv G4VIS_USE_VRML                 1
-  setenv G4VIS_USE_VRMLFILE            1
   #Set preferred vrml viewer to be invoked in this mode
   setenv G4VRMLFILE_VIEWER vrweb
   #Set host name for VRML1 visualization.... the g4vrmlview machine!
@@ -443,24 +439,6 @@ if ( "$?AG4_VISUALIZE" == 1 ) then
       echo "  VRML driver activated"
       echo "  Host Name for remote visualization is ${G4VRML_HOST_NAME}"
     endif
-    if ("$?G4VIS_USE_VRMLFILE" == 1) then
-      echo "  VRML file driver activated"
-      echo "  VRML viewer set to ${G4VRMLFILE_VIEWER}"
-    endif
-  endif
-
-  #
-  # Ray Tracer
-  #
-  if ( "$VERBOSE" == "YES" ) then
-    echo "* Ray Tracer..."
-  endif
-  #setenv G4VIS_BUILD_RAYTRACER_DRIVER 1
-  #setenv G4VIS_USE_RAYTRACER          1
-  if ( "$VERBOSE" == "YES" ) then
-    if ("$?G4VIS_USE_RAYTRACER" == 1) then
-      echo "  Ray tracing driver activated"
-    endif
   endif
 
   #
@@ -469,7 +447,6 @@ if ( "$?AG4_VISUALIZE" == 1 ) then
   if ( "$VERBOSE" == "YES" ) then
     echo "* Geant Adaptative GUI (GAG)..."
   endif
-  setenv G4UI_BUILD_GAG_SESSION 1
   setenv G4UI_USE_GAG           1
   setenv MOMOPATH     ${G4_BASE}/tools/GAG/tcltk
   if ( "`echo ${PATH} | grep ${MOMOPATH} `" == "" ) then
@@ -507,9 +484,7 @@ else
 
   # Dawn
   unsetenv G4VIS_BUILD_DAWN_DRIVER
-  unsetenv G4VIS_BUILD_DAWNFILE_DRIVER
   unsetenv G4VIS_USE_DAWN
-  unsetenv G4VIS_USE_DAWNFILE
   unsetenv G4DAWNFILE_VIEWER
   unsetenv DAWN_HOME
   unsetenv G4DAWN_MULTI_WINDOW
@@ -539,14 +514,11 @@ else
 
   # VRML1
   unsetenv G4VIS_BUILD_VRML_DRIVER
-  unsetenv G4VIS_BUILD_VRMLFILE_DRIVER
   unsetenv G4VIS_USE_VRML
-  unsetenv G4VIS_USE_VRMLFILE
   unsetenv G4VRMLFILE_VIEWER
   unsetenv G4VRML_HOST_NAME
 
   # GAG
-  unsetenv G4UI_BUILD_GAG_SESSION
   unsetenv G4UI_USE_GAG
   unsetenv MOMOPATH
 
@@ -672,4 +644,6 @@ unset SHLIBVARNAME
 unset LOCAL
 unset VERBOSE
 
-echo "Default ALICE environment for GEANT4 has been set."
+if ( "$SILENT" == "NO" ) then
+  echo "Default ALICE environment for GEANT4 has been set."
+endif

diff --git a/AliGeant4/config/setup.sh b/AliGeant4/config/setup.sh
index e8f787089f881eeabff38c2fc91a231670aa4465..a81bf7b2713bd0f3b6eb1b6fd2c5fb989eb0bb08 100755 (executable)
--- a/AliGeant4/config/setup.sh
+++ b/AliGeant4/config/setup.sh
@@ -46,15 +46,18 @@ export AG4_MAKESHLIB=1
 #
 VERBOSE="NO"
 LOCAL="NO"
+SILENT="NO"
 for param in $*
 do
   case $param in
     -g) VERBOSE="YES"; shift 1;;
     local) LOCAL="YES"; shift 1;;
+    silent) SILENT="YES"; shift 1;;
   esac
 done
 
 
+
 #
 # ==================================================================
 # Key path variables
@@ -292,9 +295,7 @@ if [ $AG4_VISUALIZE ]; then
     echo "* Fukui Renderer (DAWN)..."
   fi
   export G4VIS_BUILD_DAWN_DRIVER=1
-  export G4VIS_BUILD_DAWNFILE_DRIVER=1
   export G4VIS_USE_DAWN=1
-  export G4VIS_USE_DAWNFILE=1
   #export G4DAWNFILE_VIEWER=david
   export DAWN_HOME=${G4_BASE}/tools/bin
   if [ "`echo ${PATH} | grep ${DAWN_HOME} `" = "" ]; then
@@ -309,9 +310,6 @@ if [ $AG4_VISUALIZE ]; then
     if [ $G4VIS_USE_DAWN ]; then
       echo "  Dawn driver activated"
     fi
-    if [ $G4VIS_USE_DAWNFILE ]; then
-      echo "  Dawn file driver activated"
-    fi
     if [ $G4DAWNFILE_VIEWER ]; then
       echo "  Dawn file viewer set to ${G4DAWNFILE_VIEWER}"
     fi
@@ -428,9 +426,7 @@ if [ $AG4_VISUALIZE ]; then
     echo "* VRML..."
   fi
   export G4VIS_BUILD_VRML_DRIVER=1    
-  export G4VIS_BUILD_VRMLFILE_DRIVER=1
   export G4VIS_USE_VRML=1
-  export G4VIS_USE_VRMLFILE=1
   #Set preferred vrml viewer to be invoked in this mode
   export G4VRMLFILE_VIEWER=vrweb
   #Set host name for VRML1 visualization.... the g4vrmlview machine!
@@ -443,24 +439,6 @@ if [ $AG4_VISUALIZE ]; then
       echo "  VRML driver activated"
       echo "  Host Name for remote visualization is ${G4VRML_HOST_NAME}"
     fi
-    if [ $G4VIS_USE_VRMLFILE ]; then
-      echo "  VRML file driver activated"
-      echo "  VRML viewer set to ${G4VRMLFILE_VIEWER}"
-    fi
-  fi
-
-  #
-  # Ray Tracer
-  #
-  if [ "$VERBOSE" = "YES" ]; then
-    echo "* Ray Tracer..."
-  fi
-  #export G4VIS_BUILD_RAYTRACER_DRIVER=1
-  #export G4VIS_USE_RAYTRACER=1
-  if [ "$VERBOSE" = "YES" ]; then
-    if [ $G4VIS_USE_RAYTRACER ]; then
-      echo "  Ray tracing driver activated"
-    fi
   fi
 
   #
@@ -469,7 +447,6 @@ if [ $AG4_VISUALIZE ]; then
   if [ "$VERBOSE" = "YES" ]; then
     echo "* Geant Adaptative GUI (GAG)..."
   fi
-  export G4UI_BUILD_GAG_SESSION=1
   export G4UI_USE_GAG=1
   export MOMOPATH=${G4_BASE}/tools/GAG/tcltk
   if [ "`echo ${PATH} | grep ${MOMOPATH} `" = "" ]; then
@@ -507,9 +484,7 @@ else
 
   # Dawn
   unset G4VIS_BUILD_DAWN_DRIVER
-  unset G4VIS_BUILD_DAWNFILE_DRIVER
   unset G4VIS_USE_DAWN
-  unset G4VIS_USE_DAWNFILE
   unset G4DAWNFILE_VIEWER
   unset DAWN_HOME
   unset G4DAWN_MULTI_WINDOW
@@ -539,14 +514,11 @@ else
 
   # VRML1
   unset G4VIS_BUILD_VRML_DRIVER
-  unset G4VIS_BUILD_VRMLFILE_DRIVER
   unset G4VIS_USE_VRML
-  unset G4VIS_USE_VRMLFILE             1
   unset G4VRMLFILE_VIEWER
   unset G4VRML_HOST_NAME
 
   # GAG
-  unset G4UI_BUILD_GAG_SESSION
   unset G4UI_USE_GAG
   unset MOMOPATH
 
@@ -672,4 +644,6 @@ unset SHLIBVARNAME
 unset LOCAL
 unset VERBOSE
 
-echo "Default ALICE environment for GEANT4 has been set."
+if [ "$SILENT" = "NO" ]; then
+  echo "Default ALICE environment for GEANT4 has been set."
+fi