Changeset 4694 for trunk/MagicSoft/Mars/mraw

Timestamp:

08/20/04 11:25:36 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileRead.cc (modified) (2 diffs)
• MRawFileRead.h (modified) (1 diff)
• MRawFileWrite.cc (modified) (5 diffs)
• MRawFileWrite.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -109 +109 @@
     fFileNames->SetOwner();
 
-    if(fname!=NULL)
-      AddFile(fname);
+    if (fname!=NULL)
+        AddFile(fname);
 }
 
@@ -230 +230 @@
 // Return file name of current file.
 //
-const TString MRawFileRead::GetFileName() const
+TString MRawFileRead::GetFileName() const
 {
     const TObject *file = fFileNames->At(fNumFile-1);

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -34 +34 @@
     void SetInterleave(UInt_t i) { fInterleave = i; }
 
-    const TString GetFileName() const;
+    TString GetFileName() const;
 
     Int_t  AddFile(const char *fname, Int_t entries=-1);

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -65 +65 @@
                              const char *ftitle,
                              const Int_t comp,
-                             const char *name, const char *title)
+                             const char *name, const char *title) : fSplit(kFALSE)
 {
     fName  = name  ? name  : "MRawFileWrite";
@@ -82 +82 @@
 MRawFileWrite::~MRawFileWrite()
 {
+    if (fOut != fTData->GetCurrentFile())
+    {
+        *fLog << warn << endl;
+        *fLog << "WARNING - MWriteRootFile:   Root's  TTree/TFile   has  opened   a  new  file" << endl;
+        *fLog << "  automatically.  You can change this behaviour using TTree::SetMaxTreeSize." << endl;
+        *fLog << "  You won't be able to read splitted  files  correctly with MReadMarsFile if" << endl;
+        *fLog << "  they have more than one entry in 'RunHeaders' or you try to read more than" << endl;
+        *fLog << "  one of such sequences at once." << endl;
+        *fLog << endl;
+    }
+
+    //
+    // For more information see TTree:ChangeFile()
+    //
+    fOut = fTData->GetCurrentFile();
+
     //
     // delete instance, this also does a fOut->Close()
@@ -125 +141 @@
 
     //
-    // remember the pointer to the parameter list fur further usage
-    //
-    pParList = pList;
-
-    //
     //  check if MEvtHeader exists in the Parameter list already.
     //  if not create one and add them to the list
@@ -180 +191 @@
     // create data trees for the three types of data
     //
-    fTData        = new TTree("Events",      "Normal Triggered Events");
-    fTPedestal    = new TTree("Pedestals",   "Pedestal Triggered Events");
-    fTCalibration = new TTree("Calibration", "Calibration Triggered Events");
+    fTData        =          new TTree("Events",      "Normal Triggered Events");
+    fTPedestal    = fSplit ? new TTree("Pedestals",   "Pedestal Triggered Events")    : fTData;
+    fTCalibration = fSplit ? new TTree("Calibration", "Calibration Triggered Events") : fTData;
 
     //
@@ -207 +218 @@
     // 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",          &fTime,          32000);
+    fTData->Branch("MTime.",          "MTime",          &fTime,          32000);
+    fTData->Branch("MRawEvtHeader.",  "MRawEvtHeader",  &fRawEvtHeader,  32000);
+    fTData->Branch("MRawEvtData.",    "MRawEvtData",    &fRawEvtData,    320000);
+    fTData->Branch("MRawCrateArray.", "MRawCrateArray", &fRawCrateArray, 32000);
+    if (!fSplit)
+        return kTRUE;
+
     fTPedestal   ->Branch("MTime.",          "MTime",          &fTime,          32000);
     fTCalibration->Branch("MTime.",          "MTime",          &fTime,          32000);
-    fTData       ->Branch("MRawEvtHeader.",  "MRawEvtHeader",  &fRawEvtHeader,  32000);
     fTPedestal   ->Branch("MRawEvtHeader.",  "MRawEvtHeader",  &fRawEvtHeader,  32000);
     fTCalibration->Branch("MRawEvtHeader.",  "MRawEvtHeader",  &fRawEvtHeader,  32000);
-    fTData       ->Branch("MRawEvtData.",    "MRawEvtData",    &fRawEvtData,    320000);
     fTPedestal   ->Branch("MRawEvtData.",    "MRawEvtData",    &fRawEvtData,    320000);
     fTCalibration->Branch("MRawEvtData.",    "MRawEvtData",    &fRawEvtData,    320000);
-    //fTree->Branch("MRawCrateArray",  fRawCrateArray->GetArray(),      32000, 1);
-    fTData       ->Branch("MRawCrateArray.", "MRawCrateArray", &fRawCrateArray, 32000);
     fTPedestal   ->Branch("MRawCrateArray.", "MRawCrateArray", &fRawCrateArray, 32000);
     fTCalibration->Branch("MRawCrateArray.", "MRawCrateArray", &fRawCrateArray, 32000);

trunk/MagicSoft/Mars/mraw/MRawFileWrite.h

@@ -19 +19 @@
 {
 private:
-    MParList *pParList;
-
     MTime          *fTime;
     MRawRunHeader  *fRawRunHeader;
@@ -35 +33 @@
     TFile *fOut;                    //!
 
+    Bool_t fSplit;
+
     Int_t  PreProcess(MParList *pList);
     Bool_t ReInit(MParList *pList);
@@ -47 +47 @@
     ~MRawFileWrite();
 
+    void EnableSplit(Bool_t b=kTRUE) { fSplit=b; }
+
     ClassDef(MRawFileWrite, 0)  // Task to write the raw data containers to a root file
 };