Changeset 7625

Timestamp:

04/04/06 17:29:06 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• datacenter/macros/plotdb.C (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/04/04 Thomas Bretz
+
+   * datacenter/macros/plotdb.C:
+     - if no dataset and no time-interval is given only sequences with
+       an effective on-time above five minutes are plotted anymore
+
+
 
  2006/03/21 Daniela Dorner

trunk/MagicSoft/Mars/NEWS

@@ -27 +27 @@
      for optimization (kWeakSource) which is suggested by the Berlin
      people for weak sources.
+
+   - macros: plotdc.C: if no dataset and no time-interval is given only
+     sequences with an effective on-time above five minutes are plotted
+     anymore
 
    - ganymed: In the second loop the MHNewImagePar histograms disapeared.

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

@@ -350 +350 @@
         query += Form("on %s.%s=%s.%s ",       tabled.Data(), join.Data(), tablev.Data(), join.Data());
 
-        if (!fRequestFrom.IsNull() && !fRequestTo.IsNull())
-            query += Form("where fRunStart between '%s' and '%s' ",
+        const Bool_t interval = !fRequestFrom.IsNull() && !fRequestTo.IsNull();
+
+        if (!fDataSet && !interval)
+        {
+            if (!query.Contains("Star.fSequenceFirst"))
+                query += "left join Star on Sequences.fSequenceFirst=Star.fSequenceFirst ";
+            query += "where Star.fEffOnTime>300 ";
+        }
+
+        if (interval)
+        {
+            query += query.Contains(" where ") ? "and " : "where ";
+            query += Form("fRunStart between '%s' and '%s' ",
                           fRequestFrom.Data(), fRequestTo.Data());
+        }
 
         query += "order by fRunStart";
-
-        //cout << "q: " << query << endl;
 
         TSQLResult *res = fServer.Query(query);