Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8751)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8752)
@@ -18,4 +18,15 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/10/07 Thomas Bretz
+
+   * datacenter/macros/plotoptical.C:
+     - do not display the Tuorla points anymore
+
+   * datacenter/macros/plotdb.C, datacenter/macros/plotoptical.C,
+     datacenter/macros/plotrundb.C:
+     - fixed group by (seems it had trouble with the newer sql server)
+
+
 
  2007/10/05 Thomas Bretz
Index: trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C	(revision 8751)
+++ trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C	(revision 8752)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.7 2007-08-24 14:37:58 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.8 2007-10-07 21:11:01 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -438,23 +438,23 @@
         case kNone:
         case kGroupByPrimary:
-            query += valued;
+            query += Form("%s AS %s", valued.Data(), valued.Data()+1);
             break;
         case kGroupByHour:
-            query += Form("DATE_FORMAT(%s, '%%Y-%%m-%%d %%H:30:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(%s, '%%Y-%%m-%%d %%H:30:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByNight:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-%%d 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-%%d 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByWeek:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%x%%v') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%x%%v') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByMonth:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupBySeason:
-            //query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            //query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByYear:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-08-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-08-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         }
@@ -515,8 +515,8 @@
         if (fGroupBy!=kNone)
         {
-            query += Form("GROUP BY %s ", valued.Data());
+            query += Form("GROUP BY %s ", valued.Data()+1);
             //query += Form(" HAVING COUNT(%s)=(COUNT(*)+1)/2 ", valuev.Data());
         }
-        query += Form("ORDER BY %s ", valued.Data());
+        query += Form("ORDER BY %s ", valued.Data()+1);
 
         // ------------------------------
@@ -545,5 +545,5 @@
     // This is the condition to take only the "ok" flagged data
     // and to restrict the query to a given source (if any)
-    TString cond = "fStatusKEY=1";
+    TString cond = "fStatusKEY=1 AND fTelescopeKEY=1 AND fCCDKEY=1 AND fFilterKEY=1";
     if (!source.IsNull())
     {
@@ -554,4 +554,5 @@
 
     }
+
     plot.SetCondition(cond);
 
Index: trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C	(revision 8751)
+++ trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C	(revision 8752)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.3 2007-08-24 14:37:58 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.4 2007-10-07 21:12:15 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -414,23 +414,23 @@
         case kNone:
         case kGroupByPrimary:
-            query += valued;
+            query += Form("%s AS %s", valued.Data(), valued.Data()+1);
             break;
         case kGroupByHour:
-            query += Form("DATE_FORMAT(%s, '%%Y-%%m-%%d %%H:30:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(%s, '%%Y-%%m-%%d %%H:30:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByNight:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-%%d 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-%%d 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByWeek:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%x%%v') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%x%%v') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByMonth:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupBySeason:
-            //query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            //query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByYear:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-08-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-08-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         }
@@ -490,8 +490,8 @@
         if (fGroupBy!=kNone)
         {
-            query += Form("GROUP BY %s ", valued.Data());
+            query += Form("GROUP BY %s ", valued.Data()+1);
             //query += Form(" HAVING COUNT(%s)=(COUNT(*)+1)/2 ", valuev.Data());
         }
-        query += Form("ORDER BY %s ", valued.Data());
+        query += Form("ORDER BY %s ", valued.Data()+1);