Index: trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries	(revision 7815)
@@ -36,7 +36,6 @@
 #
 
-user=`whoami`
 program=buildsequenceentries
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail	(revision 7815)
@@ -36,7 +36,6 @@
 #
 
-user=`whoami`
 program=checkfilesavail
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 table=SequenceProcessStatus
Index: trunk/MagicSoft/Mars/datacenter/scripts/checkstardone
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checkstardone	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checkstardone	(revision 7815)
@@ -37,7 +37,6 @@
 #
 
-user=`whoami`
 program=checkstardone
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 table=DataSetProcessStatus
Index: trunk/MagicSoft/Mars/datacenter/scripts/copyscript
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/copyscript	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/copyscript	(revision 7815)
@@ -57,7 +57,6 @@
 #
 
-user=`whoami`
 program=copyscript
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/correcttime
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/correcttime	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/correcttime	(revision 7815)
@@ -38,7 +38,6 @@
 #
 
-user=`whoami`
 program=correct_raw_time
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 table=RunProcessStatus
Index: trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck	(revision 7815)
@@ -40,7 +40,6 @@
 #
 
-user=`whoami`
 program=datacheck
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/doexclusions
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/doexclusions	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/doexclusions	(revision 7815)
@@ -36,7 +36,6 @@
 #
 
-user=`whoami`
 program=doexclusions
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/doqualityplots
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/doqualityplots	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/doqualityplots	(revision 7815)
@@ -33,7 +33,6 @@
 #
 
-user=`whoami`
 program=doqualityplots
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/dowebplots
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/dowebplots	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/dowebplots	(revision 7815)
@@ -32,7 +32,6 @@
 #
 
-user=`whoami`
 program=dowebplots
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/filesondisk
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/filesondisk	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/filesondisk	(revision 7815)
@@ -45,6 +45,5 @@
 # 
 
-user=`whoami`
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto	(revision 7815)
@@ -37,7 +37,6 @@
 #
 
-user=`whoami`
 program=fillcallisto
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/fillganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7815)
@@ -36,7 +36,6 @@
 #
 
-user=`whoami`
 program=fillganymed
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/fillstar
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillstar	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillstar	(revision 7815)
@@ -36,7 +36,6 @@
 #
 
-user=`whoami`
 program=fillstar
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7815)
@@ -32,7 +32,6 @@
 #
 
-user=`whoami`
 program=insertdatasets
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/insertsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertsequences	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertsequences	(revision 7815)
@@ -33,7 +33,6 @@
 # 
 
-user=`whoami`
 program=insertsequences
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/linkmc
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/linkmc	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/linkmc	(revision 7815)
@@ -42,7 +42,6 @@
 #
 
-user=`whoami`
 program=linkmc
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks	(revision 7815)
@@ -33,7 +33,6 @@
 #
 
-user=`whoami`
 program=makecallistolinks
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/mcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 7815)
@@ -34,7 +34,6 @@
 # 
 
-user=`whoami`
 program=mcsequences
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 7815)
@@ -30,6 +30,5 @@
 # 
 
-user=`whoami`
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences	(revision 7815)
@@ -32,7 +32,6 @@
 #
 
-user=`whoami`
 program=processmcsequences
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/rmlocks
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/rmlocks	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/rmlocks	(revision 7815)
@@ -37,6 +37,5 @@
 #
 
-user=`whoami`
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 files=`ls $lockpath/*`
Index: trunk/MagicSoft/Mars/datacenter/scripts/runcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7815)
@@ -37,7 +37,6 @@
 #
 
-user=`whoami`
 program=callisto
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/runganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7815)
@@ -37,7 +37,6 @@
 #
 
-user=`whoami`
 program=ganymed
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/runstar
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runstar	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runstar	(revision 7815)
@@ -37,7 +37,6 @@
 #
 
-user=`whoami`
 program=star
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C
Index: trunk/MagicSoft/Mars/datacenter/scripts/sourcefile
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/sourcefile	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/sourcefile	(revision 7815)
@@ -33,5 +33,5 @@
 export PATH=$PATH:$ROOTSYS/bin
 
-mars=/home/operator/Mars
+mars=/home/$USER/Mars
 macrospath=$mars/datacenter/macros
 scriptspath=$mars/datacenter/scripts
Index: trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles	(revision 7811)
+++ trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles	(revision 7815)
@@ -36,7 +36,6 @@
 #
 
-user=`whoami`
 program=writesequencefile
-source /home/$user/Mars/datacenter/scripts/sourcefile
+source /home/$USER/Mars/datacenter/scripts/sourcefile
 
 set -C