Changeset 8310 for trunk/MagicSoft/Mars/mfbase/MFDataPhrase.cc

Timestamp:

02/09/07 09:02:23 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfbase/MFDataPhrase.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mfbase/MFDataPhrase.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz  01/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -273 +273 @@
 Int_t MFDataPhrase::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    Int_t rc = MFilter::ReadEnv(env, prefix, print);
-    if (rc==kERROR)
+    Int_t rc1 = MFilter::ReadEnv(env, prefix, print);
+    if (rc1==kERROR)
         return kERROR;
 
@@ -329 +329 @@
             *fLog << endl;
         }
+
+        rc1 = kTRUE;
     }
     else
@@ -340 +342 @@
     }
 
-    if (fData->ReadEnv(env, prefix, print)==kERROR)
+    const Int_t rc2 = fData->ReadEnv(env, prefix, print);
+    if (rc2==kERROR)
         return kERROR;
 
@@ -351 +354 @@
             SetInverted(kFALSE);*/
 
-    return kTRUE;
-}
+    return rc1 || rc2;
+}