Changeset 7284

Timestamp:

08/11/05 04:54:03 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/getdolist.C (modified) (1 diff)
• datacenter/scripts/runcallisto (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
    * datacenter/scripts/runcallisto:
      - improved locking
+
+   * datacenter/macros/getdolist.C:
+     - included removing of file for the case, that there's something 
+       strange happening in the shell script
 
 

trunk/MagicSoft/Mars/datacenter/macros/getdolist.C

@@ -135 +135 @@
         {
             filename=Form("%s/ToDo-%s-%s-%s.txt", listpath.Data(), table.Data(), column.Data(), (*row)[0]);
+            gSystem->Unlink(filename);
             ofstream fout(filename, ios::app);
             if (!fout)

trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

@@ -73 +73 @@
    esac
 
-   echo "getting list..." >> $scriptlog 2>&1
-   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
-   
-   case $check0 in 
-       1)   echo "check0=$check0 -> everything ok -> run callisto" >> $scriptlog 2>&1;;
-       *)   echo "check0=$check0 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1;;
-   esac
+   if  ls $todofile-[1-9]*.txt >> $scriptlog 2>&1
+   then
+      echo "other file(s) on disk " >> $scriptlog 2>&1
+      echo " -> choose one file and start calibrating" >> $scriptlog 2>&1
+   else
+      echo "getting list..." >> $scriptlog 2>&1
+      check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+
+      case $check0 in
+          1)   echo "check0=$check0 -> everything ok -> run callisto" >> $scriptlog 2>&1;;
+          *)   echo "check0=$check0 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1;;
+      esac
+   fi
    rm -v $lockpath/lock-getting-callisto-list.txt >> $scriptlog 2>&1
 fi