Changeset 2556 for trunk/MagicSoft/Mars/mraw

Timestamp:

11/22/03 15:31:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileWrite.cc (modified) (4 diffs)
• MRawFileWrite.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -105 +105 @@
 //  - MRawEvtData
 //  - MRawCrateArray
-//  - MRawEvtTime <MTime>
+//  - MTime
 //  - MRawRunHeader
 // if a container isn't found the eventloop is stopped.
@@ -154 +154 @@
     }
 
-    fRawEvtTime = (MTime*)pList->FindObject("MRawEvtTime");
-    if (!fRawEvtTime)
-    {
-        *fLog << err << dbginf << "MRawEvtTime not found... aborting." << endl;
+    fTime = (MTime*)pList->FindObject("MTime");
+    if (!fTime)
+    {
+        *fLog << err << dbginf << "MTime not found... aborting." << endl;
         return kFALSE;
     }
@@ -186 +186 @@
     // create data trees for the three types of data
     //
-    fTData        = new TTree("Events",    "Normal Triggered Events");
-    fTPedestal    = new TTree("PedEvents", "Pedestal Triggered Events");
-    fTCalibration = new TTree("CalEvents", "Calibration Triggered Events");
+    fTData        = new TTree("Events",      "Normal Triggered Events");
+    fTPedestal    = new TTree("Pedestals",   "Pedestal Triggered Events");
+    fTCalibration = new TTree("Calibration", "Calibration Triggered Events");
 
     //
@@ -213 +213 @@
     // FIXME: Can we calculate a good buffer size out of the event size?
     //        using splitlevel=0 sppeds up writing by a factor of 5-10%
-    fTData       ->Branch("MTime.",          "MTime",          &fRawEvtTime,    32000);
-    fTPedestal   ->Branch("MTime.",          "MTime",          &fRawEvtTime,    32000);
-    fTCalibration->Branch("MTime.",          "MTime",          &fRawEvtTime,    32000);
+    fTData       ->Branch("MTime.",          "MTime",          &fTime,          32000);
+    fTPedestal   ->Branch("MTime.",          "MTime",          &fTime,          32000);
+    fTCalibration->Branch("MTime.",          "MTime",          &fTime,          32000);
     fTData       ->Branch("MRawEvtHeader.",  "MRawEvtHeader",  &fRawEvtHeader,  32000);
     fTPedestal   ->Branch("MRawEvtHeader.",  "MRawEvtHeader",  &fRawEvtHeader,  32000);

trunk/MagicSoft/Mars/mraw/MRawFileWrite.h

@@ -21 +21 @@
     MParList *pParList;
 
-    MTime          *fRawEvtTime;
+    MTime          *fTime;
     MRawRunHeader  *fRawRunHeader;
     MRawEvtHeader  *fRawEvtHeader;