From v4-11-Release: fixes in rec.C for the cosmic data + new dialog based shell scrip...

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

diff --git a/RAW/AliRawDB.cxx b/RAW/AliRawDB.cxx
index 6b1ddd60d49e06ea64fc2f1482168314e5a4e5ca..ebeae2e6bddae6d9859ebc3b4126782c60fcf8fb 100644 (file)
--- a/RAW/AliRawDB.cxx
+++ b/RAW/AliRawDB.cxx
@@ -1,4 +1,4 @@
-// @(#)alimdc:$Name$:$Id$
+// @(#)alimdc:$Name:  $:$Id$
 // Author: Fons Rademakers  26/11/99
 
 /**************************************************************************
@@ -49,11 +49,11 @@
 
 ClassImp(AliRawDB)
 
-const char *AliRawDB::fgkAliRootTag = "$Name$";
+const char *AliRawDB::fgkAliRootTag = "$Rev$";
 
 // Split TPC into 9 branches in order to avoid problems with big memory
 // consumption in case of TPC events w/o zero-suppression
-Int_t AliRawDB::fgkDetBranches[AliDAQ::kNDetectors+1] = {1,1,1,18,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+Int_t AliRawDB::fgkDetBranches[AliDAQ::kNDetectors+1] = {1,1,1,18,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,10,1};
 
 //______________________________________________________________________________
 AliRawDB::AliRawDB(AliRawEvent *event,
@@ -267,7 +267,7 @@ void AliRawDB::MakeTree()
    // Create ROOT Tree object container.
 
    fTree = new TTree("RAW", Form("ALICE raw-data tree (%s)", GetAliRootTag()));
-   fTree->SetAutoSave(2000000000);  // autosave when 2 Gbyte written
+   fTree->SetAutoSave(21000000000LL);  // autosave when 21 Gbyte written
 
    fTree->BranchRef();
 
@@ -292,7 +292,7 @@ void AliRawDB::MakeTree()
 
    if (fESD) {
      fESDTree = new TTree("esdTree", Form("ALICE HLT ESD tree (%s)", GetAliRootTag()));
-     fESDTree->SetAutoSave(2000000000);  // autosave when 2 Gbyte written
+     fESDTree->SetAutoSave(21000000000LL);  // autosave when 21 Gbyte written
      split   = 0;
      fESDTree->Branch("ESD", "AliESDEvent", &fESD, bufsize, split);
    }
@@ -300,7 +300,7 @@ void AliRawDB::MakeTree()
 }
 
 //______________________________________________________________________________
-Int_t AliRawDB::Close()
+Long64_t AliRawDB::Close()
 {
    // Close raw DB.
    if (!fRawDB) return 0;
@@ -320,7 +320,7 @@ Int_t AliRawDB::Close()
    // Close DB, this also deletes the fTree
    fRawDB->Close();
 
-   Int_t filesize = fRawDB->GetEND();
+   Long64_t filesize = fRawDB->GetEND();
 
    if (fDeleteFiles) {
       gSystem->Unlink(fRawDB->GetName());
@@ -383,10 +383,10 @@ Int_t AliRawDB::Fill()
 }
 
 //______________________________________________________________________________
-Int_t AliRawDB::GetTotalSize()
+Long64_t AliRawDB::GetTotalSize()
 {
    // Return the total size of the trees
-  Int_t total = 0;
+  Long64_t total = 0;
 
   {
     Int_t skey = 0;
@@ -395,7 +395,7 @@ Int_t AliRawDB::GetTotalSize()
       TKey *key = dir->GetKey(fTree->GetName());
       if (key) skey = key->GetKeylen();
     }
-    total += skey + fTree->GetZipBytes();
+    total += (Long64_t)skey + fTree->GetZipBytes();
   }
 
   if(fESDTree)
@@ -406,7 +406,7 @@ Int_t AliRawDB::GetTotalSize()
        TKey *key = dir->GetKey(fESDTree->GetName());
        if (key) skey = key->GetKeylen();
       }
-      total += skey + fESDTree->GetZipBytes();
+      total += (Long64_t)skey + fESDTree->GetZipBytes();
     }
 
   return total;
@@ -461,9 +461,9 @@ const char *AliRawDB::GetAliRootTag()
   // used to generate the raw data file.
   // Stored in the raw-data file title.
 
-  TString version = fgkAliRootTag;
+  static TString version = fgkAliRootTag;
   version.Remove(TString::kBoth,'$');
-  version.ReplaceAll("Name","AliRoot version");
+  version.ReplaceAll("Rev","AliRoot version");
 
   return version.Data();
 }