Changeset 7182 for trunk/MagicSoft/Mars/datacenter

Timestamp:

07/12/05 15:28:51 (20 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter

Files:

• macros/findcacofiles.C (modified) (1 diff)
• macros/getdolist.C (modified) (1 diff)
• macros/resetallruns.C (modified) (1 diff)
• scripts/runganymed (modified) (2 diffs)

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

@@ -60 +60 @@
     cout << endl;
 
-    TString query="SELECT fRunNumber FROM RunProcessStatus WHERE IsNull(fCaCoFileFound) ";
-    query+=" and fRunNumber > 10000 and not IsNull(fCCFileAvail)";
+    TString query="SELECT RunProcessStatus.fRunNumber FROM RunProcessStatus ";
+    query+=" LEFT JOIN RunData on RunData.fRunNumber=RunProcessStatus.fRunNumber ";
+    query+=" WHERE IsNull(fCaCoFileFound) and fExcludedFDAKEY=1 ";
+    query+=" and RunProcessStatus.fRunNumber > 10000 and not IsNull(fCCFileAvail)";
 
     TSQLResult *res = serv.Query(query);

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

@@ -110 +110 @@
     }
 
+    query+=Form(" ORDER BY %s.%s DESC ", table.Data(), rc.GetValue(table+".Primary", ""));
+
     cout << "query: " << query << endl;
 

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

@@ -95 +95 @@
             query+=Form(", fCaCoFileFound=%d", atoi(runnumber));
 
-        query+=Form(" WHERE fRunNumber=%d ", atoi(runnumber));
+        query+=Form(" WHERE fRunNumber=%d and %s!='1970-01-01 00:00:00'", atoi(runnumber), column.Data());
 
         cout << "q2: " << query << endl;

trunk/MagicSoft/Mars/datacenter/scripts/runganymed

@@ -36 +36 @@
 datetime=`date +%F-%H-%M-%S`
 year=`date +%Y`
-pno=4 # number of processes, i.e. number of todo-files
+pno=24 # number of processes, i.e. number of todo-files
 
 todofile=$listpath/ToDo-$table-$column
@@ -184 +184 @@
   wobble=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
   wobble2=`echo $wobble | grep ^\#` >> $scriptlog 2>&1 
-  if [ "$mode2" = "" ]
+  if [ "$wobble2" = "" ]
   then 
      mode="wobble" >> $scriptlog 2>&1