Changeset 9061 for trunk/MagicSoft

Timestamp:

07/31/08 14:15:56 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/checkstardone (modified) (2 diffs)
• resources/steps.rc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/07/31 Daniela Dorner
+
+   * resources/steps.rc:
+     - added missing influences and needs for DataSetProcessStatus
+
+   * datacenter/scripts/checkstardone
+     - removed breaks
+     - removed not needed variables
+     - changed dataset from string to int in call of macro
+
+
 
  2008/07/31 Thomas Bretz

trunk/MagicSoft/Mars/datacenter/scripts/checkstardone

@@ -59 +59 @@
    printprocesslog "INFO checking star done for sequences of dataset $dataset"
 
-   no=`printf %08d $dataset | cut -c 0-5`
-   no2=`printf %08d $dataset`
-   dsnum=`printf %08d $dataset`
-
-   echo "run $program for sequence $sequence..." >> $scriptlog 2>&1
-
-   outpath=$logpath/$program/$no/$no2
+   outpath=$logpath/$program/`printf %08d $dataset | cut -c 0-5`
    makedir $outpath  >> $scriptlog 2>&1 
 
    setstatus "start" >> $scriptlog 2>&1
 
-   check1=`root -q -b $macrospath/checkstardone.C+\(\""$dsnum\""\) | tee $outpath/checkstardone-$dsnum.log | intgrep`
+   check1=`root -q -b $macrospath/checkstardone.C+\($dataset\) | tee $outpath/checkstardone-$dataset.log | intgrep`
 
    case $check1 in
       1)   echo " check1=$check1 -> everything ok -> continue with next dataset..." >> $scriptlog 2>&1 ;;
-      2)   echo " check1=$check1 -> star files for dataset $dsnum not yet available -> continue..." >> $scriptlog 2>&1 
-           printprocesslog "INFO files not yet available for dataset $dsnum"
+      2)   echo " check1=$check1 -> star files for dataset $dataset not yet available -> continue..." >> $scriptlog 2>&1 
+           printprocesslog "INFO files not yet available for dataset $dataset"
            check="no"
-           break
            ;;
       0)   echo " check1=$check1 -> no connection to db -> continue..." >> $scriptlog 2>&1 
            printprocesslog "WARN connection to DB failed"
            check="no"
-           break
            ;;
       *)   echo " check1=$check1 -> ERROR " >> $scriptlog 2>&1 
@@ -88 +80 @@
            com=$Fstardone
            check=$check1
-           break
            ;;
    esac

trunk/MagicSoft/Mars/resources/steps.rc

@@ -174 +174 @@
 DataSetProcessStatus.fDataSetNumber.Default: yes
 #DataSetProcessStatus.fDataSetNumber.Needs: -
-DataSetProcessStatus.fDataSetNumber.Influences: DataSetProcessStatus.fStarFilesAvail DataSetProcessStatus.fGanymed 
+DataSetProcessStatus.fDataSetNumber.Influences: DataSetProcessStatus.fDataSetInserted DataSetProcessStatus.fDataSetFileWritten DataSetProcessStatus.fStarFilesAvail DataSetProcessStatus.fGanymed  DataSetProcessStatus.fFillGanymed
 DataSetProcessStatus.fDataSetNumber.Reset: yes
 
@@ -181 +181 @@
 DataSetProcessStatus.fDataSetInserted.Default: no
 DataSetProcessStatus.fDataSetInserted.Needs: DataSetProcessStatus.fDataSetNumber
-DataSetProcessStatus.fDataSetInserted.Influences: DataSetProcessStatus.fDataSetFileWritten DataSetProcessStatus.fStarFilesAvail DataSetProcessStatus.fGanymed DataSetProcessStatus.fFillGanymed
+DataSetProcessStatus.fDataSetInserted.Influences: DataSetProcessStatus.fDataSetFileWritten DataSetProcessStatus.fStarFilesAvail DataSetProcessStatus.fGanymed DataSetProcessStatus.fFillGanymed DataSetProcessStatus.fFillGanymed
 DataSetProcessStatus.fDataSetInserted.Reset: yes
 
@@ -188 +188 @@
 DataSetProcessStatus.fDataSetFileWritten.Default: no
 DataSetProcessStatus.fDataSetFileWritten.Needs: DataSetProcessStatus.fDataSetNumber DataSetProcessStatus.fDataSetInserted
-DataSetProcessStatus.fDataSetFileWritten.Influences: DataSetProcessStatus.fStarFilesAvail DataSetProcessStatus.fGanymed 
+DataSetProcessStatus.fDataSetFileWritten.Influences: DataSetProcessStatus.fStarFilesAvail DataSetProcessStatus.fGanymed  DataSetProcessStatus.fFillGanymed
 DataSetProcessStatus.fDataSetFileWritten.Reset: yes
 
@@ -195 +195 @@
 DataSetProcessStatus.fStarFilesAvail.Default: no
 DataSetProcessStatus.fStarFilesAvail.Needs: DataSetProcessStatus.fDataSetInserted DataSetProcessStatus.fDataSetFileWritten
-DataSetProcessStatus.fStarFilesAvail.Influences: DataSetProcessStatus.fGanymed 
+DataSetProcessStatus.fStarFilesAvail.Influences: DataSetProcessStatus.fGanymed  DataSetProcessStatus.fFillGanymed
 DataSetProcessStatus.fStarFilesAvail.Reset: yes