Changeset 6231 for trunk/MagicSoft/Mars/mcalib

Timestamp:

02/03/05 11:55:25 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibColorSet.cc (modified) (4 diffs)
• MCalibColorSet.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc

@@ -65 +65 @@
 //
 MCalibColorSet::MCalibColorSet(const char *name, const char *title)
-  : fPattern(0), fHeader(0)
+    : fPattern(0), fHeader(0), fIsExplicitColor(kFALSE)
 {
   fName  = name  ? name  : "MCalibColorSet";
@@ -76 +76 @@
 {
   
-  fColor    = MCalibrationCam::kNONE;
-  fStrength = -1.;
-  fIsValid  = kFALSE;
-
+  fIsValid         = kFALSE;
+
+  if (fIsExplicitColor)
+    return;
+
+  fColor           = MCalibrationCam::kNONE;
+  fStrength        = -1.;
 }
 
@@ -169 +172 @@
     }
  
+  if (fIsExplicitColor)
+    {
+      fIsValid = kTRUE;
+      return kTRUE;
+    }
+
   const Int_t num = header->GetRunNumber();
 
@@ -535 +544 @@
   return kTRUE;
 }
+
+Int_t MCalibColorSet::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+
+  Bool_t rc = kFALSE;
+
+  if (IsEnvDefined(env, prefix, "ExplicitColor", print))
+    {
+      TString dat = GetEnvValue(env, prefix, "ExplicitColor", "");
+      if (dat.BeginsWith("green", TString::kIgnoreCase))
+        SetExplicitColor(MCalibrationCam::kGREEN);
+      if (dat.BeginsWith("blue", TString::kIgnoreCase))
+        SetExplicitColor(MCalibrationCam::kBLUE);
+      if (dat.BeginsWith("uv", TString::kIgnoreCase))
+        SetExplicitColor(MCalibrationCam::kUV);
+      if (dat.BeginsWith("ct1", TString::kIgnoreCase))
+        SetExplicitColor(MCalibrationCam::kCT1);
+      rc = kTRUE;
+    }
+
+  return rc;
+}

trunk/MagicSoft/Mars/mcalib/MCalibColorSet.h

@@ -29 +29 @@
 
   Bool_t fIsValid;                             //  Have to set the pulse pattern?
-
+  Bool_t fIsExplicitColor;                     //  Is colour set explicitely from outside (for MC)? 
+  
   void CheckAndSet(const TString &str, const char *regexp, MCalibrationCam::PulserColor_t col, Float_t strength);
 
@@ -35 +36 @@
   Int_t  PreProcess(MParList *pList);
   Int_t  Process();
+
+  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
   
 public:
@@ -41 +44 @@
   
   void Clear(const Option_t *o="");
+
+  void SetExplicitColor( const MCalibrationCam::PulserColor_t col, const Float_t strength=10.) 
+    {
+      fIsExplicitColor = kTRUE;
+      fColor    = col;
+      fStrength = 10.;
+    }
   
   ClassDef(MCalibColorSet, 0) // Task to workaround missing colors