Changeset 4601 for trunk/MagicSoft/Mars/msignal

Timestamp:

08/12/04 16:41:37 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractor.cc (modified) (2 diffs)
• MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -302 +302 @@
 //   MJPedestal.MExtractor.SaturationLimit: 88
 //
-Bool_t MExtractor::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+Int_t MExtractor::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
     Byte_t hf = fHiGainFirst;
@@ -309 +309 @@
     Byte_t ll = fLoGainLast;
 
+    Bool_t rc = kFALSE;
+
     if (IsEnvDefined(env, prefix, "HiGainFirst", print))
+    {
         hf = GetEnvValue(env, prefix, "HiGainFirst", hf);
+        rc = kTRUE;
+    }
     if (IsEnvDefined(env, prefix, "LoGainFirst", print))
+    {
         lf = GetEnvValue(env, prefix, "LoGainFirst", lf);
+        rc = kTRUE;
+    }
 
     if (IsEnvDefined(env, prefix, "HiGainLast", print))
+    {
         hl = GetEnvValue(env, prefix, "HiGainLast", hl);
+        rc = kTRUE;
+    }
     if (IsEnvDefined(env, prefix, "LoGainLast", print))
+    {
         ll = GetEnvValue(env, prefix, "LoGainLast", ll);
+        rc = kTRUE;
+    }
 
     SetRange(hf, hl, lf, ll);
 
     if (IsEnvDefined(env, prefix, "SaturationLimit", print))
+    {
         SetSaturationLimit(GetEnvValue(env, prefix, "SaturationLimit", fSaturationLimit));
-
-    return kTRUE;
-}
+        rc = kTRUE;
+    }
+
+    return rc;
+}

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -55 +55 @@
     Int_t  Process();
     void   StreamPrimitive(ofstream &out) const;
-    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public: