Index: trunk/MagicSoft/Mars/datacenter/scripts/fillcamera
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillcamera	(revision 8758)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillcamera	(revision 8759)
@@ -116,5 +116,5 @@
    do 
       dir=`dirname $file`
-      date=`echo $file | cut -c 57-60,62,63,65,66`
+      date=`echo $file | cut -c 28-31,33,34,36,37`
       
       if ls $dir | grep MonteCarlo | grep $pnum
@@ -140,82 +140,4 @@
    done
 
-
-#   for dir in ${dirs[@]}
-#   do
-   
-#      #continue, if directory has already linked C and P run
-#      cont=`ls $dir/*_0000000[1-9]_[CP]_MonteCarlo_E.root 2>/dev/null | wc -w`
-#      if [ "$cont" == "6" ] >> $scriptlog 2>&1
-#      then
-#      	 continue
-#      fi
-
-#      #continue, if directory is not at the lowest level of the structure
-#      cont=`echo $dir | cut -d/ -f10`
-#      if [ "$cont" == "" ]
-#      then
-#      	 continue
-#      fi
-
-      #get date for filename from directory name
-#      date=`echo $dir | cut -c 57-60,62,63,65,66`
-#      time=`echo $dir | cut -c 62,63`
-#      psf=`echo $dir | cut -c 65,66`
-#      date=`echo $dir | cut -c 28-31,33,34,36,37`
-
-
-      #create new filenames and link files depending on the epoch
-#      case "$epo" in
-#      
-#    	 "MC_up_to_April06")
-#            echo "linking P and C for epoch $epo" >> $scriptlog 2>&1
-#            newcalfile="${dir}/${date}_00000002_C_MonteCarlo_E.root"
-#      	    ln -sv $calfile $newcalfile >> $scriptlog 2>&1
-#      	    newpedfile="${dir}/${date}_00000001_P_MonteCarlo_E.root"
-#      	    ln -sv $pedfile $newpedfile >> $scriptlog 2>&1
-#            ;;
-#    	 "MC_old")
-#            echo "linking P and C for epoch $epo" >> $scriptlog 2>&1
-#            newcalfile="${dir}/${date}_00000002_C_MonteCarlo_E.root"
-#      	    ln -sv $calfile $newcalfile >> $scriptlog 2>&1
-#      	    newpedfile="${dir}/${date}_00000001_P_MonteCarlo_E.root"
-#      	    ln -sv $pedfile $newpedfile >> $scriptlog 2>&1
-#            ;;
-#    	 "MC_April_May06")
-#            echo "linking P and C for epoch $epo" >> $scriptlog 2>&1
-#            newcalfile="${dir}/${date}_00000004_C_MonteCarlo_E.root"
-#      	    ln -sv $calfile $newcalfile >> $scriptlog 2>&1
-#      	    newpedfile="${dir}/${date}_00000003_P_MonteCarlo_E.root"
-#      	    ln -sv $pedfile $newpedfile >> $scriptlog 2>&1
-#            ;;
-#    	 "MC_post_June06")
-#            echo "linking P and C for epoch $epo" >> $scriptlog 2>&1
-#            newcalfile="${dir}/${date}_00000004_C_MonteCarlo_E.root"
-#      	    ln -sv $calfile $newcalfile >> $scriptlog 2>&1
-#      	    newpedfile="${dir}/${date}_00000003_P_MonteCarlo_E.root"
-#      	    ln -sv $pedfile $newpedfile >> $scriptlog 2>&1
-#            ;;
-#    	 "MC_MuxFADCs")
-#            echo "linking P and C for epoch $epo" >> $scriptlog 2>&1
-#            newcalfile="${dir}/${date}_00000006_C_MonteCarlo_E.root"
-#      	    ln -sv $calfile $newcalfile >> $scriptlog 2>&1
-#      	    newpedfile="${dir}/${date}_00000005_P_MonteCarlo_E.root"
-#      	    ln -sv $pedfile $newpedfile >> $scriptlog 2>&1
-#            ;;
-#    	 "MC_MuxFADCs_NEW")
-#            echo "linking P and C for epoch $epo" >> $scriptlog 2>&1
-#            newcalfile="${dir}/${date}_00000006_C_MonteCarlo_E.root"
-#      	    ln -sv $calfile $newcalfile >> $scriptlog 2>&1
-#      	    newpedfile="${dir}/${date}_00000005_P_MonteCarlo_E.root"
-#      	    ln -sv $pedfile $newpedfile >> $scriptlog 2>&1
-#            ;;
-#         *)
-#            echo "No epoch found"
-#      	    printprocesslog "ERROR wrong epoch for linking Cal and Ped, epoch: $cameradir"
-#            finish >> $scriptlog 2>&1
-#            ;;
-#      esac
-
-#   done
 done
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/mcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 8758)
+++ trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 8759)
@@ -52,6 +52,6 @@
 for dir in ${dirs[@]}
 do 
-#   cont=`echo $dir | cut -d/ -f6`
-   cont=`echo $dir | cut -d/ -f10`
+   cont=`echo $dir | cut -d/ -f6`
+#   cont=`echo $dir | cut -d/ -f10`
    if [ "$cont" == "" ]
    then
@@ -74,7 +74,7 @@
       firstrun=`echo $datruns | cut -c 0-8`
       #   firstrun=`echo $datruns | cut -c 0-5 | sed -e 's/^0//g' -e 's/^0//g' -e 's/^0//g' -e 's/^0//g'`
-#      date=`echo $dir | cut -c 28-37 | sed -e 's/\//-/g'`
+      date=`echo $dir | cut -c 28-37 | sed -e 's/\//-/g'`
       # for tests
-      date=`echo $dir | cut -c 57-66 | sed -e 's/\//-/g'`
+#      date=`echo $dir | cut -c 57-66 | sed -e 's/\//-/g'`
       
       # workaround due to 5digit runnumber for data with runnumber < 35487