Index: trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc	(revision 531)
+++ trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc	(revision 532)
@@ -107,7 +107,7 @@
     // create data trees for the three types of data
     //
-    fTData        = new TTree("Data",       "Normal Triggered Data");
-    fTPedestal    = new TTree("Pedestal",   "Pedestal Triggered Data");
-    fTCalibration = new TTree("Calibration","Calibration Triggered Data");
+    fTData        = new TTree("Events",    "Normal Triggered Events");
+    fTPedestal    = new TTree("PedEvents", "Pedestal Triggered Events");
+    fTCalibration = new TTree("CalEvents", "Calibration Triggered Events");
 
     //
Index: trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 531)
+++ trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 532)
@@ -21,7 +21,7 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.14 $
-// $Author: magicsol $ 
-// $Date: 2001-01-15 12:33:34 $
+// $Revision: 1.15 $
+// $Author: harald $ 
+// $Date: 2001-01-17 09:32:27 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -754,5 +754,5 @@
 
   //      create a Tree for the Header Event
-  TTree HeaderTree("HeaderTree","Header of Run");
+  TTree HeaderTree("McHeaders","Monte Carlo Header of Run");
   
   //      define branches of Header Tree
@@ -811,5 +811,5 @@
 
   //      create a Tree for the Event data stream 
-  TTree EvtTree("EvtTree","Events of Run");
+  TTree EvtTree("Events","Normal Triggered Events");
 
   if (Write_McEvt){
@@ -3096,4 +3096,9 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.14  2001/01/15 12:33:34  magicsol
+// Some modifications have been done to use the new (Dec'2000) Raw data format.
+// There are also some minnors modifications to adapt the improvements in the
+// MTrigger class (overlaping time and trigger cells).
+//
 // Revision 1.13  2000/10/25 08:14:23  magicsol
 // The routine that produce poisson random numbers to decide how many phe
@@ -3109,4 +3114,9 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.14  2001/01/15 12:33:34  magicsol
+// Some modifications have been done to use the new (Dec'2000) Raw data format.
+// There are also some minnors modifications to adapt the improvements in the
+// MTrigger class (overlaping time and trigger cells).
+//
 // Revision 1.13  2000/10/25 08:14:23  magicsol
 // The routine that produce poisson random numbers to decide how many phe