Changeset 8999 for trunk/MagicSoft/Mars/datacenter/macros

Timestamp:

07/14/08 20:59:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/macros

Files:

• fillsignal.C (modified) (2 diffs)
• plotstat.C (modified) (2 diffs)

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

@@ -59 +59 @@
 #include <iomanip>
 
-#include <TEnv.h>
 #include <TRegexp.h>
 
@@ -381 +380 @@
 int fillsignal(TString fname, Bool_t dummy=kTRUE)
 {
-    TEnv env("sql.rc");
-
-    MSQLMagic serv(env);
+    MSQLMagic serv("sql.rc");
     if (!serv.IsConnected())
     {

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

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotstat.C,v 1.7 2008-07-05 19:01:42 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotstat.C,v 1.8 2008-07-14 19:59:06 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -319 +319 @@
 
     // 0: All data for which are files available
-    query[0]  = "select SUM(TIME_TO_SEC(TIMEDIFF(fRunStop, fRunStart)))/3600 ";
-    query[0] += "from RunData left join RunProcessStatus on RunData.fRunNumber=RunProcessStatus.fRunNumber ";
-    query[0] += "where fRunTypeKey=2 and not ISNULL(fRawFileAvail)";
+    query[0]  = "SELECT SUM(TIME_TO_SEC(TIMEDIFF(fRunStop, fRunStart)))/3600 ";
+    query[0] += "FROM RunData ";
+    query[0] += "LEFT JOIN RunProcessStatus USING (fTelescopeNumber, fRunNumber, fFileNumber) ";
+    query[0] += "WHERE fRunTypeKey=2 AND NOT ISNULL(fRawFileAvail)";
+    /*
+    if (tel>0)
+    {
+        query[0] += " AND fTelescopeNumber=";
+        query[0] += tel;
+    }
+    */
 
     // 1: All data
-    query[1]  = "select SUM(TIME_TO_SEC(TIMEDIFF(fRunStop,fRunStart)))/3600 ";
-    query[1] += "from RunData where fRunTypeKEY=2";
+    query[1]  = "SELECTT SUM(TIME_TO_SEC(TIMEDIFF(fRunStop,fRunStart)))/3600 ";
+    query[1] += "FROM RunData WHERE fRunTypeKEY=2";
 
     // 2: All data which is not excluded
-    query[2]  = "select SUM(TIME_TO_SEC(TIMEDIFF(fRunStop,fRunStart)))/3600 ";
-    query[2] += "from RunData where fRunTypeKEY=2 and fExcludedFDAKEY=1";
+    query[2]  = "SELECT SUM(TIME_TO_SEC(TIMEDIFF(fRunStop,fRunStart)))/3600 ";
+    query[2] += "FROM RunData WHERE fRunTypeKEY=2 AND fExcludedFDAKEY=1";
 
     // 3: All sequences
-    query[3]  = "select SUM(fRunTime)/3600 from Sequences";
+    query[3]  = "SELECT SUM(fRunTime)/3600 FROM Sequences";
 
     // 4: All sequences with callisto failed
-    query[4]  = "select SUM(fRunTime)/3600 from Sequences left join SequenceProcessStatus on ";
-    query[4] += "Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst where ";
-    query[4] += "ISNULL(fCallisto) and not ISNULL(fFailedTime) and not ISNULL(fAllFilesAvail)";
+    query[4]  = "SELECT SUM(fRunTime)/3600 FROM Sequences ";
+    query[4] += "LEFT JOIN SequenceProcessStatus USING (fSequenceFirst) ";
+    query[4] += "WHERE ISNULL(fCallisto) AND NOT ISNULL(fFailedTime) AND NOT ISNULL(fAllFilesAvail)";
 
     // 5: All sequences with callisto=OK
-    query[5]  = "select SUM(fRunTime)/3600 from Sequences left join SequenceProcessStatus on ";
-    query[5] += "Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst where not ISNULL(fCallisto)";
+    query[5]  = "SELECT SUM(fRunTime)/3600 FROM Sequences ";
+    query[5] += "LEFT JOIN SequenceProcessStatus USING (fSequenceFirst) ";
+    query[5] += "WHERE NOT ISNULL(fCallisto)";
 
     // 6: All sequences with star failed
-    query[6]  = "select SUM(fRunTime)/3600 from Sequences left join SequenceProcessStatus on ";
-    query[6] += "Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst where ";
-    query[6] += "ISNULL(fStar) and not ISNULL(fFailedTime) and not ISNULL(fCallisto)";
+    query[6]  = "SELECT SUM(fRunTime)/3600 FROM Sequences ";
+    query[6] += "LEFT JOIN SequenceProcessStatus USING (fSequenceFirst) ";
+    query[6] += "WHERE ISNULL(fStar) AND NOT ISNULL(fFailedTime) AND NOT ISNULL(fCallisto)";
 
     // 7: All sequences with star=OK
-    query[7]  = "select SUM(fRunTime)/3600 from Sequences left join SequenceProcessStatus on ";
-    query[7] += "Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst where not ISNULL(fStar)";
+    query[7]  = "SELECT SUM(fRunTime)/3600 FROM Sequences ";
+    query[7] += "LEFT JOIN SequenceProcessStatus USING (fSequenceFirst) ";
+    query[7] += "WHERE NOT ISNULL(fStar)";
 
     // 0: All data