Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7050)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7051)
@@ -116,6 +116,17 @@
      - adapted paths
 
+   * datacenter/scripts/insertdataset
+     - added logging
+
    * datacenter/scripts/runganymed
      - added (script to run ganymed automatically for datasets)
+
+   * datacenter/scripts/runcallisto
+     - adapted paths
+     - fixed bug
+
+   * datacenter/scripts/runstar
+     - adapted paths
+     - fixed bug
 
    * steps.rc
Index: trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7050)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7051)
@@ -36,8 +36,37 @@
 cd /home/operator/Mars.cvs
 
+datetime=`date +%F-%H-%M-%S`
+year=`date +%Y`
+
+scriptlogpath=$logpath/run/insertdatasets/`date +%Y/%m`
+if [ ! -d $scriptlogpath ]
+then
+  mkdir -pv $scriptlogpath 
+  if [ ! -d $scriptlogpath ]
+  then 
+     echo "could not make scriptlogpath "$scriptlogpath 
+     exit
+  fi
+fi
+
+scriptlog=$scriptlogpath/insertdatasets-$datetime.log
+
+date >> $scriptlog 2>&1
+
+date > $lockpath/lock-insertdatasets.txt >> $scriptlog 2>&1 
+checklock0=$?
+case $checklock0 in 
+    0)   echo "checklock0=$checklock0 -> continue " >> $scriptlog 2>&1;;
+    1)   echo "checklock0=$checklock0 -> file exists " >> $scriptlog 2>&1
+         echo "-> getting list for callisto is running -> exit" >> $scriptlog 2>&1
+         date  >> $scriptlog 2>&1
+         exit;;
+    *)   echo "checklock0=$checklock0 -> something went completely wrong" >> $scriptlog 2>&1;;
+esac
+
 
 datasetfiles=(`ls /magic/datasets/*/*`)
-echo "datasetfiles: "${datasetfiles[@]} 
-echo ""
+echo "datasetfiles: "${datasetfiles[@]}  >> $scriptlog 2>&1 
+echo "" >> $scriptlog 2>&1 
 
 for datasetfile in ${datasetfiles[@]}
@@ -48,31 +77,49 @@
    if [ "$no" = "$no3" ]
    then 
-      echo "number in filename and in file are the same -> continue"
+      echo "number in filename and in file are the same -> continue" >> $scriptlog 2>&1 
    else
-      echo "number in filename and in file are not the same "
-      echo " -> continue with next dataset"
+      echo "number in filename and in file are not the same " >> $scriptlog 2>&1 
+      echo " -> continue with next dataset" >> $scriptlog 2>&1 
       continue
    fi
-   source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'`
-   mode=`grep 'WobbleMode:' $datasetfile`
-   mode2=`echo $mode | grep ^\#`
+   source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'` >> $scriptlog 2>&1 
+   mode=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
+   mode2=`echo $mode | grep ^\#` >> $scriptlog 2>&1 
    if [ "$mode2" = "" ]
    then 
-      wobble="Y"
+      wobble="Y" >> $scriptlog 2>&1 
    else
-      wobble="N"
+      wobble="N" >> $scriptlog 2>&1 
    fi
-   echo "file: "$datasetfile
-   echo "  datasetno:  "$no2
-   echo "  sourcename: "$source
-   echo "  wobble:     "$wobble
-   echo " "
-#   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no\""\,"\"$source\""\,"\"$type\""\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
-   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\"",kFALSE\) | grep int | sed -e 's/(int)//'`
+   echo "file: "$datasetfile >> $scriptlog 2>&1 
+   echo "  datasetno:  "$no2 >> $scriptlog 2>&1 
+   echo "  sourcename: "$source >> $scriptlog 2>&1 
+   echo "  wobble:     "$wobble >> $scriptlog 2>&1 
+   echo " " >> $scriptlog 2>&1 
+   
+   insertdatasetpath=$logpath/insertdataset/$no3
+   if [ ! -d $insertdatasetpath ]
+      then
+      mkdir -pv $insertdatasetpath >> $scriptlog 2>&1
+      if [ ! -d $insertdatasetpath ]
+      then 
+         echo "could not make insertdatasetpath "$insertdatasetpath >> $scriptlog 2>&1
+         continue
+      fi
+   fi
+   insertdatasetlog=$insertdatasetpath/insertdataset-$no3.log
+   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\"",kFALSE\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
    case $check0 in 
-      1)   echo "check0=$check0 -> everthing ok ";;
-      *)   echo "check0=$check0 -> ERROR ";;
+      1)   echo "check0=$check0 -> everthing ok " >> $scriptlog 2>&1 ;;
+      *)   echo "check0=$check0 -> ERROR " >> $scriptlog 2>&1 ;;
    esac
 done
 
+rm -v $todofile >> $scriptlog 2>&1 
+rm -v $lockpath/lock-insertdatasets.txt >> $scriptlog 2>&1 
 
+set +C
+
+date  >> $scriptlog 2>&1
+
+
Index: trunk/MagicSoft/Mars/datacenter/scripts/runcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7050)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 7051)
@@ -172,6 +172,7 @@
 for sequence in ${sequences[@]}
 do 
-  no=`printf %08d $sequence | cut -c 4`
-  outpath="/magic/data/callisto/"`printf %04d $no`"/"`printf %08d $sequence`
+  no=`printf %08d $sequence | cut -c 0-4`
+  no2=`printf %08d $sequence`
+  outpath="/magic/data/callisto/$no/$no2"
   echo "outpath: "$outpath >> $scriptlog 2>&1
   if [ ! -d $outpath ]
@@ -184,5 +185,5 @@
     fi
   fi
-  sequfile="/magic/sequences/"`printf %04d $no`"/sequence"`printf %08d $sequence`".txt"
+  sequfile="/magic/sequences/$no/sequence$no2.txt"
   echo "sequfile: "$sequfile >> $scriptlog 2>&1
   
@@ -198,5 +199,5 @@
 
   echo "run callisto..." >> $scriptlog 2>&1
-  ./callisto -b -q -f -raw --log=$outpath/callisto$sequence.log --out=$outpath --config=$callistorcseq $sequfile  2>> $scriptlog > /dev/null
+  ./callisto -b -q -f -raw --log=$outpath/callisto$no2.log --out=$outpath --config=$callistorcseq $sequfile  2>> $scriptlog > /dev/null
   check1=$?
 
@@ -275,5 +276,5 @@
           
           echo "inserting the status for callisto for sequence $sequence into the db" >> $scriptlog 2>&1
-          setstatuslogpath=$logpath/setstatus/callisto/`printf %04d $no`
+          setstatuslogpath=$logpath/setstatus/callisto/$no
           if [ ! -d $setstatuslogpath ]
           then
@@ -285,6 +286,6 @@
             fi
           fi
-          setstatuslog=$setstatuslogpath/setstatus-callisto
-          check4=`root -q -b $macrospath/setstatus.C+\("\"$sequence\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog-$sequence.log | grep int | sed -e 's/(int)//'`
+          setstatuslog=$setstatuslogpath/setstatus-callisto-$no2.log
+          check4=`root -q -b $macrospath/setstatus.C+\("\"$sequence\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
           case $check4 in
   	     1)   echo "check4=$check4 -> everthing ok, status has been set" >> $scriptlog 2>&1;;
Index: trunk/MagicSoft/Mars/datacenter/scripts/runganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7050)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7051)
@@ -171,7 +171,6 @@
 do 
   no=`printf %08d $dataset | cut -c 0-4`
-  outpath="/magic/data/ganymed/$no/"`printf %08d $dataset`
-  inpath=`echo $outpath | sed -e 's/ganymed/star/'`
-  echo "inpath: "$inpath >> $scriptlog 2>&1
+  no2=`printf %08d $dataset`
+  outpath="/magic/data/ganymed/$no/$no2"
   echo "outpath: "$outpath >> $scriptlog 2>&1
   if [ ! -d $outpath ]
@@ -184,9 +183,9 @@
     fi
   fi
-  datasetfile="/magic/datasets/$no/dataset"`printf %08d $dataset`".txt"
+  datasetfile="/magic/datasets/$no/dataset$no2.txt"
   echo "datasetfile: "$datasetfile >> $scriptlog 2>&1
   
   echo "run ganymed..." >> $scriptlog 2>&1
-  ./ganymed -b -q -f --log=$outpath/ganymed$dataset.log --ind=$inpath --out=$outpath $datasetfile  2>> $scriptlog> /dev/null
+  ./ganymed -b -q -f --log=$outpath/ganymed$no2.log --out=$outpath $datasetfile  2>> $scriptlog> /dev/null
   check1=$?
 
@@ -204,6 +203,6 @@
             fi
           fi
-          setstatuslog=$setstatuslogpath/setstatus-ganymed
-          check4=`root -q -b $macrospath/setstatus.C+\("\"$dataset\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog-$dataset.log | grep int | sed -e 's/(int)//'`
+          setstatuslog=$setstatuslogpath/setstatus-ganymed-$no2.log
+          check4=`root -q -b $macrospath/setstatus.C+\("\"$dataset\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
           case $check4 in
   	     1)   echo "check4=$check4 -> everthing ok, status has been set" >> $scriptlog 2>&1;;
Index: trunk/MagicSoft/Mars/datacenter/scripts/runstar
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runstar	(revision 7050)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runstar	(revision 7051)
@@ -167,6 +167,7 @@
 for sequence in ${sequences[@]}
 do 
-  no=`printf %08d $sequence | cut -c 4`
-  outpath="/magic/data/star/"`printf %04d $no`"/"`printf %08d $sequence`
+  no=`printf %08d $sequence | cut -c 0-4`
+  no2=`printf %08d $sequence`
+  outpath="/magic/data/star/$no/$no2"
   inpath=`echo $outpath | sed -e 's/star/callisto/'`
   echo "inpath: "$inpath >> $scriptlog 2>&1
@@ -181,5 +182,5 @@
     fi
   fi
-  sequfile="/magic/sequences/"`printf %04d $no`"/sequence"`printf %08d $sequence`".txt"
+  sequfile="/magic/sequences/$no/sequence$no2.txt"
   echo "sequfile: "$sequfile >> $scriptlog 2>&1
   
@@ -191,5 +192,5 @@
      0)   echo "check1=$check1 -> everthing ok " >> $scriptlog 2>&1
           echo "-> inserting the status for star for sequence $sequence into the db" >> $scriptlog 2>&1
-          setstatuslogpath=$logpath/setstatus/star/`printf %04d $no`
+          setstatuslogpath=$logpath/setstatus/star/$no
           if [ ! -d $setstatuslogpath ]
           then
@@ -201,6 +202,6 @@
             fi
           fi
-          setstatuslog=$setstatuslogpath/setstatus-star
-          check4=`root -q -b $macrospath/setstatus.C+\("\"$sequence\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog-$sequence.log | grep int | sed -e 's/(int)//'`
+          setstatuslog=$setstatuslogpath/setstatus-star-$no2.log
+          check4=`root -q -b $macrospath/setstatus.C+\("\"$sequence\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
           case $check4 in
   	     1)   echo "check4=$check4 -> everthing ok, status has been set" >> $scriptlog 2>&1;;