Changeset 9036 for trunk/MagicSoft/Mars/datacenter

Timestamp:

07/22/08 19:56:42 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter

Files:

• macros/checkfileavail.C (modified) (3 diffs)
• scripts/checkfilesforsequenceavail (modified) (1 diff)

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

@@ -75 +75 @@
     // -------------------------------------------
 
-    TString query = "MIN( NOT ("
+    TString query = "SELECT MIN( NOT ("
         "ISNULL(fRawFileAvail) OR "
         "ISNULL(fCCFileAvail) OR "
-        "ISNULL(fCaCoFileAvail) OR "
-        "ISNULL(fCaCoFileFound) OR "
+       // "ISNULL(fCaCoFileAvail) OR "
+       // "ISNULL(fCaCoFileFound) OR "
         "ISNULL(fTimingCorrection) OR "
         "ISNULL(fCompmux) "
@@ -94 +94 @@
     {
         cout << "ERROR - Unexpected number of returned rows (" << res->GetRowCount() << ")" << endl;
+        cout << query << endl;
         delete res;
         return 3;
@@ -103 +104 @@
     {
         cout << "ERROR - Unexpected result." << endl;
+        cout << query << endl;
         delete res;
         return 3;

trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail

@@ -72 +72 @@
    checkfileavailpath=$logpath/$program/$no
    makedir $checkfileavailpath  >> $scriptlog 2>&1 
-   checkfileavaillog=$checkfileavailpath/$program-$sequence.log
+   checkfileavaillog=$checkfileavailpath/$program-$no2.log
 
-   sequencefile=$sequpath/$no/sequence$no2.txt
-
-   primvar=$no2
+   primvar=$sequence
    setstatus "start" >> $scriptlog 2>&1
 
-   check1=`root -q -b $macrospath/checkfileavail.C+\(\""$sequencefile\",1"\) | tee $checkfileavaillog | intgrep`
+   check1=`root -q -b $macrospath/checkfileavail.C+\($sequence,1\) | tee $checkfileavaillog | intgrep`
 
    case $check1 in