Changeset 532 for trunk/MagicSoft

Timestamp:

01/17/01 09:32:27 (24 years ago)

Author:

harald

Message:

The changes are neccessary to have the same name for trees in MC and in
data. So now there should be no differences in MC data and real data from
FADC system.

Location:

trunk/MagicSoft

Files:

• Mars/mraw/MRawFileWrite.cc (modified) (1 diff)
• Simulation/Detector/Camera/camera.cxx (modified) (5 diffs)

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -107 +107 @@
     // 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");
 
     //

trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

@@ -21 +21 @@
 //
 // $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 +754 @@
 
   //      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 +811 @@
 
   //      create a Tree for the Event data stream 
-  TTree EvtTree("EvtTree","Events of Run");
+  TTree EvtTree("Events","Normal Triggered Events");
 
   if (Write_McEvt){
@@ -3096 +3096 @@
 //
 // $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 +3114 @@
 //
 // $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