Changeset 9039 for trunk/MagicSoft/Mars/mjobs

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MSequence.cc (modified) (2 diffs)
• MSequence.h (modified) (2 diffs)

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);