Index: trunk/MagicSoft/Mars/datacenter/scripts/checkmd5sum
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checkmd5sum	(revision 8858)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checkmd5sum	(revision 8886)
@@ -20,5 +20,5 @@
 #   Author(s): Stefan Ruegamer 05/2007 <mailto:snruegam@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2007
+#   Copyright: MAGIC Software Development, 2000-2008
 #
 #
@@ -74,5 +74,5 @@
       
       # check if the file has been extracted from tape; if not, don't write anything to the logfiles (so they can still be compared)
-      if [ ! -f /magic/datacenter/fromtape/${sum[0]} ]
+      if [ ! -f /magic/datacenter/fromtape/${sum[0]} ] && [ ! -f /data/fromtape/${sum[0]} ]
       then
       	echo "File ${sum[0]} does not exist."
@@ -83,6 +83,11 @@
       echo "${sum[1]}  ${sum[0]}" >> ${checkpath}/tape_${id}.md5.lapalma
       
-      ssh -nx phoenix nice -n 19 /opt/csw/bin/gmd5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
-      #md5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+      if [ ! -f /magic/datacenter/fromtape/${sum[0]} ]
+      then
+         ssh -nx phoenix nice -n 19 /opt/csw/bin/gmd5sum /data/fromtape/${sum[0]} | sed -e 's/\/data\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+      else
+         ssh -nx phoenix nice -n 19 /opt/csw/bin/gmd5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+         #md5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+      fi
    fi
 done < $file
Index: trunk/MagicSoft/Mars/datacenter/scripts/checktransfer
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checktransfer	(revision 8858)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checktransfer	(revision 8886)
@@ -64,5 +64,5 @@
 
 #checking if there are temporary zipfiles
-files=`find $datapath/rawfiles/ -name ".*\.raw\.??????"`
+files=`find $datapath/rawfiles/20[0-1][0-9]/ -name ".*\.raw\.??????"`
 
 for file in ${files[@]}
Index: trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles2
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles2	(revision 8886)
+++ trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles2	(revision 8886)
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# ========================================================================
+#
+# *
+# * This file is part of MARS, the MAGIC Analysis and Reconstruction
+# * Software. It is distributed to you in the hope that it can be a useful
+# * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+# * It is distributed WITHOUT ANY WARRANTY.
+# *
+# * Permission to use, copy, modify and distribute this software and its
+# * documentation for any purpose is hereby granted without fee,
+# * provided that the above copyright notice appear in all copies and
+# * that both that copyright notice and this permission notice appear
+# * in supporting documentation. It is provided "as is" without express
+# * or implied warranty.
+# *
+#
+#
+#   Author(s): Daniela Dorner  08/2004 <mailto:dorner@astro.uni-wuerzburg.de>
+#   Author(s): Stefan Ruegamer 02/2007 <mailto:snruegam@astro.uni-wuerzburg.de>
+#
+#   Copyright: MAGIC Software Development, 2000-2007
+#
+#
+# ========================================================================
+#
+# This script is moving the rawfiles from the directory
+# /magic/datacenter/fromtape/rawdata to the structure
+# /magic/data/rawfiles/YYYY/MM/DD
+# 
+# As the data transfer is at the moment not working via .finished files,
+# you have to use the script movingrawfiles_OK for moving these data
+# 
+
+source `dirname $0`/sourcefile
+printprocesslog "INFO starting $0"
+program=movingrawfiles2
+
+set -C
+umask 0002
+
+scriptlog=$runlogpath/$program-$datetime.log
+date >> $scriptlog 2>&1
+
+# check whether script is already running
+lockfile=$lockpath/lock-$program.txt
+checklock  >> $scriptlog 2>&1
+
+# change permission for files
+#ssh tape@dc07 chmod -R g+w /magic/datacenter/fromtape/rawdata/* >> $scriptlog 2>&1
+# output for chmod with -v or -c (only changes)
+
+# outdated, .finished files are no longer used
+#printprocesslog "INFO moving directories from fromlapalma to fromtape"
+# find directories which have to be copied
+#dirs=`ls /magic/datacenter/fromlapalma/RAWchk/*/*.finished | sed -e 's/RAWchk/RAW/g' | cut -d/ -f1-6`
+#if [ ! "$dirs" == "" ]
+#then
+   # change permission for this directories
+   #ssh lapalma@dc09 chmod -R g+w $dirs >> $scriptlog 2>&1
+   # move directories to the tapedirectory
+   #mv -v $dirs /magic/datacenter/fromtape/rawdata/ >> $scriptlog 2>&1
+#fi
+
+#printprocesslog "INFO moving directories from muxdata to rawdata"
+# find directories which have to be copied
+#days=`find /data/tmp/muxdata/* -type d`
+#if [ ! "$days" == "" ]
+#then
+   # move directories to the tapedirectory
+#   mv -v $days /magic/datacenter/fromtape/rawdata/ >> $scriptlog 2>&1
+#fi
+
+
+# find rawfiles
+rawfiles=`find /data/fromtape/muxdata/ -name '*.*'`
+
+if [ "$rawfiles" == "" ]
+then
+   echo "no files to move -> exit" >> $scriptlog 2>&1
+   finish >> $scriptlog 2>&1
+fi
+
+printprocesslog "INFO moving rawfiles to $datapath/rawfiles"
+for rawfile in $rawfiles
+do
+# workaround for rawfiles with wrong timing
+#   newrawfile=`echo $rawfile | sed -e 's/center\/fromtape\/rawdata/\/rawfiles-wrong-timing/g' -e 's/_/\//1' -e 's/_/\//1'`
+   newrawfile=`echo $rawfile | sed -e 's/\/fromtape\/muxdata//g' -e 's/_/\//1' -e 's/_/\//1'`
+   newdir=`dirname $newrawfile`
+   makedir $newdir >> $scriptlog 2>&1
+   
+   mv -v $rawfile $newrawfile >> $scriptlog 2>&1
+done
+
+rmdir -v /data/fromtape/muxdata/* >> $scriptlog 2>&1
+
+printprocesslog "INFO launching filesondisk"
+echo "launching filesondisk" >> $scriptlog 2>&1
+$scriptspath/filesondisk&
+
+finish >> $scriptlog 2>&1
+
Index: trunk/MagicSoft/Mars/datacenter/scripts/runcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 8858)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 8886)
@@ -71,23 +71,8 @@
 sequfile="$sequpath/$no/sequence$no2.txt"
 
-# stage the needed files; to be removed as soon as the correct stub file size has been determined
-echo "staging files:" >> $scriptlog 2>&1
-day=`grep Night $sequfile | cut -c 18-27 | sed -e "s/-/\//g"`
-runs=`grep ^Runs $sequfile | cut -d: -f2`
-i=0
-
-for run in ${runs[@]}
-do
-   files[i]=20*_0*${run}_[PCD]_*_E.raw.gz
-   echo ${datapath}/rawfiles/${day}/${files[i]} >> $scriptlog 2>&1
-   let i++
-done
-
-ssh -nx phoenix "cd ${datapath}/rawfiles/${day}; /opt/SUNWsamfs/bin/stage ${files[@]}"
-
-
 # define callisto.rc files
 callistorcnew=$setuppath/$program/callisto.rc
-callistorcmux=$setuppath/$program/callisto_mux.rc
+#callistorcmux=$setuppath/$program/callisto_mux.rc
+callistorcmux=$setuppath/$program/callisto_mux_new.rc
 # find callisto.rc file
 if [ -e $outpath/callisto.rc ]
@@ -118,4 +103,20 @@
 primvar=$no2
 setstatus "start" >> $scriptlog 2>&1
+
+# stage the needed files; to be removed as soon as the correct stub file size has been determined
+echo "staging files:" >> $scriptlog 2>&1
+day=`grep Night $sequfile | cut -c 18-27 | sed -e "s/-/\//g"`
+runs=`grep ^Runs $sequfile | cut -d: -f2`
+i=0
+
+for run in ${runs[@]}
+do
+   files[i]=20*_0*${run}_[PCD]_*_E.raw.gz
+   echo ${datapath}/rawfiles/${day}/${files[i]} >> $scriptlog 2>&1
+   let i++
+done
+
+ssh -nx phoenix "cd ${datapath}/rawfiles/${day}; /opt/SUNWsamfs/bin/stage ${files[@]}"
+
 
 echo "./callisto -b -q -v4 -f --log=$outpath/$program$no2.log --html=$outpath/$program$no2.html --out=$outpath --config=$callistorcseq $sequfile  2>> $scriptlog > /dev/null" >> $scriptlog 2>&1
Index: trunk/MagicSoft/Mars/datacenter/scripts/zipscript
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/zipscript	(revision 8858)
+++ trunk/MagicSoft/Mars/datacenter/scripts/zipscript	(revision 8886)
@@ -36,6 +36,6 @@
 set -C
 
-rawdatapath=$datapath/rawfiles
-files=`find $rawdatapath -type f -name '*.raw'`
+rawdatapath=$datapath/rawfiles/
+files=`find ${rawdatapath}20* -type f -name '*.raw'`
 
 scriptlog=$runlogpath/$program-$datetime.log
@@ -83,5 +83,5 @@
    fi
    echo "zipping $file ..." >> $scriptlog 2>&1
-   if ssh -x phoenix nice -n 19 gzip -1f $file >> $scriptlog 2>&1
+   if ssh -xn phoenix nice -n 19 gzip -1f $file >> $scriptlog 2>&1
    then 
       gzfile=$file".gz"