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 2286de471317605fc122251e9b89f45b9ffa2d00..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,7 +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,10,1};
 
 //______________________________________________________________________________
 AliRawDB::AliRawDB(AliRawEvent *event,
@@ -70,10 +74,16 @@ AliRawDB::AliRawDB(AliRawEvent *event,
 {
    // Create a new raw DB
 
-  for (Int_t iDet = 0; iDet < AliDAQ::kNDetectors; iDet++)
-    fDetRawData[iDet] = new AliRawDataArray(AliDAQ::NumberOfDdls(iDet));
+  for (Int_t iDet = 0; iDet < AliDAQ::kNDetectors; iDet++) {
+    fDetRawData[iDet] = new AliRawDataArray*[fgkDetBranches[iDet]];
+    Int_t nDDLsPerBranch = AliDAQ::NumberOfDdls(iDet)/fgkDetBranches[iDet];
+    for (Int_t iBranch = 0; iBranch < fgkDetBranches[iDet]; iBranch++)
+      fDetRawData[iDet][iBranch] = new AliRawDataArray(nDDLsPerBranch);
+  }
 
-  fDetRawData[AliDAQ::kNDetectors] = new AliRawDataArray(100);
+  fDetRawData[AliDAQ::kNDetectors] = new AliRawDataArray*[fgkDetBranches[AliDAQ::kNDetectors]];
+  for (Int_t iBranch = 0; iBranch < fgkDetBranches[AliDAQ::kNDetectors]; iBranch++)
+    fDetRawData[AliDAQ::kNDetectors][iBranch] = new AliRawDataArray(100);
 
    if (fileName) {
       if (!Create(fileName))
@@ -88,8 +98,11 @@ AliRawDB::~AliRawDB() {
 
   if(Close()==-1) Error("~AliRawDB", "cannot close output file!");
 
-  for (Int_t iDet = 0; iDet < (AliDAQ::kNDetectors + 1); iDet++)
-    delete fDetRawData[iDet];
+  for (Int_t iDet = 0; iDet < (AliDAQ::kNDetectors + 1); iDet++) {
+    for (Int_t iBranch = 0; iBranch < fgkDetBranches[iDet]; iBranch++)
+      delete fDetRawData[iDet][iBranch];
+    delete [] fDetRawData[iDet];
+  }
 }
 
 //______________________________________________________________________________
@@ -254,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();
 
@@ -266,18 +279,20 @@ void AliRawDB::MakeTree()
 
    // Make brach for each sub-detector
    for (Int_t iDet = 0; iDet < AliDAQ::kNDetectors; iDet++) {
-     fTree->Branch(AliDAQ::DetectorName(iDet),"AliRawDataArray",
-                  &fDetRawData[iDet],bufsize,split);
+     for (Int_t iBranch = 0; iBranch < fgkDetBranches[iDet]; iBranch++)
+       fTree->Branch(Form("%s%d",AliDAQ::DetectorName(iDet),iBranch),"AliRawDataArray",
+                    &fDetRawData[iDet][iBranch],bufsize,split);
    }
    // Make special branch for unrecognized raw-data payloads
-   fTree->Branch("Common","AliRawDataArray",
-                  &fDetRawData[AliDAQ::kNDetectors],bufsize,split);
+   for (Int_t iBranch = 0; iBranch < fgkDetBranches[AliDAQ::kNDetectors]; iBranch++)
+     fTree->Branch(Form("Common%d",iBranch),"AliRawDataArray",
+                  &fDetRawData[AliDAQ::kNDetectors][iBranch],bufsize,split);
 
    // Create tree which will contain the HLT ESD information
 
    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);
    }
@@ -285,7 +300,7 @@ void AliRawDB::MakeTree()
 }
 
 //______________________________________________________________________________
-Int_t AliRawDB::Close()
+Long64_t AliRawDB::Close()
 {
    // Close raw DB.
    if (!fRawDB) return 0;
@@ -305,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());
@@ -331,7 +346,8 @@ Int_t AliRawDB::Fill()
    // Fill the trees and return the number of written bytes
 
   for (Int_t iDet = 0; iDet < (AliDAQ::kNDetectors + 1); iDet++)
-    fDetRawData[iDet]->ClearData();
+    for (Int_t iBranch = 0; iBranch < fgkDetBranches[iDet]; iBranch++)
+      fDetRawData[iDet][iBranch]->ClearData();
 
    // Move the raw-data payloads to the corresponding branches
   for(Int_t iSubEvent = 0; iSubEvent < fEvent->GetNSubEvents(); iSubEvent++) {
@@ -341,9 +357,15 @@ Int_t AliRawDB::Fill()
       UInt_t eqId = equipment->GetEquipmentHeader()->GetId();
       Int_t ddlIndex;
       Int_t iDet = AliDAQ::DetectorIDFromDdlID(eqId,ddlIndex);
-      if (iDet < 0 || iDet > AliDAQ::kNDetectors)
+      Int_t iBranch;
+      if (iDet < 0 || iDet > AliDAQ::kNDetectors) {
        iDet = AliDAQ::kNDetectors;
-      equipment->SetRawDataRef(fDetRawData[iDet]);
+       iBranch = 0; // can we split somehow the unrecognized data??? For the moment - no
+      }
+      else {
+       iBranch = (ddlIndex * fgkDetBranches[iDet])/AliDAQ::NumberOfDdls(iDet);
+      }
+      equipment->SetRawDataRef(fDetRawData[iDet][iBranch]);
     }
   }
 
@@ -361,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;
@@ -373,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)
@@ -384,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;
@@ -439,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();
 }