Index: trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 9312)
+++ trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 9313)
@@ -193,4 +193,5 @@
     memset(fObservationMode, 0,  61);
     fSourceEpochChar[0]=0;
+    fSourceEpochChar[1]=0;
     fSourceEpochDate=0;
     fNumCrates=0;
@@ -199,4 +200,5 @@
     fNumSamplesHiGain=0;
     fNumEvents=0;
+    fNumEventsRead=0;
     fNumBytesPerSample=1;
     fSamplingFrequency=300;
@@ -931,6 +933,13 @@
     if (fFormatVersion>10)
         *fLog << "Header sizes: " << fHeaderSizeRun << "b (run), " << fHeaderSizeEvt << "b (evt), " << fHeaderSizeCrate << "b (crate)" << endl;
-    if (fFormatVersion>5)
-        *fLog << "Telescope:    " << fTelescopeNumber << endl;
+    if (fRunNumber>0)
+    {
+        if (fFormatVersion>5)
+            *fLog << "Telescope:    " << fTelescopeNumber << endl;
+        *fLog << "RunNumber:    " << fRunNumber;
+        if (fFormatVersion>10)
+            *fLog << "/" << fFileNumber << " (id=" << GetFileID() << ")";
+        *fLog << " (Type=" << GetRunTypeStr() << ")" << endl;
+    }
     if (fFormatVersion>7)
     {
@@ -945,8 +954,4 @@
         *fLog << ")" << endl;
     }
-    *fLog << "RunNumber:    " << fRunNumber;
-    if (fFormatVersion>10)
-        *fLog << "/" << fFileNumber << " (id=" << GetFileID() << ")";
-    *fLog << " (Type=" << GetRunTypeStr() << ")" << endl;
     *fLog << "ProjectName: '" << fProjectName << "'" << endl;
     if (fFormatVersion>5)
@@ -1196,9 +1201,8 @@
 // Monte Carlo Interface
 //
-//  Set run-type, telescope number, run-number and file-number
-//
-void MRawRunHeader::SetRunInfo(UShort_t type, UShort_t tel, UInt_t run, UInt_t file)
-{
-    fRunType         = type;
+//  Set telescope number, run-number and file-number
+//
+void MRawRunHeader::SetRunInfo(UShort_t tel, UInt_t run, UInt_t file)
+{
     fTelescopeNumber = tel;
     fRunNumber       = run;
@@ -1212,12 +1216,10 @@
 //  Set source-name, epoch (default J) and date (default 2000)
 //
-void MRawRunHeader::SetSourceInfo(const char src[80], char epoch, UShort_t date)
-{
-    memcpy(fSourceName, src, 80);
+void MRawRunHeader::SetSourceInfo(const TString src, char epoch, UShort_t date)
+{
+    strncpy(fSourceName, src.Data(), 80);
 
     fSourceEpochChar[0] = epoch;     // epoch char of the source
-    fSourceEpochChar[1] = 0;         // epoch char of the source
-
-    fSourceEpochDate = date;         // epoch date of the source
+    fSourceEpochDate    = date;      // epoch date of the source
 }
 
@@ -1240,8 +1242,8 @@
 //  Set project name and observation mode
 //
-void MRawRunHeader::SetObservation(const char mode[60], const char proj[100])
-{
-    memcpy(fProjectName,     proj, 100);
-    memcpy(fObservationMode, mode,  60);
+void MRawRunHeader::SetObservation(const TString mode, const TString proj)
+{
+    strncpy(fProjectName,     proj.Data(), 100);
+    strncpy(fObservationMode, mode.Data(),  60);
 }