Changeset 4633 for trunk/MagicSoft/Mars

Timestamp:

08/16/04 17:17:27 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

• MBadPixelsTreat.cc (modified) (2 diffs)
• MBadPixelsTreat.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -56 +56 @@
 #include <fstream>
 
+#include <TEnv.h>
 #include <TArrayD.h>
 
@@ -579 +580 @@
     if (TESTBIT(fFlags, kUseCentralPixel))
         out << "   " << GetUniqueName() << ".SetUseCentralPixel();" << endl;
-}
+    if (TESTBIT(fFlags, kProcessRMS))
+        out << "   " << GetUniqueName() << ".SetProcessRMS();" << endl;
+    if (TESTBIT(fFlags, kHardTreatment))
+        out << "   " << GetUniqueName() << ".SetHardTreatment();" << endl;
+    if (fNumMinNeighbors!=3)
+        out << "   " << GetUniqueName() << ".SetNumMinNeighbors(" << (int)fNumMinNeighbors << ");" << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv, eg:
+//   MBadPixelsCalc.UseInterpolation: no
+//   MBadPixelsCalc.UseCentralPixel:  no
+//   MBadPixelsCalc.HardTreatment:    no
+//   MBadPixelsCalc.ProcessRMS:       no
+//   MBadPixelsCalc.NumMinNeighbors:  3
+//
+Int_t MBadPixelsTreat::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "UseInterpolation"))
+    {
+        rc = kTRUE;
+        SetUseInterpolation(GetEnvValue(env, prefix, "UseInterpolation", IsUseInterpolation()));
+    }
+    if (IsEnvDefined(env, prefix, "UseCentralPixel"))
+    {
+        rc = kTRUE;
+        SetUseCentralPixel(GetEnvValue(env, prefix, "UseCentralPixel", IsUseCentralPixel()));
+    }
+    if (IsEnvDefined(env, prefix, "HardTreatment"))
+    {
+        rc = kTRUE;
+        SetHardTreatment(GetEnvValue(env, prefix, "HardTreatment", IsHardTreatment()));
+    }
+    if (IsEnvDefined(env, prefix, "ProcessRMS"))
+    {
+        rc = kTRUE;
+        SetProcessRMS(GetEnvValue(env, prefix, "ProcessRMS", IsProcessRMS()));
+    }
+    if (IsEnvDefined(env, prefix, "NumMinNeighbors"))
+    {
+        rc = kTRUE;
+        SetNumMinNeighbors(GetEnvValue(env, prefix, "NumMinNeighbors", fNumMinNeighbors));
+    }
+    return rc;
+}

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h

@@ -28 +28 @@
         kUseCentralPixel  = 2,
         kProcessRMS       = 3,
-        kHardTreatment  = 4
+        kHardTreatment    = 4
     };
 
@@ -37 +37 @@
 
     void   Unmap() const;
-    void   StreamPrimitive(ofstream &out) const;
+    Bool_t IsPixelBad(Int_t idx) const;
 
     Bool_t ReInit(MParList *pList);
     Int_t  PreProcess(MParList *pList);
     Int_t  Process();
-
-    Bool_t IsPixelBad(Int_t idx) const;
+    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+    void   StreamPrimitive(ofstream &out) const;
 
 public:
@@ -64 +64 @@
         b ? SETBIT(fFlags, kHardTreatment) : CLRBIT(fFlags, kHardTreatment);
     }
+
+    Bool_t IsHardTreatment() const    { return TESTBIT(fFlags, kHardTreatment); }
+    Bool_t IsProcessRMS() const       { return TESTBIT(fFlags, kProcessRMS); }
+    Bool_t IsUseCentralPixel() const  { return TESTBIT(fFlags, kUseCentralPixel); }
+    Bool_t IsUseInterpolation() const { return TESTBIT(fFlags, kUseInterpolation); }
+
     void SetNumMinNeighbors(Byte_t num) { fNumMinNeighbors=num; }
     void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }