Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7981)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7982)
@@ -18,4 +18,18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/09/28 Daniela Dorner
+
+   * datacenter/scripts/checkfilesforsequenceavail, 
+     datacenter/scripts/runcallisto:
+     - improved processlog
+
+   * datacenter/scripts/setup, datacenter/scripts/linkmc, 
+     datacenter/scripts/mcsequences, 
+     datacenter/scripts/processmcsequences:
+     - moved mcpath to setup
+     - updated mcpath
+
+
 
  2006/09/28 Thomas Bretz
Index: trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail	(revision 7981)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail	(revision 7982)
@@ -93,5 +93,5 @@
            ;;
       *)   echo " check1=$check1 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
-           printprocesslog "ERROR $program.C failed"
+           printprocesslog "ERROR $program.C failed for sequence $sequence"
            com=$Ffilesavail
            check=$check1
Index: trunk/MagicSoft/Mars/datacenter/scripts/linkmc
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/linkmc	(revision 7981)
+++ trunk/MagicSoft/Mars/datacenter/scripts/linkmc	(revision 7982)
@@ -31,10 +31,10 @@
 #
 # original structure:
-# /montecarlo/camera/
+# /magic/montecarlo/camera/
 #
 # new structure: 
-# /montecarlo/rawfiles/YYYY/MM/DD/file.root
+# /magic/montecarlo/rawfiles/YYYY/MM/DD/file.root
 # more explanation concerning the file structure can be found in the file
-# /montecarlo/rawfiles/README.txt
+# /magic/montecarlo/rawfiles/README.txt
 #
 # First the data files are linked and then in each new directory also the 
@@ -55,9 +55,8 @@
 checklock  >> $scriptlog 2>&1
 
-mccampath=/montecarlo/camera
-mcpath=/montecarlo/rawfiles
-next=$mcpath/.next #in .next the next runno is stored
-processed=$mcpath/.processed #in .processed the linked files are stored
-readme=$mcpath/README.txt #file in which the information about the modes is redirected to have always an updated explanation
+mccampath=$mcpath/camera
+next=$mcrawpath/.next #in .next the next runno is stored
+processed=$mcrawpath/.processed #in .processed the linked files are stored
+readme=$mcrawpath/README.txt #file in which the information about the modes is redirected to have always an updated explanation
 
 # check if file with next runnumber is available
@@ -163,5 +162,5 @@
    project=${particle}${zbin}${wobblemode} #build project name
    #create new filename
-   newfile="$mcpath/19$zbin/$totalmode/$psf/19${zbin}${totalmode}${psf}_${no2}_D_${project}_E.root"
+   newfile="$mcrawpath/19$zbin/$totalmode/$psf/19${zbin}${totalmode}${psf}_${no2}_D_${project}_E.root"
    newdir=`dirname $newfile`
    makedir $newdir >> $scriptlog 2>&1
@@ -194,5 +193,5 @@
 
 #get all directories in the linked structure
-dirs=`find $mcpath -type d`
+dirs=`find $mcrawpath -type d`
 
 for dir in ${dirs[@]}
Index: trunk/MagicSoft/Mars/datacenter/scripts/mcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 7981)
+++ trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 7982)
@@ -47,10 +47,7 @@
 checklock  >> $scriptlog 2>&1
 
-mcpath=/montecarlo/rawfiles
-mcsequpath=/montecarlo/sequences
-
 # find montecarlo directories, build one sequence per directory and write sequence file
 printprocesslog "INFO building one sequence per mcdirectory"
-dirs=`find $mcpath -type d`
+dirs=`find $mcrawpath -type d`
 for dir in ${dirs[@]}
 do 
Index: trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences	(revision 7981)
+++ trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences	(revision 7982)
@@ -45,8 +45,6 @@
 checklock  >> $scriptlog 2>&1
 
-mcpath=/montecarlo/rawfiles
-mccalpath=/montecarlo/callisto
-mcimgpath=/montecarlo/star
-mcsequpath=/montecarlo/sequences
+mccalpath=$mcpath/callisto
+mcimgpath=$mcpath/star
 callistorc=$setuppath/callisto/callisto.rc
 
@@ -89,6 +87,6 @@
    fi
    # calibrate data
-   echo "./callisto -mc -f -b -q --ind=$mcpath/$date --log=$caloutpath/callisto$sequno.log --html=$caloutpath/callisto$sequno.html --out=$caloutpath --config=$callistorcseq $sequfile 2>> $scriptlog > /dev/null" >> $scriptlog 2>&1
-   ./callisto -mc -f -b -q --ind=$mcpath/$date --log=$caloutpath/callisto$sequno.log --html=$caloutpath/callisto$sequno.html --out=$caloutpath --config=$callistorcseq $sequfile 2>> $scriptlog > /dev/null
+   echo "./callisto -mc -f -b -q --ind=$mcrawpath/$date --log=$caloutpath/callisto$sequno.log --html=$caloutpath/callisto$sequno.html --out=$caloutpath --config=$callistorcseq $sequfile 2>> $scriptlog > /dev/null" >> $scriptlog 2>&1
+   ./callisto -mc -f -b -q --ind=$mcrawpath/$date --log=$caloutpath/callisto$sequno.log --html=$caloutpath/callisto$sequno.html --out=$caloutpath --config=$callistorcseq $sequfile 2>> $scriptlog > /dev/null
    check1=$?
    # if calibration worked -> run star for sequence
Index: trunk/MagicSoft/Mars/datacenter/scripts/runcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7981)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7982)
@@ -187,5 +187,5 @@
 	  ;;
    *)   echo " check1=$check1 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
-        printprocesslog "ERROR $program failed for sequence $sequence"
+        printprocesslog "ERROR $program failed for sequence $sequence (return code $check1)"
         com=$Fcallisto
         check=$check1
Index: trunk/MagicSoft/Mars/datacenter/scripts/setup
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/setup	(revision 7981)
+++ trunk/MagicSoft/Mars/datacenter/scripts/setup	(revision 7982)
@@ -48,4 +48,7 @@
 datasetpath=/magic/datasets
 
+mcpath=/magic/montecarlo
+mcrawpath=$mcpath/rawfiles
+mcsequpath=$mcpath/sequences
 
 webpath=/www/htdocs/datacenter