Changeset 9039 for trunk/MagicSoft/Mars

Timestamp:

07/23/08 14:15:14 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MStatusArray.cc (modified) (2 diffs)
• mbase/MStatusDisplay.cc (modified) (2 diffs)
• mjobs/MSequence.cc (modified) (2 diffs)
• mjobs/MSequence.h (modified) (2 diffs)
• msql/MSQLMagic.cc (modified) (3 diffs)
• msql/MSQLMagic.h (modified) (2 diffs)
• showplot.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
    * mjobs/MJCalibrateSignal.cc:
      - changed again the wrong names of the tasklists
+
+   * mjobs/MSequence.[h,cc]:
+     - set default telescope to 1 so that reading old sequence files
+       gives valid sequences.
+     - overwrote Read to allow reading also old sequences which
+       have no default name in the files
+     - removed output of "DataPath" from Print
+
+   * msql/MSQLMagic.[h,cc]:
+     - added a second InsertUpdate
+     - added ExistRow
 
 

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -44 +44 @@
 #include "MStatusArray.h"
 
-#include <TH1.h>       // TH1::AddDirectoryStatus();
+#include <TH1.h>              // TH1::AddDirectoryStatus();
+#include <TFile.h>            // gFile
 #include <TClass.h>
 #include <TCanvas.h>
@@ -344 +345 @@
     Delete();
 
+    const TString keyname = name?name:"MStatusDisplay";
+
+    // Check if key exists (to suppress an error on the console
+    if (!gDirectory->GetListOfKeys()->FindObject(keyname))
+    {
+        gLog << inf << keyname << " [MStatusArray] not found." << endl;
+        return 0;
+    }
+
     // Make sure newly read histograms are not added to the current directory
     const Bool_t store = TH1::AddDirectoryStatus();
     TH1::AddDirectory(kFALSE);
-    const Int_t rc = TObjArray::Read(name?name:"MStatusDisplay");
+    const Int_t rc = TObjArray::Read(keyname);
     TH1::AddDirectory(store);
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2239 +2239 @@
                 list.Add(new TNamed(GetName(), GetTitle()));
 
+            c->SetTitle(gFile->GetName());
             list.Add(c);
         }
@@ -2246 +2247 @@
         if (list.GetEntries()==0)
         {
-            *fLog << warn << "MStatusDisplay::Read: No objects read." << endl;
+            *fLog << warn << "MStatusDisplay::Read: No objects read from " << gFile->GetName() << endl;
             return 0;
         }

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -1394 +1394 @@
     }
 
-    if (!fDataPath.IsNull())
-        out << endl << pre << "DataPath: " << fDataPath << endl;
+//    if (!fDataPath.IsNull())
+//        out << endl << pre << "DataPath: " << fDataPath << endl;
 
     if (!str.IsNull())
@@ -1512 +1512 @@
 
     fPeriod = fNight.GetMagicPeriod();
+}
+
+// --------------------------------------------------------------------------
+//
+// Read a sequence from gDirectory. If the default is given we try
+// to find a sequence with name GetName. If a key with name name
+// exists in the file read this key. Otherwise loop over all keys
+// and return the first key matching the TPRegex (regular expression)
+// matching defined by the argument.
+//
+Int_t MSequence::Read(const char *name)
+{
+    if (!name || !gFile)
+        return MParContainer::Read(name);
+
+    if (!gDirectory->GetListOfKeys()->FindObject(name))
+        return MParContainer::Read(name);
+
+    TPRegexp regexp(name);
+
+    TIter NextK(gDirectory->GetListOfKeys());
+    TObject *key = 0;
+    while ((key=NextK()))
+        if (TString(key->GetName())(regexp)==key->GetName())
+            return MParContainer::Read(key->GetName());
+
+    *fLog << warn << "WARNING - No key in " << gDirectory->GetName() << " matching " << name << "." << endl;
+    return 0;
 }
 

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -131 +131 @@
 
 public:
-    MSequence() : fTelescope(0), fSequence((UInt_t)-1), fLastRun((UInt_t)-1),
+    MSequence() : fTelescope(1), fSequence((UInt_t)-1), fLastRun((UInt_t)-1),
         fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1), fLightCondition(kNA), fMonteCarlo(kFALSE)
     {
@@ -158 +158 @@
 
     // I/O
+    Int_t  Read(const char *name=0);
     Bool_t ReadDatabase(TString sql, UInt_t seq=0, UShort_t tel=0);
     Bool_t ReadFile(const char *filename, UInt_t id=(UInt_t)-1);

trunk/MagicSoft/Mars/msql/MSQLMagic.cc

@@ -195 +195 @@
 Bool_t MSQLMagic::ExistStr(const char *column, const char *table, const char *test, const char *where)
 {
-    TString query(Form("SELECT %s FROM %s WHERE %s='%s' %s %s", column, table, column, test, where?"AND":"", where?where:""));
+    TString query = test ?
+        Form("SELECT %s FROM %s WHERE %s='%s' %s %s", column, table, column, test, where?"AND":"", where?where:"") :
+        Form("SELECT %s FROM %s WHERE %s", column, table, where);
+
     TSQLResult *res = Query(query);
     if (!res)
@@ -211 +214 @@
     delete res;
     return rc;
+}
+
+// --------------------------------------------------------------------------
+//
+// Check if at least one row with one field exists in table
+// defined by where
+//
+Bool_t MSQLMagic::ExistRow(const char *table, const char *where)
+{
+    return ExistStr("*", table, 0, where);
 }
 
@@ -306 +319 @@
 // --------------------------------------------------------------------------
 //
+// An abbreviation for checking whether a row with the condition where
+// exists. If no such row exist Insert vars into table, otherwise update
+// vars in table at row(s) defined by where.
+//
+Int_t MSQLMagic::InsertUpdate(const char *table, const char *vars, const char *where)
+{
+    return ExistRow(table, where) ?
+        Update(table, vars, where) :
+        Insert(table, vars);
+}
+
+// --------------------------------------------------------------------------
+//
 // An abbreviation for a Dalete-Query.
 //

trunk/MagicSoft/Mars/msql/MSQLMagic.h

@@ -45 +45 @@
     Int_t   QueryKeyOf(const char *col, const char *ext, const char *val);
     Bool_t  ExistStr(const char *column, const char *table, const char *test, const char *where=0);
+    Bool_t  ExistRow(const char *table, const char *where);
 
     Int_t Insert(const char *table, const char *vars, const char *where=0);
@@ -50 +51 @@
     Int_t Delete(const char *table, const char *where);
     Int_t InsertUpdate(const char *table, const char *col, const char *val, const char *vars);
+    Int_t InsertUpdate(const char *table, const char *vars, const char *where);
 
     void Delete(const Option_t *o) { TObject::Delete(o); }

trunk/MagicSoft/Mars/showplot.cc

@@ -199 +199 @@
     //
     const TString kInput = InflatePath(arg);
-    const TString kTitle = kInput.IsNull() ? kInput + "..."  : kInput;
+    const TString kTitle = kInput.IsNull() ? arg.GetArgumentStr(0) + "..."  : kInput;
 
     //