SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- compact2godl.sh	28 Feb 2006 21:48:07 -0000	1.1
+++ compact2godl.sh	1 Mar 2006 01:09:27 -0000	1.2
@@ -1,3 +1,3 @@

 #!/bin/sh
 

-$PRJ_DIST/GeomConverter/current/bin/GeomConverter -o godl $@

+$PRJ_DIST/GeomConverter/pro/bin/GeomConverter -o godl $@

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- compact2heprep.sh	11 Jul 2005 18:43:32 -0000	1.1
+++ compact2heprep.sh	1 Mar 2006 01:09:27 -0000	1.2
@@ -1,3 +1,3 @@

 #!/bin/sh
 

-$PRJ_DIST/GeomConverter/current/bin/GeomConverter -o heprep $@

+$PRJ_DIST/GeomConverter/pro/bin/GeomConverter -o heprep $@

SlacMCPrj/scripts

diff -u -r1.3 -r1.4
--- compact2lcdd.sh	21 Sep 2005 21:46:38 -0000	1.3
+++ compact2lcdd.sh	1 Mar 2006 01:09:28 -0000	1.4
@@ -7,4 +7,4 @@

 fi
 
 source setup-java.sh 1.5 &> /dev/null

-$PRJ_DIST/GeomConverter/current/bin/GeomConverter -o lcdd $@

+$PRJ_DIST/GeomConverter/pro/bin/GeomConverter -o lcdd $@

SlacMCPrj/scripts

diff -u -r1.5 -r1.6
--- jas-batch.sh	21 Sep 2005 21:58:48 -0000	1.5
+++ jas-batch.sh	1 Mar 2006 01:09:28 -0000	1.6
@@ -9,7 +9,7 @@

 
 # default jar locations
 if [ -z "${JAS_BASE}" ]; then

-  JAS_BASE=$PRJ_DIST/jas3/current/

+  JAS_BASE=$PRJ_DIST/jas3/pro/

 fi
 
 if [ -z "${JAS_EXTENSIONS}" ]; then

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- overlapCheck.sh	23 Sep 2005 00:06:01 -0000	1.1
+++ overlapCheck.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -5,4 +5,4 @@

   exit 1
 fi
 

-slic -g $1 -m $PRJ_DIST/slic/current/macros/geom_chk.mac

+slic -g $1 -m $PRJ_DIST/slic/pro/macros/geom_chk.mac

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- run-SlicDiagnostics.sh	13 Sep 2005 20:32:46 -0000	1.1
+++ run-SlicDiagnostics.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -1,10 +1,3 @@

 #!/bin/sh
 

-if [ -z $1 ]
-then
-  echo "ERROR: Missing argument, which is name of file containing the list of files." 
-  exit 1
-fi
-
-cp=$(addjars ~/.JAS3/extensions/ $PRJ_DIST/SlicDiagnostics/ $PRJ_DIST/jas3/current/lib $PRJ_DIST/jas3/current/extensions)
-java -cp ${cp} org.lcsim.slic.diagnostics.Main $@ &> /dev/null

+$PRJ_DIST/SlicDiagnostics/pro/bin/SlicDiagnostics $@

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- run-ced.sh	15 Sep 2005 21:51:11 -0000	1.1
+++ run-ced.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -1,4 +1,4 @@

 #!/bin/sh

-CED=$PRJ_DIST/MarlinReco/current/linux/CED

+CED=$PRJ_DIST/MarlinReco/pro/linux/CED

 export LD_LIBRARY_PATH=$CED
 $CED/glced &

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- run-jas3.sh	13 Sep 2005 20:32:46 -0000	1.1
+++ run-jas3.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -3,4 +3,4 @@

 # required for org.lcsim plugin
 export JAVAVER=1.5
 

-$PRJ_DIST/jas3/current/jas3 &

+$PRJ_DIST/jas3/pro/jas3 &

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- run-jupiter.sh	11 Jul 2005 18:43:35 -0000	1.1
+++ run-jupiter.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -2,7 +2,7 @@

 
 source ${PRJ_SCRIPTS}/geant4.6.2.p01-env.sh
 

-export J4ROOT=${PRJ_DIST}/jupiter/20041006

+export J4ROOT=${PRJ_DIST}/jupiter/pro

 export JUPITERROOT=${J4ROOT}/Jupiter
 
 export LD_LIBRARY_PATH=${JUPITERROOT}/lib/${G4SYSTEM}

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- setup-OpenScientist.sh	28 Feb 2006 21:17:36 -0000	1.1
+++ setup-OpenScientist.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -1,3 +1,3 @@

 #!/bin/sh

-export CMTPATH=$PRJ_EXTERN/OpenScientist/OpenScientist/v15r0

+export CMTPATH=$PRJ_EXTERN/OpenScientist/pro

 source $CMTPATH/Lab/v11r1/cmt/setup.sh

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- setup-freehep.sh	11 Jul 2005 18:43:36 -0000	1.1
+++ setup-freehep.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -4,7 +4,7 @@

 source ${PRJ_SCRIPTS}/setup-java.sh 1.5.0
 
 # FreeHep dir

-export FREEHEP=$PRJ_EXTERN/freehep/current

+export FREEHEP=$PRJ_EXTERN/freehep/pro

 
 # setup freehep build tools e.g. ant and jars
 export CLASSPATH=`addjars $FREEHEP/lib $FREEHEP/tools`

SlacMCPrj/scripts

diff -u -r1.2 -r1.3
--- setup-gdml.sh	13 Sep 2005 20:32:46 -0000	1.2
+++ setup-gdml.sh	1 Mar 2006 01:09:28 -0000	1.3
@@ -2,7 +2,7 @@

 
 # GDML BASE
 if [ -z "$GDML_BASE" ]; then

-  export GDML_BASE=${PRJ_DIST}/gdml/current

+  export GDML_BASE=${PRJ_DIST}/gdml/pro

 else 
   echo "GDML_BASE=$GDML_BASE from your environment."
 fi

SlacMCPrj/scripts

diff -u -r1.2 -r1.3
--- setup-lcdg4.sh	1 Feb 2006 21:11:44 -0000	1.2
+++ setup-lcdg4.sh	1 Mar 2006 01:09:28 -0000	1.3
@@ -5,7 +5,7 @@

 
 # setup LCDG4_BASE, keeping value from env if set
 if [ -z "$LCDG4_BASE" ]; then

-  export LCDG4_BASE=${PRJ_DIST}/lcdg4/current

+  export LCDG4_BASE=${PRJ_DIST}/lcdg4/pro/

 fi
 
 if [ ! -e "$LCDG4_BASE" ]; then

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- setup-lcio.csh	11 Jul 2005 18:43:37 -0000	1.1
+++ setup-lcio.csh	1 Mar 2006 01:09:28 -0000	1.2
@@ -3,7 +3,7 @@

 if ($?LCIO) then
   echo "LCIO from environment."
 else

-  setenv LCIO $PRJ_DIST/lcio/current

+  setenv LCIO $PRJ_DIST/lcio/pro/

 endif
 
 setenv PATH $LCIO/bin:$LCIO/tools:$PATH

SlacMCPrj/scripts

diff -u -r1.2 -r1.3
--- setup-lcio.sh	15 Sep 2005 21:54:30 -0000	1.2
+++ setup-lcio.sh	1 Mar 2006 01:09:28 -0000	1.3
@@ -6,7 +6,7 @@

 
 # LCIO from dist
 if [ -z "$LCIO" ]; then

-  export LCIO=$PRJ_DIST/lcio/current

+  export LCIO=$PRJ_DIST/lcio/pro

 # LCIO from user's environment
 else
   echo "LCIO from user environment."

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- setup-marlin.sh	15 Sep 2005 21:51:52 -0000	1.1
+++ setup-marlin.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -1,6 +1,6 @@

 #!/bin/sh
 

-export MARLIN=$PRJ_DIST/MarlinReco/current/linux/marlin/0.9.1

+export MARLIN=$PRJ_DIST/MarlinReco/pro/linux/marlin/0.9.1

 cd $MARLIN
 source env.sh_ORG
 cd -

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- setup-mokka.sh	11 Jul 2005 18:43:37 -0000	1.1
+++ setup-mokka.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -2,10 +2,10 @@

 
 # base dir
 if [ -z "$MOKKA_BASE" ]; then

-  export MOKKA_BASE=${PRJ_DIST}/mokka/current

+  export MOKKA_BASE=${PRJ_DIST}/mokka/pro/

 fi
 

-export G4WORKDIR=${MOKKA_BASE}/current/source

+export G4WORKDIR=${MOKKA_BASE}/source

 
 # print
 echo MOKKA_BASE=$MOKKA_BASE

SlacMCPrj/scripts

diff -u -r1.2 -r1.3
--- setup-root.csh	13 Sep 2005 21:19:29 -0000	1.2
+++ setup-root.csh	1 Mar 2006 01:09:28 -0000	1.3
@@ -1,6 +1,6 @@

 #!/bin/csh
 

-setenv ROOTSYS "${PRJ_EXTERN}/root/current"

+setenv ROOTSYS "${PRJ_EXTERN}/root/pro"

 setenv PATH "${ROOTSYS}/bin:${PATH}"
 
 if ( $?LD_LIBRARY_PATH ) then

SlacMCPrj/scripts

diff -u -r1.2 -r1.3
--- setup-root.sh	15 Sep 2005 21:52:31 -0000	1.2
+++ setup-root.sh	1 Mar 2006 01:09:28 -0000	1.3
@@ -1,7 +1,7 @@

 #!/bin/sh
 
 if [ -z "${ROOTSYS}" ]; then

-  export ROOTSYS=${PRJ_EXTERN}/root/current

+  export ROOTSYS=${PRJ_EXTERN}/root/pro/

 else
   echo "ROOTSYS from environment"
 fi

SlacMCPrj/scripts

diff -u -r1.2 -r1.3
--- setup-slic.sh	28 Feb 2006 21:17:22 -0000	1.2
+++ setup-slic.sh	1 Mar 2006 01:09:28 -0000	1.3
@@ -1,7 +1,7 @@

 #!/bin/sh
 
 if [ -z "$SLIC_BASE" ]; then

-  export SLIC_BASE=${PRJ_DIST}/slic/current

+  export SLIC_BASE=${PRJ_DIST}/slic/pro

 fi
 
 echo "SLIC_BASE=$SLIC_BASE"

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- splitstd.sh	11 Jul 2005 18:43:38 -0000	1.1
+++ splitstd.sh	1 Mar 2006 01:09:28 -0000	1.2
@@ -1,6 +1,6 @@

 #!/bin/sh
 

-FREEHEP=${PRJ_EXTERN}/freehep/current

+FREEHEP=${PRJ_EXTERN}/freehep/pro

 SPLITTER=${PRJ_CONTRIB}/java
 
 echo "FREEHEP=$FREEHEP"