Changeset 8186 for trunk/MagicSoft

Timestamp:

11/01/06 08:54:04 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/macros

Files:

• plotdb.C (modified) (8 diffs)
• plotoptical.C (modified) (8 diffs)
• plotrundb.C (added)

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

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.30 2006-11-01 08:29:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.31 2006-11-01 08:53:26 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -99 +99 @@
     MDataSet *fDataSet;
 
-    TString   fPrimary;
+    TString   fPrimaryDate;
+    TString   fPrimaryNumber;
     TString   fSecondary;
 
@@ -351 +352 @@
     void SetDescription(const char *d, const char *t=0) { fDescription = d; fNameTab = t; }
     void SetGroupBy(GroupBy_t b=kGroupByWeek) { fGroupBy=b; }
-    void SetPrimary(const char *ts) { fPrimary=ts; }
+    void SetPrimaryDate(const char *ts) { fPrimaryDate=ts; }
+    void SetPrimaryNumber(const char *ts) { fPrimaryNumber=ts; }
     void SetSecondary(const char *ts) { fSecondary=ts; }
 
     Bool_t Plot(const char *value, Float_t min=0, Float_t max=-1, Float_t resolution=0)
     {
-        TString named  = fPrimary;
+        TString named  = fPrimaryDate;
         TString named2 = fSecondary;
         TString namev  = value;
-        TString join   = "fSequenceFirst";
 
         TString tablev = namev(0, namev.First('.'));
@@ -376 +377 @@
             query += value;
             query += ", ";
-            query += " Sequences.fSequenceFirst ";
+            query += fPrimaryNumber;
+            query += " ";
         }
         else
@@ -384 +386 @@
             query += "), AVG(";
             query += value;
-            query += "), Sequences.fSequenceFirst, STD(";
+            query += "), ";
+            query += fPrimaryNumber;
+            query += ", STD(";
             query += fSecondary;
             query += "), STD(";
@@ -430 +434 @@
                 where += " AND ";
             where += Form("%s BETWEEN '%s' AND '%s' ",
-                          fPrimary.Data(), fRequestFrom.Data(), fRequestTo.Data());
+                          fPrimaryDate.Data(), fRequestFrom.Data(), fRequestTo.Data());
         }
 
@@ -448 +452 @@
             //query += Form(" HAVING COUNT(%s)=(COUNT(*)+1)/2 ", valuev.Data());
         }
-        query += Form("ORDER BY %s ", fPrimary.Data());
+        query += Form("ORDER BY %s ", fPrimaryDate.Data());
 
 
@@ -475 +479 @@
     //plot.SetGroupBy(MPlot::kGroupByWeek);
 
-    plot.SetPrimary("Sequences.fRunStart");
+    plot.SetPrimaryDate("Sequences.fRunStart");
+    plot.SetPrimaryNumber("Sequences.fSequenceFirst");
     plot.SetSecondary("(Sequences.fZenithDistanceMin+Sequences.fZenithDistanceMax)/2");
 

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

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.3 2006-11-01 08:29:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.4 2006-11-01 08:53:26 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -99 +99 @@
     MDataSet *fDataSet;
 
-    TString   fPrimary;
+    TString   fPrimaryDate;
+    TString   fPrimaryNumber;
     TString   fSecondary;
 
@@ -352 +353 @@
     void SetDescription(const char *d, const char *t=0) { fDescription = d; fNameTab = t; }
     void SetGroupBy(GroupBy_t b=kGroupByWeek) { fGroupBy=b; }
-    void SetPrimary(const char *ts) { fPrimary=ts; }
+    void SetPrimaryDate(const char *ts) { fPrimaryDate=ts; }
+    void SetPrimaryNumber(const char *ts) { fPrimaryNumber=ts; }
     void SetSecondary(const char *ts) { fSecondary=ts; }
 
@@ -362 +364 @@
     Bool_t Plot(const char *value, Float_t min=0, Float_t max=-1, Float_t resolution=0)
     {
-        TString named  = fPrimary;
+        TString named  = fPrimaryDate;
         TString named2 = fSecondary;
         TString namev  = value;
-        TString join   = "fSequenceFirst";
 
         TString tablev = namev(0, namev.First('.'));
@@ -381 +382 @@
             query += ", ";
             query += value;
-            query += ", 0 ";
+            query += ", ";
+            query += fPrimaryNumber;
+            query += " ";
         }
         else
@@ -389 +392 @@
             query += "), AVG(";
             query += value;
-            query += "), COUNT(*), STD(";
+            query += "), ";
+            query += fPrimaryNumber;
+            query += ", STD(";
             query += fSecondary;
             query += "), STD(";
@@ -443 +448 @@
             //query += Form(" HAVING COUNT(%s)=(COUNT(*)+1)/2 ", valuev.Data());
         }
-        query += Form("ORDER BY %s ", fPrimary.Data());
+        query += Form("ORDER BY %s ", fPrimaryDate.Data());
 
 
@@ -464 +469 @@
 void plotall(MPlot &plot, TString source)
 {
-    plot.SetPrimary("OpticalData.fTimeStamp");
-    plot.SetSecondary("fZenithDistance");
-
-
+    plot.SetPrimaryDate("OpticalData.fTimestamp");
+    plot.SetPrimaryNumber("OpticalData.fTimestamp");
+    plot.SetSecondary("OpticalData.fZenithDistance");
 
     TString cond = "fStatusKEY=13";