Changeset 7995

Timestamp:

09/28/06 19:35:43 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadMarsFile.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -90 +90 @@
      - removed the tab with the number of muons after cuts
      - allow a dataset as last argument
+
+   * mfileio/MReadMarsFile.cc:
+     - improved output in case something is wrong with the run-header
 
 

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -195 +195 @@
     if (rawheader && runtype!=0xffff && runtype != rawheader->GetRunType())
     {
-        *fLog << warn << "Warning - You are mixing files with different run types (";
+        *fLog << warn << "WARNING - You are mixing files with different run types (";
         *fLog << runtype << ", " << rawheader->GetRunType() << ")" << endl;
+    }
+
+    if (!rawheader->IsValid())
+    {
+        *fLog << warn << "WARNING - The run header read from the file is invalid." << endl;
+        *fLog << "          Please check if the file contents are ok." << endl;
+        rawheader->Print("header");
     }
 
@@ -204 +211 @@
         if (mcheader->GetCamVersion()==50)
         {
-            *fLog << warn << "Warning - You are using a file created with Camera 0.5." << endl;
+            *fLog << warn << "WARNING - You are using a file created with Camera 0.5." << endl;
             *fLog << "In this camera version some events have undefined Impact-Values" << endl;
             *fLog << "(MMcEvt::fImpact) Please don't use it for MC studies using the" << endl;