number of DDLs per detector updated

diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx
index 8b4e9cc271dd978e621fc0d254f5c0842e8dc850..aacf71077250a2485cdd86a3e8041bc17740e20f 100644 (file)
--- a/STEER/AliModule.cxx
+++ b/STEER/AliModule.cxx
@@ -842,7 +842,7 @@ void AliModule::Digits2Raw()
 
   const Int_t kNDetectors = 16;
   const char* kDetectors[kNDetectors] = {"TPC", "ITSSPD", "ITSSDD", "ITSSSD", "TRD", "TOF", "PHOS", "RICH", "EMCAL", "MUON", "FMD", "ZDC", "PMD", "START", "VZERO", "CRT"};
-  const Int_t kDetectorDDLs[kNDetectors] = {216, 20, 12, 16, 18, 5, 1, 5, 1, 7, 1, 1, 3, 1, 1};
+  const Int_t kDetectorDDLs[kNDetectors] = {216, 20, 12, 16, 18, 72, 20, 5, 1, 20, 1, 1, 6, 1, 1};
   Int_t nDDLs = 1;
   Int_t ddlOffset = 0;
   for (Int_t i = 0; i < kNDetectors; i++) {
@@ -858,7 +858,7 @@ void AliModule::Digits2Raw()
 
   digitsFile.seekg(0, ios::end);
   UInt_t size = digitsFile.tellg();
-  UInt_t ddlSize = size/nDDLs;
+  UInt_t ddlSize = 4 * (size / (4*nDDLs));
   Char_t* buffer = new Char_t[ddlSize+1];
 
   for (Int_t iDDL = 0; iDDL < nDDLs; iDDL++) {

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 22daf93f88089150fd30f326f9de024935e05a8f..830621942714e85c905f2e2e5f729e6b952d5ba1 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -657,8 +657,8 @@ Bool_t AliSimulation::ConvertRawFilesToDate(const char* dateFileName)
                                          "EMCAL", "MUON", "FMD", "ZDC", 
                                          "PMD", "START", "VZERO", "CRT"};
   const Int_t kDetectorDDLs[kNDetectors]   = {216, 20, 12, 16, 
-                                              18, 5, 10, 5, 
-                                              1, 7, 1, 1, 
+                                              18, 72, 20, 5, 
+                                              1, 20, 1, 1, 
                                               6, 1, 1, 1};
   const Float_t kDetectorLDCs[kNDetectors] = {46, 2, 2, 1, 
                                               4, 2, 1, 2, 
@@ -679,7 +679,7 @@ Bool_t AliSimulation::ConvertRawFilesToDate(const char* dateFileName)
   Info("ConvertRawFilesToDate", 
        "converting raw data DDL files to DATE file %s", dateFileName);
   char command[256];
-  sprintf(command, "dateStream -o %s -# %d", 
+  sprintf(command, "dateStream -o %s -# %d -C", 
          dateFileName, runLoader->GetNumberOfEvents());
   FILE* pipe = gSystem->OpenPipe(command, "w");
 

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index 62e9b3ac940a8eaf0f58d2a1f888e9e84410007f..9fadb2ab55028467c1e902bad6687a366657cd2f 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -14,6 +14,7 @@
 
 #include <TNamed.h>
 #include <TString.h>
+#include <TObjArray.h>
 
 class AliRunLoader;