Index: trunk/MagicSoft/Mars/datacenter/scripts/fillmccallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillmccallisto	(revision 9221)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillmccallisto	(revision 9221)
@@ -0,0 +1,118 @@
+#!/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): Daniel Hoehne-Moench  08/2009 <mailto:hoehne@astro.uni-wuerzburg.de>
+#
+#   Copyright: MAGIC Software Development, 2000-2009
+#
+#
+# ========================================================================
+#
+# This script launches the filling of the results from the calibration for 
+# all mc sequences of which the results are not yet in the database.
+#
+# After checking if the script is already running the todolist is written.
+# Then for each sequence in the todo list the calibration results are 
+# filled into the table MCCalibration in the database using the macros 
+# fillmccalib.C and fillmcsignal.C 
+# If this was successful, the status is inserted into the database using 
+# the function setstatus.
+#
+
+source `dirname $0`/sourcefile
+printprocesslog "INFO starting $0"
+program=fillmccallisto
+column=fFillCallisto
+
+set -C
+
+scriptlog=$runlogpath/$program-$datetime.log
+date >> $scriptlog 2>&1
+
+# check if the script is already running
+lockfile=$lockpath/lock-$program.txt
+checklock  >> $scriptlog 2>&1
+
+# get todo file
+gettodo  >> $scriptlog 2>&1
+
+cd $mars
+
+# fill information into the database for all sequences in the todo file
+for (( s=0 ; s < $num ; s++ ))
+do
+   sequence=${primaries[$s+$s]}
+   printprocesslog "INFO starting $program for mc sequence $sequence"
+   no=`printf %08d $sequence | cut -c 0-4`
+   no2=`printf %08d $sequence`
+   path="$mcpath/callisto/$no/$no2"
+   signalfile=$path/signal$no2.root
+   calibfile=$path/calib$no2.root
+   fillcallistologpath=$logpath/$program/$no
+   makedir $fillcallistologpath >> $scriptlog 2>&1
+   fillcaliblog=$fillcallistologpath/fillcalib-$sequence.log
+   fillsignallog=$fillcallistologpath/fillsignal-$sequence.log
+
+   echo "run $program for mc sequence $sequence" >> $scriptlog 2>&1
+   setstatus "start" >> $scriptlog 2>&1
+   echo "run fillmccalib..." >> $scriptlog 2>&1
+   printprocesslog "INFO starting fillmccalib for mc sequence $sequence"
+
+   check1=`root -q -b $macrospath/fillmccalib.C+\("\"$calibfile\""\,kFALSE\) | tee $fillcaliblog | intgrep`
+
+   case $check1 in
+      1)   echo " check1=$check1 -> everything ok -> run fillmcsignal " >> $scriptlog 2>&1 
+           printprocesslog "INFO done fillmccalib successfully for mc sequence $sequence"
+           ;;
+      0)   echo " check1=$check1 -> no connection to db -> continue..." >> $scriptlog 2>&1 
+           printprocesslog "WARN connection to DB failed"
+           check="no"
+           setstatus "stop" >> $scriptlog 2>&1
+           continue ;;
+      *)   echo " check1=$check1 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
+           printprocesslog "ERROR fillmccalib failed for mc sequence $sequence"
+           com=$Ffillmccalib
+           check=$check1
+           setstatus "stop" >> $scriptlog 2>&1
+           continue ;;
+   esac
+
+   printprocesslog "INFO starting fillmcsignal for sequence $sequence"
+   check2=`root -q -b $macrospath/fillmcsignal.C+\("\"$signalfile\""\,kFALSE\) | tee $fillsignallog | intgrep`
+   case $check2 in
+      1)   echo " check2=$check2 -> everything ok " >> $scriptlog 2>&1 
+           printprocesslog "INFO done fillmcsignal successfully for mc sequence $sequence"
+           ;;
+      0)   echo " check2=$check2 -> no connection to db -> continue..." >> $scriptlog 2>&1 
+           printprocesslog "WARN connection to DB failed"
+           check="no"
+           ;;
+      *)   echo " check2=$check2 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
+           printprocesslog "ERROR fillmcsignal failed for mc sequence $sequence"
+           com=$Ffillmcsignal
+           check=$check2
+           ;;
+   esac
+   
+   setstatus "stop" >> $scriptlog 2>&1
+done
+
+finish >> $scriptlog 2>&1
+
Index: trunk/MagicSoft/Mars/datacenter/scripts/fillmcstar
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillmcstar	(revision 9221)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillmcstar	(revision 9221)
@@ -0,0 +1,93 @@
+#!/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): Daniel Hoehne-Moench  01/2009 <mailto:hoehne@astro.uni-wuerzburg.de>
+#
+#   Copyright: MAGIC Software Development, 2000-2009
+#
+#
+# ========================================================================
+#
+# This script launches the filling of the results of star into the db 
+# for all mc sequences of which the results are not yet in the database.
+#
+# After checking if the script is already running the todolist is written. 
+# Then for each sequence in the todo list the star results are filled 
+# into the table Star in the database using the macro fillmcstar.C
+# If this was successful, the status is inserted into the database using 
+# the function setstatus.
+#
+
+source `dirname $0`/sourcefile
+printprocesslog "INFO starting $0"
+program=fillmcstar
+column=fFillStar
+
+set -C
+
+scriptlog=$runlogpath/$program-$datetime.log
+date >> $scriptlog 2>&1
+
+# check if the script is already running
+lockfile=$lockpath/lock-$program.txt
+checklock  >> $scriptlog 2>&1
+
+# get todo list
+gettodo  >> $scriptlog 2>&1
+
+cd $mars
+
+# run fillstar for sequences
+for (( s=0 ; s < $num ; s++ ))
+do
+   sequence=${primaries[$s+$s]}
+   printprocesslog "INFO starting $program for mc sequence $sequence"
+   no=`printf %08d $sequence | cut -c 0-4`
+   no2=`printf %08d $sequence`
+   path="$mcpath/star/$no/$no2"
+   starfile=$path/star$no2.root
+   fillstarlogpath=$logpath/$program/$no
+   makedir $fillstarlogpath >> $scriptlog 2>&1
+   fillstarlog=$fillstarlogpath/$program-$sequence.log
+
+   echo "run $program for mc sequence $sequence" >> $scriptlog 2>&1
+   setstatus "start" >> $scriptlog 2>&1
+
+   check2=`root -q -b $macrospath/fillmcstar.C+\("\"$starfile\""\,kFALSE\) | tee $fillstarlog | intgrep`
+   case $check2 in
+      1)   echo " check2=$check2 -> everything ok " >> $scriptlog 2>&1 
+           printprocesslog "INFO done fillmcstar successfully for mc sequence $sequence"
+           ;;
+      0)   echo " check2=$check2 -> no connection to db -> continue..." >> $scriptlog 2>&1 
+           printprocesslog "WARN connection to DB failed"
+           check="no"
+           ;;
+      *)   echo " check2=$check2 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
+           printprocesslog "ERROR fillmcstar failed for mc sequence $sequence"
+           com=$Ffillmcstar
+           check=$check2
+           ;;
+   esac
+   
+   setstatus "stop" >> $scriptlog 2>&1
+done
+
+finish >> $scriptlog 2>&1
+
Index: trunk/MagicSoft/Mars/datacenter/scripts/runmccallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runmccallisto	(revision 9220)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runmccallisto	(revision 9221)
@@ -19,7 +19,7 @@
 #
 #   Author(s): Daniela Dorner  08/2004 <mailto:dorner@astro.uni-wuerzburg.de>
-#   Author(s): Daniel Hoehne   06/2008 <mailto:hoehne@astro.uni-wuerzburg.de>
+#   Author(s): Daniel Hoehne-Moench  01/2009 <mailto:hoehne@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2008
+#   Copyright: MAGIC Software Development, 2000-2009
 #
 #
@@ -55,6 +55,6 @@
 
 # get sequence # 
-gettodo >> $scriptlog 2>&1
-sequence=$process
+gettodo "1" >> $scriptlog 2>&1
+sequence=${primaries[0]}
 
 # lock sequ for cal
@@ -73,23 +73,7 @@
 sequfile="$mcsequpath/$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]=19*_${run}_[PCD]_*_E.root
-#   echo ${mcpath}/rawfiles/${day}/${files[i]} >> $scriptlog 2>&1
-#   let i++
-#done
-#
-#ssh -nx phoenix "cd ${mcpath}/rawfiles/${day}; /opt/SUNWsamfs/bin/stage ${files[@]}"
-
-
 # define callisto.rc files
 callistorcnew=$setuppath/$program/callisto.rc
-callistorcmux=$setuppath/$program/callisto_mux_new.rc
+callistorcmux=$setuppath/$program/callisto_mux.rc
 
 epoch=`grep Epoch $sequfile | cut -d: -f2 | grep Mux`
@@ -110,14 +94,4 @@
 fi
 
-# lock sequ for zipping
-#lockfile=$lockpath/calzip$sequence.txt
-# if lockfile is already existing, 1 is returned
-#if ! checklock return 1 >> $scriptlog 2>&1
-#then
-   # reset lockfile name
-#   lockfile=$lockpath/lock-$table-$column-$sequence.txt
-#   finish >> $scriptlog 2>&1
-#fi
-
 primvar=$no2
 setstatus "start" >> $scriptlog 2>&1
@@ -127,106 +101,8 @@
 check1=$?
 
-# remove lockfile for zip and reset lockfile name
-#rm -v $lockfile >> $scriptlog 2>&1
-#lockfile=$lockpath/lock-$table-$column-$sequence.txt
-
 case $check1 in
    0)   echo " check1=$check1 -> everything ok" >> $scriptlog 2>&1
         printprocesslog "INFO $program finished successfully for mc sequence $sequence"
         ;;
-        # running merpp update if calibration worked
-        # finding files, which have to be updated
-#        echo "finding files to be updated..." >> $scriptlog 2>&1
-#        calfiles=`find $outpath -name *_Y_* `
-#        if [ "$calfiles" = "" ]
-#        then 
-#           echo " no files found -> continue with next sequence" >> $scriptlog 2>&1
-#           printprocesslog "ERROR no calfiles found"
-#        fi
-#        echo " files to be updated: "$calfiles >> $scriptlog 2>&1
-#        
-#        merpplogpath=$outpath"/merpplogs"
-#        makedir $merpplogpath >> $scriptlog 2>&1
-#        
-#        printprocesslog "INFO doing merppupdate for sequence $sequence"
-#        # updated calibrated data files with the information from the cc and caco files
-#        for calfile in ${calfiles[@]}
-#        do 
-#           echo "calfile: "$calfile >> $scriptlog 2>&1
-#           # find cc and caco file
-#           # if file is missing continue with next sequence
-#           date=`date --date \`basename $calfile | cut -d_ -f1\` +%Y/%m/%d`
-#           ccpath=$subsystempath/cc/$date
-#           cacopath=$subsystempath/caco/$date
-#           runno=`echo $calfile | cut -d_ -f2 | sed -e 's/^0//' | sed -e 's/^0//' | sed -e 's/^0//' `
-#           ccfile=`find $ccpath -name 20[0-2][0-9][01][0-9][0-3][0-9]_*${runno}_[PDCS]_*_S.rep`
-#           source=`echo $ccfile | cut -d_ -f4`
-#           cacofile=`find /magic/subsystemdata/caco/$date -name dc_20[0-2][0-9]_[01][0-9]_[0-3][0-9]_*${runno}_${source}.txt`
-#           if [ "$ccfile" = "" ]
-#           then
-#              echo "no ccfile found for run "$runno >> $scriptlog 2>&1
-#              printprocesslog "ERROR  ccfile $ccfile not found for $calfile"
-#              com=$Fnoccfile
-#              comadd=$runno
-#              check=0
-#              break
-#           fi
-#           if [ "$cacofile" = "" ]
-#           then 
-#              echo "cacofile with no $runno not found" >> $scriptlog 2>&1
-#              echo "finding cacofile..." >> $scriptlog 2>&1
-#              for (( i = 0; i <= 10; i++ ))
-#              do 
-#                 newrun=`echo $runno - $i | bc`
-#                 cacofile=`find $cacopath -name *$newrun*`
-#                 if [ "$cacofile" = "" ]
-#                 then
-#                    if [ $i -eq 9 ]
-#                    then
-#                       echo "no cacofile found for runno $newrun in $cacopath" >> $scriptlog 2>&1
-#                       printprocesslog "ERROR cacofile $cacofile not found for $calfile"
-#                       com=$Fnocacofile
-#                       comadd=$runno
-#                       check=0
-#                       break 2
-#                    fi
-#                    continue
-#                 else
-#                    echo "cacofile: "$cacofile >> $scriptlog 2>&1
-#                    break
-#                 fi
-#              done
-#           fi
-#           echo "./merpp -u --log=$merpplogpath/merppccupdate$runno.log --html=$merpplogpath/merppccupdate$runno.html --auto-time-stop --runfile=$runno $ccfile $calfile 2>> $scriptlog> /dev/null" >> $scriptlog 2>&1
-#           ./merpp -u --log=$merpplogpath/merppccupdate$runno.log --html=$merpplogpath/merppccupdate$runno.html --auto-time-stop --runfile=$runno $ccfile $calfile 2>> $scriptlog> /dev/null
-#           check2=$?
-#           case $check2 in
-#              0)   echo " check2=$check2 -> everything ok, merppccupdate worked -> continue" >> $scriptlog 2>&1
-#                   printprocesslog "INFO merppupdated $calfile sucessfully with $ccfile"
-#                   ;;
-#              *)   echo " check2=$check2 -> ERROR -> merppccupdate failed" >> $scriptlog 2>&1
-#                   printprocesslog "ERROR merppccupdate with file $ccfile failed for $calfile"
-#                   com=$Fmerppcc
-#                   comadd=$runno
-#                   check=$check2
-#                   break ;;
-#           esac
-#           echo "./merpp -u --log=$merpplogpath/merppcacoupdate$runno.log --html=$merpplogpath/merppcacoupdate$runno.html --auto-time $cacofile $calfile 2>> $scriptlog> /dev/null" >> $scriptlog 2>&1
-#           ./merpp -u --log=$merpplogpath/merppcacoupdate$runno.log --html=$merpplogpath/merppcacoupdate$runno.html --auto-time $cacofile $calfile 2>> $scriptlog> /dev/null
-#           check3=$?
-#           case $check3 in
-#              0)   echo " check3=$check3 -> everything ok, merppcacoupdate worked -> continue" >> $scriptlog 2>&1
-#                   printprocesslog "INFO merppupdated $calfile sucessfully with $cacofile"
-#                   ;;
-#              *)   echo " check3=$check3 -> ERROR -> merppcacoupdate failed" >> $scriptlog 2>&1
-#                   printprocesslog "ERROR merppcacoupdate with file $cacofile failed for $calfile"
-#                   com=$Fmerppcaco
-#                   comadd=$runno
-#                   check=$check3
-#                   break ;;
-#           esac
-#        done
-#	printprocesslog "INFO finished merppupdate successfully for sequence $sequence"
-#        ;;
    *)   echo " check1=$check1 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
         printprocesslog "ERROR $program failed for mc sequence $sequence (return code $check1)"
Index: trunk/MagicSoft/Mars/datacenter/scripts/runmcstar
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runmcstar	(revision 9220)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runmcstar	(revision 9221)
@@ -56,6 +56,6 @@
 
 # get sequence # 
-gettodo >> $scriptlog 2>&1
-sequence=$process
+gettodo "1" >> $scriptlog 2>&1
+sequence=${primaries[0]}
 
 # lock sequ
Index: trunk/MagicSoft/Mars/datacenter/scripts/sourcefile
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/sourcefile	(revision 9220)
+++ trunk/MagicSoft/Mars/datacenter/scripts/sourcefile	(revision 9221)
@@ -126,11 +126,13 @@
 Fganymed=21
 Ffillganymed=22
-#mc run process status
-Fcorsika=23
-Freflector=24
-Fcamera=25
 #again run process status
 FCompmux=26
 Fdowebplots=27
+#again mc run process status
+Fmccallisto=28
+Ffillmccalib=29
+Ffillmcsignal=30
+Fmcstar=31
+Ffillmcstar=32
 
 # setup for jobmanager: