Modifications in the output of the BF task (merging) - Michael Weber

[u/mrichter/AliRoot.git] / RAW / AliRawRFIODB.cxx

diff --git a/RAW/AliRawRFIODB.cxx b/RAW/AliRawRFIODB.cxx
index 16f05ad1835d2a19e45e18b00f32db96cdcb2b55..5a1c4718c1e7a140460c541be12645c9feb5c90b 100644 (file)
--- a/RAW/AliRawRFIODB.cxx
+++ b/RAW/AliRawRFIODB.cxx
@@ -1,4 +1,4 @@
-// @(#)alimdc:$Name$:$Id$
+// @(#) $Id$
 // Author: Fons Rademakers  26/11/99
 
 /**************************************************************************
@@ -32,11 +32,11 @@ ClassImp(AliRawRFIODB)
 
 
 //______________________________________________________________________________
-AliRawRFIODB::AliRawRFIODB(AliRawEvent *event,
+AliRawRFIODB::AliRawRFIODB(AliRawEventV2 *event,
                           AliESDEvent *esd,
                           Int_t compress,
-                          const char* fileName)
-   : AliRawDB(event, esd, compress, fileName)
+                          const char* fileName,Int_t basketsize)
+   : AliRawDB(event, esd, compress, fileName, basketsize)
 {
    // Create a new raw DB that will be accessed via RFIO.
 
@@ -103,7 +103,7 @@ const char *AliRawRFIODB::GetFileName() const
 }
 
 //______________________________________________________________________________
-Int_t AliRawRFIODB::Close()
+Long64_t AliRawRFIODB::Close()
 {
    // Close raw RFIO DB.
 
@@ -115,8 +115,9 @@ Int_t AliRawRFIODB::Close()
 
    // Write the tree.
    Bool_t error = kFALSE;
-   if (fTree->Write() == 0)
-     error = kTRUE;
+   if (fTree)
+     if (fTree->Write() == 0)
+       error = kTRUE;
    if (fESDTree)
      if (fESDTree->Write() == 0)
        error = kTRUE;
@@ -124,7 +125,9 @@ Int_t AliRawRFIODB::Close()
    // Close DB, this also deletes the fTree
    fRawDB->Close();
 
-   Int_t filesize = fRawDB->GetEND();
+   fTree = NULL;
+
+   Long64_t filesize = fRawDB->GetEND();
 
    if (fDeleteFiles) {
       TUrl u(fRawDB->GetName());