Changeset 2984 for trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

Timestamp:

01/30/04 14:55:59 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -124 +124 @@
 Bool_t MReadMarsFile::Notify()
 {
-    Int_t runtype = -1;
+    UInt_t runtype = 0xffff;
 
     const MRawRunHeader *rawheader = (MRawRunHeader*)fParList->FindObject("MRawRunHeader");
@@ -145 +145 @@
     if (!MReadTree::Notify())
         return kFALSE;
+
+    if (rawheader && runtype!=0xffff && runtype != rawheader->GetRunType())
+    {
+        *fLog << warn << "Warning - You are mixing files with different run types (";
+        *fLog << runtype << ", " << rawheader->GetRunType() << ")" << endl;
+    }
 
     if (fDisplay)
@@ -152 +158 @@
         txt += GetNumEntry()-1;
         fDisplay->SetStatusLine2(txt);
-    }
-
-    if (rawheader)
-    {
-        if (runtype != rawheader->GetRunType())
-            *fLog << warn << "Warning - You are mixing files with different run types!" << endl;
     }
 
@@ -209 +209 @@
     }
 
+    /*
     const Int_t idx = GetFileIndex();
     fRun->SetEventNum(idx<0?0:idx); // Assumption: One Entry per File!
@@ -216 +217 @@
         return kFALSE;
     }
-
+    */
     return MReadTree::PreProcess(pList);
 }