Changeset 6845 for trunk/MagicSoft/Mars/mjobs

Timestamp:

03/17/05 12:04:06 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJPedestal.h (modified) (1 diff)
• MSequence.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -112 +112 @@
     void SetExtractor(MExtractor* ext);
     void SetUseData()                           { fExtractType = kUseData;   }
-    void SetUseHists()                          { fIsUseHists = kTRUE;  }
+    void SetUseHists( const Bool_t b=kTRUE)     { fIsUseHists = b;  }
     void SetUsePedRun()                         { fExtractType = kUsePedRun; }
     void SetDataCheckDisplay()                  { fDisplayType = kDisplayDataCheck; }

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -248 +248 @@
 }
 
+LightCondition_t MSequence::ReadLightCondition(TEnv &env) const
+{
+    TString str = env.GetValue("LightCondition", "n/a");
+    if (!str.CompareTo("n/a", TString::kIgnoreCase))
+        return kNA;
+    if (!str.CompareTo("NoMoon", TString::kIgnoreCase))
+        return kNoMoon;
+    if (!str.CompareTo("Twilight", TString::kIgnoreCase))
+        return kTwilight;
+    if (!str.CompareTo("Moon", TString::kIgnoreCase))
+        return kMoon;
+
+    gLog << warn << "MSequence: LightCondition-tag not n/a, nomoon, twilight or moon." << endl;
+    return kNA;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -269 +285 @@
     fNumEvents = env.GetValue("NumEvents", -1);
     fPeriod    = env.GetValue("Period",    -1);
+
+    fLightCondition = ReadLightCondition(env);
 
     str = env.GetValue("Start", "");