Index: /trunk/FACT++/src/DataWriteFits.cc
===================================================================
--- /trunk/FACT++/src/DataWriteFits.cc	(revision 17656)
+++ /trunk/FACT++/src/DataWriteFits.cc	(revision 17657)
@@ -188,7 +188,9 @@
     }
 
-    // This is a workaround for the missing information in the event builder
-    fTstart[0] = 0;
-    fTstop[0]  = 0;
+    fTstart[0] = h.RunTime;
+    fTstart[1] = h.RunUsec;
+
+    fTstop[0] = 0;
+    fTstop[1] = 0;
 
     fTriggerCounter.fill(0);
@@ -208,11 +210,12 @@
         return false;
 
-    fTriggerCounter = evt.runCtrl->triggerCounter;
+    // Remember the counter of the last written event
+    fTriggerCounter = evt.triggerCounter;
+
+    // Remember the time of the last event
+    fTstop[0] = evt.time.tv_sec;
+    fTstop[1] = evt.time.tv_usec;
 
     const EVENT &e = *evt.fEvent;
-
-    memcpy(fTstop, &e.PCTime, 2*sizeof(uint32_t));
-    if (fTstart[0]==0)
-        memcpy(fTstart, fTstop, 2*sizeof(uint32_t));
 
     const int realRoiTM = (e.RoiTM > e.Roi) ? e.Roi : 0;
@@ -258,12 +261,12 @@
                        "Time when last event received");
 
-        fFile.WriteKey("NTRG",     fTriggerCounter[0], "Number of physics triggers written");
-        fFile.WriteKey("NTRGPED",  fTriggerCounter[1], "Number of pure pedestal triggers written");
-        fFile.WriteKey("NTRGLPE",  fTriggerCounter[2], "Number of external light pulser triggers written");
-        fFile.WriteKey("NTRGTIM",  fTriggerCounter[3], "Number of time calibration triggers written");
-        fFile.WriteKey("NTRGLPI",  fTriggerCounter[4], "Number of internal light pulser triggers written");
-        fFile.WriteKey("NTRGEXT1", fTriggerCounter[5], "Number of triggers from ext1 written");
-        fFile.WriteKey("NTRGEXT2", fTriggerCounter[6], "Number of triggers from ext2 written");
-        fFile.WriteKey("NTRGMISC", fTriggerCounter[7], "Number of triggers belonging to no other category written");
+        fFile.WriteKey("NTRG",     fTriggerCounter[0], "No of physics triggered events");
+        fFile.WriteKey("NTRGPED",  fTriggerCounter[1], "No of pure pedestal triggered events");
+        fFile.WriteKey("NTRGLPE",  fTriggerCounter[2], "No of external light pulser triggered events");
+        fFile.WriteKey("NTRGTIM",  fTriggerCounter[3], "No of time calibration triggered events");
+        fFile.WriteKey("NTRGLPI",  fTriggerCounter[4], "No of internal light pulser triggered events");
+        fFile.WriteKey("NTRGEXT1", fTriggerCounter[5], "No of triggers from ext1 triggered events");
+        fFile.WriteKey("NTRGEXT2", fTriggerCounter[6], "No of triggers from ext2 triggered events");
+        fFile.WriteKey("NTRGMISC", fTriggerCounter[7], "No of all other triggered events");
     }
     catch (const CCfits::FitsException &e)
@@ -280,11 +283,9 @@
 //! @param rt the pointer to the RUN_TAIL data structure
 //
-bool DataWriteFits::Close(const EVT_CTRL2 &evt)
+bool DataWriteFits::Close(const EVT_CTRL2 &)
 {
     if (!fFile.IsOpen())
         return false;
 
-    // Just for safety
-    fTriggerCounter = evt.triggerCounter;
     WriteFooter();
 
Index: /trunk/FACT++/src/DataWriteFits2.cc
===================================================================
--- /trunk/FACT++/src/DataWriteFits2.cc	(revision 17656)
+++ /trunk/FACT++/src/DataWriteFits2.cc	(revision 17657)
@@ -249,6 +249,8 @@
 bool DataWriteFits2::WriteEvt(const EVT_CTRL2 &evt)
 {
-    fTriggerCounter = evt.runCtrl->triggerCounter;
-
+    // Remember the counter of the last written event
+    fTriggerCounter = evt.triggerCounter;
+
+    // Remember the time of the last event
     fTstop[0] = evt.time.tv_sec;
     fTstop[1] = evt.time.tv_usec;
@@ -301,12 +303,12 @@
                   "Time when last event received");
 
-    fFile->SetInt("NTRG",     fTriggerCounter[0], "No of physics triggers written");
-    fFile->SetInt("NTRGPED",  fTriggerCounter[1], "No of pure pedestal triggers written");
-    fFile->SetInt("NTRGLPE",  fTriggerCounter[2], "No of external light pulser triggers written");
-    fFile->SetInt("NTRGTIM",  fTriggerCounter[3], "No of time calibration triggers written");
-    fFile->SetInt("NTRGLPI",  fTriggerCounter[4], "No of internal light pulser triggers written");
-    fFile->SetInt("NTRGEXT1", fTriggerCounter[5], "No of triggers from ext1 written");
-    fFile->SetInt("NTRGEXT2", fTriggerCounter[6], "No of triggers from ext2 written");
-    fFile->SetInt("NTRGMISC", fTriggerCounter[7], "No of all other triggers");
+    fFile->SetInt("NTRG",     fTriggerCounter[0], "No of physics triggered events");
+    fFile->SetInt("NTRGPED",  fTriggerCounter[1], "No of pure pedestal triggered events");
+    fFile->SetInt("NTRGLPE",  fTriggerCounter[2], "No of external light pulser triggered events");
+    fFile->SetInt("NTRGTIM",  fTriggerCounter[3], "No of time calibration triggered events");
+    fFile->SetInt("NTRGLPI",  fTriggerCounter[4], "No of internal light pulser triggered events");
+    fFile->SetInt("NTRGEXT1", fTriggerCounter[5], "No of triggers from ext1 triggered events");
+    fFile->SetInt("NTRGEXT2", fTriggerCounter[6], "No of triggers from ext2 triggered events");
+    fFile->SetInt("NTRGMISC", fTriggerCounter[7], "No of all other triggered events");
 }
 
@@ -326,7 +328,4 @@
     try
     {
-        // Just for safety
-        fTriggerCounter = evt.triggerCounter;
-
         WriteFooter();
     }