Changeset 2779 for trunk/MagicSoft/Mars/mfilter

Timestamp:

01/13/04 09:33:30 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfilter/MFGeomag.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mfilter/MFGeomag.cc

@@ -86 +86 @@
     Float_t thet  [2*1152];
 
-    ifstream geomagp;
-
     TString filename = gSystem->Getenv("MARSSYS");
     filename += "/mfilter/gcplus.txt";
 
-    geomagp.open(filename);
+    ifstream geomagp(filename);
+
     if (!geomagp) {
         *fLog << err <<" ERROR gcplus.txt file not found by Geomag"<<endl;
@@ -105 +104 @@
     *fLog << Form ("FRigMin=%8f  fRigMax=%8f  fProb=%8f",
                    fRigMin[0], fRigMax[0], fProb[0]) << endl;
-    geomagp.close();
-    geomagp.clear();
-
-    ifstream geomagm;
 
     filename = gSystem->Getenv("MARSSYS");
     filename += "/mfilter/gcminus.txt";
 
-    geomagm.open(filename);
+    ifstream geomagm(filename);
     if (!geomagm) {
         *fLog << err <<" ERROR gcminus.txt file not found by Geomag"<<endl;
@@ -126 +121 @@
     *fLog << Form ("fRigMin=%8f  fRigMax=%8f  fProb=%8f",
                    fRigMin[1152], fRigMax[1152], fProb[1152]) << endl;
-    geomagm.close();
-    geomagm.clear();
+
     //
     if (fMcEvt)
@@ -133 +127 @@
 
     fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
-    if (fMcEvt)
-        return kTRUE;
-
-    *fLog << err << dbginf << "  [MMcEvt] not found... aborting." << endl;
-    return kFALSE;
+    if (!fMcEvt)
+    {
+        *fLog << err << dbginf << "  [MMcEvt] not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
 }
 // --------------------------------------------------------------------------