Changeset 8996 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/05/08 20:01:55 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• JobsLinkDef.h (modified) (1 diff)
• MSequence.cc (modified) (7 diffs)
• MSequence.h (modified) (4 diffs)
• MSequenceSQL.cc (added)
• MSequenceSQL.h (added)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MSequence+;
+#pragma link C++ class MSequenceSQL+;
 #pragma link C++ class MDataSet+;
 

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -171 +171 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-#include "MSequence.h"
+#include "MSequenceSQL.h"
 
 #include <stdlib.h>
@@ -575 +575 @@
 // --------------------------------------------------------------------------
 //
-// Get LightCondition from resource file and convert it to LIghtCondition_t
-//
-MSequence::LightCondition_t MSequence::ReadLightCondition(TEnv &env, const char *prefix) const
-{
-    TString str = GetEnvValue2(env, prefix, "LightConditions", "n/a");
+// Get LightCondition from str and convert it to LightCondition_t
+//
+MSequence::LightCondition_t MSequence::GetLightCondition(const TString &str) const
+{
     if (!str.CompareTo("n/a", TString::kIgnoreCase))
         return kNA;
@@ -634 +633 @@
     fPeriod    = GetEnvValue2(env, prefix, "Period",    -1);
 
-    fLightCondition = ReadLightCondition(env, prefix);
-
     TString str;
+    str = GetEnvValue2(env, prefix, "LightConditions", "n/a");
+    fLightCondition = GetLightCondition(str);
+
     str = GetEnvValue2(env, prefix, "Start", "");
     fStart.SetSqlDateTime(str);
+
     str = GetEnvValue2(env, prefix, "Night", "");
     str += " 00:00:00";
@@ -667 +668 @@
         env.PrintUntouched();
     }
+}
+
+MSequence::MSequence(const char *fname, UInt_t seq)
+{
+    *this = MSequenceSQL(fname, seq);
 }
 
@@ -875 +881 @@
         return;
     }
-    out << "# Path: " << GetFileName() << endl;
-    out << "# Name: " << GetBaseName() << endl;
+    if (!fFileName.IsNull())
+        out << "# FileName: " << fFileName << endl;
+    if (!fDataPath.IsNull())
+        out << "# DataPath: " << fDataPath << endl;
     out << endl;
     if (pre.IsNull())
@@ -885 +893 @@
         out << pre << "Period:         " << fPeriod << endl;
     if (fNight!=MTime())
-        out << pre << "Night:          " << fNight << endl;
+        out << pre << "Night:          " << fNight.GetStringFmt("%Y-%m-%d") << endl;
     out << endl;
     out << pre << "LightCondition: ";
@@ -894 +902 @@
     case kTwilight: out << "Twilight" << endl; break;
     case kMoon:     out << "Moon" << endl;     break;
-    case kDay:      out << "Day" << endl;     break;
+    case kDay:      out << "Day" << endl;      break;
     }
 
     if (fStart!=MTime())
-        out << pre << "Start:          " << fStart << endl;
+        out << pre << "Start:          " << fStart.GetSqlDateTime() << endl;
     if (fLastRun>=0)
         out << pre << "LastRun:        " << fLastRun << endl;

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -14 +14 @@
 class MSequence : public MParContainer
 {
+    friend class MSequenceSQL;
 public:
     enum LightCondition_t { kNA, kNoMoon, kTwilight, kMoon, kDay };
@@ -67 +68 @@
     void    Split(const TEnv &env, const TString &prefix, const char *name, TArrayI &data, TArrayI &sub) const;
 
-    LightCondition_t ReadLightCondition(TEnv &env, const char *prefix) const;
+    LightCondition_t GetLightCondition(const TString &str) const;
 
     // Helper for file setup
@@ -92 +93 @@
 public:
     MSequence() : fSequence((UInt_t)-1), fLastRun((UInt_t)-1),
-        fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1), fMonteCarlo(kFALSE)
+        fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1), fLightCondition(kNA), fMonteCarlo(kFALSE)
     {
         fName  = "MSequence";
@@ -98 +99 @@
     }
     MSequence(const char *fname, const char *path="", UInt_t id=(UInt_t)-1);
+    MSequence(const char *fname, UInt_t seq);
     MSequence(const MSequence &s) : MParContainer(s),
         fFileName(s.fFileName), fDataPath(s.fDataPath),
         fSequence(s.fSequence), fStart(s.fStart),
         fLastRun(s.fLastRun), fNumEvents(s.fNumEvents), fPeriod(s.fPeriod),
-        fNight(s.fNight), fProject(s.fProject), fSource(s.fSource),
+        fNight(s.fNight), fLightCondition(s.fLightCondition),
+        fProject(s.fProject), fSource(s.fSource),
         fTriggerTable(s.fTriggerTable), fHvSettings(s.fHvSettings),
-        fRuns(s.fRuns), fCalRuns(s.fCalRuns), fPedRuns(s.fPedRuns),
-        fDatRuns(s.fDatRuns), fMonteCarlo(s.fMonteCarlo) { }
+        fRuns(s.fRuns), fRunsSub(s.fRunsSub), fCalRuns(s.fCalRuns),
+        fCalRunsSub(s.fCalRunsSub), fPedRuns(s.fPedRuns),
+        fPedRunsSub(s.fPedRunsSub), fDatRuns(s.fDatRuns),
+        fDatRunsSub(s.fDatRunsSub), fExclRuns(s.fExclRuns),
+        fExclRunsSub(s.fExclRunsSub), fMonteCarlo(s.fMonteCarlo) { }
 
     // I/O

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -24 +24 @@
            -I../mtools -I../mimage -I../mpointing -I../mastro -I../mfbase \
            -I../mhvstime -I../mtrigger -I../mmuon -I../mmc -I../mmovie \
-           -I../mextralgo -I../mhflux
+           -I../mextralgo -I../mhflux -I../msql
 
 SRCFILES = MSequence.cc \
+           MSequenceSQL.cc \
            MDataSet.cc \
            MJob.cc \