Changeset 6846 for trunk/MagicSoft/Mars/mjobs

Timestamp:

03/17/05 12:07:35 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

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

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -248 +248 @@
 }
 
-LightCondition_t MSequence::ReadLightCondition(TEnv &env) const
+MSequence::LightCondition_t MSequence::ReadLightCondition(TEnv &env) const
 {
     TString str = env.GetValue("LightCondition", "n/a");
@@ -326 +326 @@
         return;
     }
-    gLog << "Sequence:     " << fSequence << endl;
-    gLog << "Period:       " << fPeriod << endl;
-    gLog << "Night:        " << fNight << endl << endl;
-    gLog << "Start:        " << fStart << endl;
-    gLog << "LastRun:      " << fLastRun << endl;
-    gLog << "NumEvents:    " << fNumEvents << endl;
-    gLog << "Project:      " << fProject << endl;
-    gLog << "Source:       " << fSource << endl;
-    gLog << "TriggerTable: " << fTriggerTable << endl;
-    gLog << "HvSettings:   " << fHvSettings << endl << endl;
+    gLog << "Sequence:       " << fSequence << endl;
+    gLog << "Period:         " << fPeriod << endl;
+    gLog << "Night:          " << fNight << endl << endl;
+    gLog << "LightCondition: ";
+    switch (fLightCondition)
+    {
+    case kNA:       gLog << "n/a" << endl;      break;
+    case kNoMoon:   gLog << "NoMoon" << endl;   break;
+    case kTwilight: gLog << "Twilight" << endl; break;
+    case kMoon:     gLog << "Moon" << endl;     break;
+    }
+    gLog << "Start:          " << fStart << endl;
+    gLog << "LastRun:        " << fLastRun << endl;
+    gLog << "NumEvents:      " << fNumEvents << endl;
+    gLog << "Project:        " << fProject << endl;
+    gLog << "Source:         " << fSource << endl;
+    gLog << "TriggerTable:   " << fTriggerTable << endl;
+    gLog << "HvSettings:     " << fHvSettings << endl << endl;
     gLog << "Runs:";
     for (int i=0; i<fRuns.GetSize(); i++)

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -18 +18 @@
 class MSequence : public MParContainer
 {
+public:
+    enum LightCondition_t { kNA, kNoMoon, kTwilight, kMoon };
 private:
     UInt_t fSequence;
@@ -28 +30 @@
     UInt_t fPeriod;
     MTime  fNight;
+
+    LightCondition_t fLightCondition;
 
     TString fProject;
@@ -43 +47 @@
     void Split(TString &runs, TArrayI &data) const;
     void GetFileNames(TEnv &env, const TArrayI &arr);
+    LightCondition_t ReadLightCondition(TEnv &env) const;
 
     const char *GetFileName(UInt_t num);
@@ -81 +86 @@
     UInt_t GetLastRun() const  { return fLastRun; }
     UInt_t GetPeriod() const   { return fPeriod; }
+    LightCondition_t GetLightCondition() const { return fLightCondition; }
+    Bool_t HasMoon() const { return fLightCondition==kMoon; }
 
     const UInt_t GetFirstRun() const { return fRuns[0]; }