Index: trunk/MagicSoft/Mars/datacenter/scripts/checkmd5sum
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/checkmd5sum	(revision 8602)
+++ trunk/MagicSoft/Mars/datacenter/scripts/checkmd5sum	(revision 8682)
@@ -1,16 +1,65 @@
-#!/bin/bash
-echo "Please specify the tape number (e.g. 3MG005L3)."
+#!/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): Stefan Ruegamer 05/2007 <mailto:snruegam@astro.uni-wuerzburg.de>
+#
+#   Copyright: MAGIC Software Development, 2000-2007
+#
+#
+# ========================================================================
+#
+# This script is checking the md5 sums of files read from tape. It
+# computes the checksums for the extracted files and compares them with
+# the checksums from La Palma, read out from the md5 sum file which is
+# transferred together with the logfile.
+#
+# The script will be automised by being executed after reading tapes with
+# the not-yet finished script readlapalmatapes. At the moment it is being
+# executed by hand.
+#
+
+echo "Please specify the tape number (e.g. 3MG005)."
 read no
 echo "Thank you. Your query is being processed. This may take some time."
 
 checkpath=/home/lapalma/tapecont/cont/muxdata/checksums
-file=/home/lapalma/tapecont/cont/muxdata/tape_${no}.md5
+file=/home/lapalma/tapecont/cont/muxdata/tape_${no}L*.md5
+L=`echo $file | cut -c49`
+id=${no}L${L}
+
 if [ ! -f $file ]
 then
-	echo "tape $file not found."
+	echo "tape $file not found -> aborting"
         exit
 fi
 
-date | tee ${checkpath}/tape_${no}.md5.lapalma | tee ${checkpath}/tape_${no}.md5.wue
+if [ ${checkpath}/tape_${id}.md5.lapalma ] || [ -f ${checkpath}/tape_${id}.md5.wue ]
+then
+	echo "Output files already existing. Are you sure you wish to continue (yes/no)?"
+        read cont
+        if [ ! $cont == "yes" ]
+        then
+        	echo "Aborting."
+	        exit
+        fi
+fi
+        
+date | tee ${checkpath}/tape_${id}.md5.lapalma | tee ${checkpath}/tape_${id}.md5.wue
 
 # read the tapecont file line by line
@@ -23,24 +72,24 @@
 		sum=($line)
                 # reformat the files and checksums correctly and compare them
-	        echo "${sum[1]}  ${sum[0]}" >> ${checkpath}/tape_${no}.md5.lapalma
+	        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_${no}.md5.wue
-                #md5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${no}.md5.wue
+         	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
 done < $file
 
-date | tee -a ${checkpath}/tape_${no}.md5.lapalma | tee -a ${checkpath}/tape_${no}.md5.wue
+date | tee -a ${checkpath}/tape_${id}.md5.lapalma | tee -a ${checkpath}/tape_${id}.md5.wue
 
-if [ ! -f ${checkpath}/tape_${no}.md5.lapalma ] || [ ! -f ${checkpath}/tape_${no}.md5.wue ]
+if [ ! -f ${checkpath}/tape_${id}.md5.lapalma ] || [ ! -f ${checkpath}/tape_${id}.md5.wue ]
 then
-	echo "No output files written! Something went wrong..."
+	echo "No output files written! Something went wrong... -> aborting"
         exit
 fi
 
-echo "Wrote checksums to ${checkpath}/tape_${no}.md5.lapalma and ${checkpath}/tape_${no}.md5.wue. Comparing now."
+echo "Wrote checksums to ${checkpath}/tape_${id}.md5.lapalma and ${checkpath}/tape_${id}.md5.wue. Comparing now."
 
 
 # check for differences in the checksums
-output=`diff ${checkpath}/tape_${no}.md5.lapalma ${checkpath}/tape_${no}.md5.wue`
+output=`diff ${checkpath}/tape_${id}.md5.lapalma ${checkpath}/tape_${id}.md5.wue`
 
 if [ "$output" = "" ]
Index: trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 8602)
+++ trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 8682)
@@ -19,4 +19,5 @@
 #
 #   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
@@ -28,4 +29,7 @@
 # /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
 # 
 
@@ -48,14 +52,15 @@
 # output for chmod with -v or -c (only changes)
 
-printprocesslog "INFO moving directories from fromlapalma to fromtape"
+# 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
+#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@apollo chmod -R g+w $dirs >> $scriptlog 2>&1
+   #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
+   #mv -v $dirs /magic/datacenter/fromtape/rawdata/ >> $scriptlog 2>&1
+#fi
 
 printprocesslog "INFO moving directories from muxdata to rawdata"
@@ -80,5 +85,5 @@
 printprocesslog "INFO moving rawfiles to $datapath/rawfiles"
 for rawfile in $rawfiles
-do 
+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'`
@@ -86,5 +91,5 @@
    newdir=`dirname $newrawfile`
    makedir $newdir >> $scriptlog 2>&1
-
+   
    mv -v $rawfile $newrawfile >> $scriptlog 2>&1
 done
Index: trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles_OK
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles_OK	(revision 8682)
+++ trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles_OK	(revision 8682)
@@ -0,0 +1,111 @@
+#!/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
+# 
+# Before running this script via cronjob, a check has to be included
+# which logs in to La Palma and checks if the corresponding link in the
+# Wuerbzurg transfer folder has already been deleted (else the file will
+# be transferred again after moving)
+# 
+
+source `dirname $0`/sourcefile
+printprocesslog "INFO starting $0"
+program=movingrawfiles_OK
+
+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
+ssh lapalma@dc09 chmod -R g+w /magic/datacenter/fromlapalma/RAW*/ >> $scriptlog 2>&1
+# output for chmod with -v or -c (only changes)
+
+printprocesslog "INFO moving directories from fromlapalma to fromtape"
+#find directories which have to be copied
+dirs=`ls /magic/datacenter/fromlapalma/RAW/*/*.OK | sed -e 's/.OK//g'`
+if [ ! "$dirs" == "" ]
+then
+   # change permission for this directories
+   ssh lapalma@dc09 chmod -R g+w $dirs >> $scriptlog 2>&1
+   # move directories to the tapedirectory
+   dates=`find /magic/datacenter/fromlapalma/RAW/*200* -type d | cut -d/ -f6`
+   for date in ${dates[@]}
+   do
+	ssh lapalma@dc09 mkdir /magic/datacenter/fromlapalma/RAWchk/$date >> $scriptlog 2>&1
+      	makedir /magic/datacenter/fromtape/rawdata/$date >> $scriptlog 2>&1
+        
+   	OKs=`ls /magic/datacenter/fromlapalma/RAW/$date/*.OK`
+      	for OK in ${OKs[@]}
+        do
+		ssh lapalma@dc09 mv -v $OK /magic/datacenter/fromlapalma/RAWchk/$date/ >> $scriptlog 2>&1
+                files=`echo $OK | sed -e 's/.OK//g'`
+		mv -v $files /magic/datacenter/fromtape/rawdata/$date/ >> $scriptlog 2>&1
+	done
+   done
+fi
+
+rmdir -vp /magic/datacenter/fromlapalma/RAW/*200* >> $scriptlog 2>&1
+
+# find rawfiles
+rawfiles=`find /magic/datacenter/fromtape/rawdata/ -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/center\/fromtape\/rawdata/\/rawfiles/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 /magic/datacenter/fromtape/rawdata/* >> $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/setup
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/setup	(revision 8602)
+++ trunk/MagicSoft/Mars/datacenter/scripts/setup	(revision 8682)
@@ -68,14 +68,14 @@
 max=18 #maximum number of processes
 
-#scripts=( "runcallisto" "runstar" "runganymed" "dodatacheck" ) 
-#scriptscolname=( "fCallisto" "fStar" "fGanymed" "fDataCheckDone" ) 
-datascripts=( "runcallisto" "runstar" "runganymed" ) 
-datascriptscolname=( "fCallisto" "fStar" "fGanymed" ) 
+#scripts=( "runcallisto" "runstar" "runganymed" "dodatacheck" )
+#scriptscolname=( "fCallisto" "fStar" "fGanymed" "fDataCheckDone" )
+datascripts=( "runcallisto" "runstar" "runganymed" )
+datascriptscolname=( "fCallisto" "fStar" "fGanymed" )
 
 #hour:            0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
-pnototal=(       25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 )
-pnototalwe=(     25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 )
+pnototal=(       26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26)
+pnototalwe=(     26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26)
 
-pnocallisto=(    12 12 12 12 12 12 12 10  9  8  7  7  7  7  7  7  7  7  7  8  9 10 12 12 )
+pnocallisto=(    12 12 12 12 12 10 10  9  9  8  8  8  8  8  8  8  8  8  8  9  9 10 10 12 )
 pnostar=(         8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8 )
 pnoganymed=(      4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4 )
@@ -93,6 +93,6 @@
 
 # values for mc production
-mcscripts=( "runcorsika" "runreflector" "runcamera" ) 
-mcscriptscolname=( "fCorsikaFileAvail" "fReflectorFileAvail" "fCameraFileAvail" ) 
+mcscripts=( "runcorsika" "runreflector" "runcamera" )
+mcscriptscolname=( "fCorsikaFileAvail" "fReflectorFileAvail" "fCameraFileAvail" )
 
 #hour:            0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23