Changeset 6532 for trunk/MagicSoft

Timestamp:

02/16/05 16:22:18 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndCharge.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
        in newer root versions
 
+   * msignal/MExtractTimeAndCharge.cc
+     - initialize fLoGainStartShift correctly if read from conf. file 
+       and modified fOffsetLoGain exists.
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -223 +223 @@
           fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
 
+          // *fLog << err << (Int_t)fLoGainFirst << endl;
+
           if ( fLoGainFirst < fLoGainLast )
             {
@@ -264 +266 @@
 Int_t MExtractTimeAndCharge::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    Bool_t rc = kFALSE;
+
+    Bool_t rc = MExtractTime::ReadEnv(env, prefix, print);
+
+    if (rc)
+      SetLoGainStartShift();
 
     if (IsEnvDefined(env, prefix, "LoGainStartShift", print))
     {
-        fLoGainStartShift = GetEnvValue(env, prefix, "LoGainStartShift", fLoGainStartShift);
+        fLoGainStartShift = GetEnvValue(env, prefix, "LoGainStartShift", fgLoGainStartShift);
+        SetLoGainStartShift(fLoGainStartShift);
         rc = kTRUE;
     }
@@ -278 +285 @@
     }
 
-    return MExtractTime::ReadEnv(env, prefix, print) ? kTRUE : rc;
+    return rc;
 }