Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7937)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7938)
@@ -18,4 +18,29 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/08/25 Daniela Hoehne
+
+   * datacenter/scripts/setup: 
+     - implemented new path for runlogs
+
+   * datacenter/scripts/buildsequenceentries, datacenter/scripts/
+     checkfilesforsequenceavail, datacenter/scripts/checkstardone,  
+     datacenter/scripts/copyscript, datacenter/scripts/correcttime,
+     datacenter/scripts/dodatacheck, datacenter/scripts/doexclusions,
+     datacenter/scripts/doqualityplots, datacenter/scripts/dowebplots,
+     datacenter/scripts/filesondisk, datacenter/scripts/fillcallisto,
+     datacenter/scripts/fillganymed, datacenter/scripts/fillstar,
+     datacenter/scripts/insertdatasets, datacenter/scripts/insertsequences,
+     datacenter/scripts/linkmc, datacenter/scripts/makecallistolinks,
+     datacenter/scripts/runcallisto, datacenter/scripts/runganymed,
+     datacenter/scripts/runstar, datacenter/scripts/processmcsequences,
+     datacenter/scripts/mcsequences:
+     - improved logging (changed runlogpath)
+
+   * datacenter/scripts/checkstardone, datacenter/scripts/insertdatasets,
+     datacenter/scripts/insertsequences:
+     - changed logging outpath
+
+
+
  2006/08/25 Daniela Dorner
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries	(revision 7938)
@@ -44,5 +44,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail	(revision 7938)
@@ -42,5 +42,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/checkstardone
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checkstardone	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checkstardone	(revision 7938)
@@ -43,5 +43,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program-$datetime.log
@@ -69,4 +69,5 @@
 do 
    no=`printf %08d $dataset | cut -c 0-5`
+   no2=`printf %08d $dataset`
    var1=$no
    var2=$dataset
@@ -84,5 +85,5 @@
    echo "sequences: "${sequences[@]} >> $scriptlog 2>&1
 
-   outpath=$logpath/$program/$no
+   outpath=$logpath/$program/$no/$no2
    makedir $outpath  >> $scriptlog 2>&1 
    
Index: trunk/MagicSoft/Mars/datacenter/scripts/copyscript
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/copyscript	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/copyscript	(revision 7938)
@@ -69,5 +69,5 @@
 lockfile=$lockpath/lock-copyscript.txt
 
-scriptlogpath=$logpath/run/copyscript/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/correcttime
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/correcttime	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/correcttime	(revision 7938)
@@ -43,4 +43,5 @@
 
 lockfile=$lockpath/lock-$program.txt
+scriptlogpath=$runlogpath/$program
 
 if [ -e $todofile ]
Index: trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck	(revision 7938)
@@ -45,5 +45,5 @@
 set -C
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/doexclusions
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/doexclusions	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/doexclusions	(revision 7938)
@@ -44,5 +44,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/doqualityplots
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/doqualityplots	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/doqualityplots	(revision 7938)
@@ -42,5 +42,5 @@
 datetime=`date +%F-%H-%M-%S`
 
-scriptlogpath=$logpath/run/doqualityplots/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/dowebplots
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/dowebplots	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/dowebplots	(revision 7938)
@@ -41,5 +41,5 @@
 datetime=`date +%F-%H-%M-%S`
 
-scriptlogpath=$logpath/run/dowebplots/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/filesondisk
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/filesondisk	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/filesondisk	(revision 7938)
@@ -55,5 +55,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto	(revision 7938)
@@ -45,5 +45,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/run$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/fillganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7938)
@@ -44,5 +44,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/run$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/fillstar
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillstar	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillstar	(revision 7938)
@@ -44,5 +44,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/run$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7938)
@@ -42,5 +42,5 @@
 lockfile=$lockpath/lock-insertdatasets.txt
 
-scriptlogpath=$logpath/run/insertdatasets/`date +%Y/%m`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 
@@ -65,4 +65,5 @@
    no2=`grep 'AnalysisNumber:' $datasetfile | sed -e 's/AnalysisNumber://g' | sed -e 's/ //g'`
    no3=`printf %08d $no2`
+   no4=`printf %08d $no2 | cut -c 1-5`
    # compare the two datasetnumber 
    # continue only if number is the same
@@ -93,5 +94,5 @@
    echo " " >> $scriptlog 2>&1 
    
-   insertdatasetpath=$logpath/insertdataset/$no3
+   insertdatasetpath=$logpath/insertdataset/$no4
    makedir $insertdatasetpath >> $scriptlog 2>&1
    insertdatasetlog=$insertdatasetpath/insertdataset-$no3.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/insertsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertsequences	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertsequences	(revision 7938)
@@ -44,5 +44,5 @@
 lockfile=$lockpath/lock-insertsequences.txt
 
-scriptlogpath=$logpath/run/insertsequences/`date +%Y/%m`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 
@@ -66,4 +66,5 @@
    echo "file: "$sequencefile >> $scriptlog 2>&1 
    no=`echo $sequencefile | cut -c 31-38`
+   no=`echo $no | cut -c 1-4`
    insertsequencepath=$logpath/insertsequence/$no
    makedir $insertsequencepath >> $scriptlog 2>&1
Index: trunk/MagicSoft/Mars/datacenter/scripts/linkmc
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/linkmc	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/linkmc	(revision 7938)
@@ -47,5 +47,5 @@
 set -C
 
-scriptlogpath=$logpath/run/linkmc/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/linkmc`date +%F`.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks	(revision 7938)
@@ -41,5 +41,5 @@
 callistorcnew=callisto_Dec04Jan05.rc
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program`date +%F`.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/mcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 7938)
@@ -39,5 +39,5 @@
 set -C
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program`date +%F`.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 7938)
@@ -38,5 +38,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences	(revision 7938)
@@ -37,5 +37,5 @@
 set -C
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/$program`date +%F-%H-%M-%S`.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/runcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7938)
@@ -49,5 +49,5 @@
 #pno=500 # number of processes, i.e. number of todo-files
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/run$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/runganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7938)
@@ -44,5 +44,5 @@
 column=fGanymed
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/run$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/runstar
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runstar	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runstar	(revision 7938)
@@ -44,5 +44,5 @@
 column=fStar
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/run$program-$datetime.log
Index: trunk/MagicSoft/Mars/datacenter/scripts/setup
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/setup	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/setup	(revision 7938)
@@ -34,4 +34,5 @@
 
 logpath=/magic/datacenter/autologs
+runlogpath=/magic/datacenter/autologs/run/`date +%Y/%m/%d`
 lockpath=/magic/datacenter/locks
 listpath=/magic/datacenter/lists
Index: trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles	(revision 7937)
+++ trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles	(revision 7938)
@@ -44,5 +44,5 @@
 lockfile=$lockpath/lock-$program.txt
 
-scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
+scriptlogpath=$runlogpath/$program
 makedir $scriptlogpath
 scriptlog=$scriptlogpath/run$program-$datetime.log