Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7181)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7182)
@@ -21,4 +21,24 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/07/12 Daniela Dorner
+
+   * automatic-exclusions.rc:
+     - added two automatic exclusions
+
+   * datacenter/macros/findcacofiles.C:
+     - adapted query to ensure, that only existing caco-files are 
+       searched
+
+   * datacenter/macros/getdolist.C:
+     - changed query to make sure, that new data is processed first
+
+   * datacenter/macros/resetallruns.C:
+     - changed query to allow manual interaction in RunProcessStatus
+
+   * datacenter/scripts/runganymed:
+     - fixed bug in choice of rc-file
+
+
 
  2005/07/12 Thomas Bretz
Index: trunk/MagicSoft/Mars/automatic-exclusions.rc
===================================================================
--- trunk/MagicSoft/Mars/automatic-exclusions.rc	(revision 7181)
+++ trunk/MagicSoft/Mars/automatic-exclusions.rc	(revision 7182)
@@ -21,4 +21,10 @@
 key17.Cond: fProjectName like '%test%'
 #key17.SpecialRunCond: 
+
+#FlagIsTest:
+key24.Join1: TestFlag
+#key24.Join2: 
+key24.Cond: fTestFlagName='Test'
+#key24.SpecialRunCond: 
 
 #ProjectLikeClose:
@@ -49,5 +55,5 @@
 key3.Join1: Project
 key3.Join2: CalibrationScript
-key3.Cond: fProjectName like binary '%CL%' or fCalibrationScriptName='100_ContinuosLight' 
+key3.Cond: fProjectName like binary '%CL%' or fCalibrationScriptName like '%ContinuosLight' 
 #key3.SpecialRunCond: 
 
Index: trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C	(revision 7181)
+++ trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C	(revision 7182)
@@ -60,6 +60,8 @@
     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);
Index: trunk/MagicSoft/Mars/datacenter/macros/getdolist.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/getdolist.C	(revision 7181)
+++ trunk/MagicSoft/Mars/datacenter/macros/getdolist.C	(revision 7182)
@@ -110,4 +110,6 @@
     }
 
+    query+=Form(" ORDER BY %s.%s DESC ", table.Data(), rc.GetValue(table+".Primary", ""));
+
     cout << "query: " << query << endl;
 
Index: trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C	(revision 7181)
+++ trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C	(revision 7182)
@@ -95,5 +95,5 @@
             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;
Index: trunk/MagicSoft/Mars/datacenter/scripts/runganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7181)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runganymed	(revision 7182)
@@ -36,5 +36,5 @@
 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,5 +184,5 @@
   wobble=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
   wobble2=`echo $wobble | grep ^\#` >> $scriptlog 2>&1 
-  if [ "$mode2" = "" ]
+  if [ "$wobble2" = "" ]
   then 
      mode="wobble" >> $scriptlog 2>&1