Changeset 5525

Timestamp:

11/30/04 19:30:36 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -78 +78 @@
 const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinHiGain    =  4;
 const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain    =  4;
-const TString MExtractTimeAndChargeDigitalFilter::fgNameWeightsFile        = "cosmics_weights.dat";
+const TString MExtractTimeAndChargeDigitalFilter::fgNameWeightsFile        = "msignal/cosmics_weights.dat";
 // --------------------------------------------------------------------------
 //
@@ -546 +546 @@
 Int_t MExtractTimeAndChargeDigitalFilter::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    Byte_t hw = fWindowSizeHiGain;
-    Byte_t lw = fWindowSizeLoGain;
-    Bool_t rc = kFALSE;
-
-    if (IsEnvDefined(env, prefix, "WindowSizeHiGain", print))
-    {
-        hw = GetEnvValue(env, prefix, "WindowSizeHiGain", hw);
-        rc = kTRUE;
-    }
-    if (IsEnvDefined(env, prefix, "WindowSizeLoGain", print))
-    {
-        lw = GetEnvValue(env, prefix, "WindowSizeLoGain", lw);
-        rc = kTRUE;
-    }
-
-    if (rc)
-        SetWindowSize(hw, lw);
-
-    Bool_t rc2 = kFALSE;
-    Int_t brh = fBinningResolutionHiGain;
-    Int_t brl = fBinningResolutionLoGain;
-
-    if (IsEnvDefined(env, prefix, "BinningResolutionHiGain", print))
-    {
-        brh = GetEnvValue(env, prefix, brh);
-        rc2 = kTRUE;
-    }
-    if (IsEnvDefined(env, prefix, "BinningResolutionLoGain", print))
-    {
-        brl = GetEnvValue(env, prefix, brl);
-        rc2 = kTRUE;
-    }
-
-    if (rc2)
-    {
-        SetBinningResolution(brh, brl);
-        rc = kTRUE;
-    }
-
-    if (IsEnvDefined(env, prefix, "WeightsFile", print))
-    {
-        if (!ReadWeightsFile(GetEnvValue(env, prefix, "WeightsFile", "")))
-            return kERROR;
-        rc = kTRUE;
-    }
-
-    return MExtractTimeAndCharge::ReadEnv(env, prefix, print) ? kTRUE : rc;
+
+  Byte_t hw = fWindowSizeHiGain;
+  Byte_t lw = fWindowSizeLoGain;
+  Bool_t rc = kFALSE;
+  
+  if (IsEnvDefined(env, prefix, "WindowSizeHiGain", print))
+    {
+      hw = GetEnvValue(env, prefix, "WindowSizeHiGain", hw);
+      rc = kTRUE;
+    }
+  if (IsEnvDefined(env, prefix, "WindowSizeLoGain", print))
+    {
+      lw = GetEnvValue(env, prefix, "WindowSizeLoGain", lw);
+      rc = kTRUE;
+    }
+  
+  if (rc)
+    SetWindowSize(hw, lw);
+  
+  Bool_t rc2 = kFALSE;
+  Int_t brh = fBinningResolutionHiGain;
+  Int_t brl = fBinningResolutionLoGain;
+  
+  if (IsEnvDefined(env, prefix, "BinningResolutionHiGain", print))
+    {
+      brh = GetEnvValue(env, prefix, brh);
+      rc2 = kTRUE;
+    }
+  if (IsEnvDefined(env, prefix, "BinningResolutionLoGain", print))
+    {
+      brl = GetEnvValue(env, prefix, brl);
+      rc2 = kTRUE;
+    }
+  
+  if (rc2)
+    {
+      SetBinningResolution(brh, brl);
+      rc = kTRUE;
+    }
+  
+  if (IsEnvDefined(env, prefix, "WeightsFile", print))
+    {
+      if (!ReadWeightsFile(GetEnvValue(env, prefix, "WeightsFile", "")))
+        return kERROR;
+      rc = kTRUE;
+    }
+  
+  return MExtractTimeAndCharge::ReadEnv(env, prefix, print) ? kTRUE : rc;
 }