1. Removal of huge hard-coded memory allocation. The memory is now allocated dynamica...

diff --git a/MONITOR/deroot.cxx b/MONITOR/deroot.cxx
index 00ee57f04113ba42ef394899881664544fbe6d40..d42fbddaa5c7268f661a4c8552bcd16e933d6705 100644 (file)
--- a/MONITOR/deroot.cxx
+++ b/MONITOR/deroot.cxx
@@ -5,17 +5,14 @@
 ******************************************************************************/
 
 #include <TError.h>
+#include <TSystem.h>
 #include <TSysEvtHandler.h>
 #include "deroot.h"
 
-int deroot(const char *rootFileName, const char *dateFileName);
+int deroot(const char *rootFileName, const char *dateFileName, const char *ddlFilesFolder);
 
-int deroot(const char *rootFileName, const char *dateFileName) {
+int deroot(const char *rootFileName, const char *dateFileName, const char *ddlFilesFolder) {
 
- unsigned char *dateEvent=new unsigned char [1000000000];
-
- FILE *dateFile;
- size_t gdcCounter, gdcSize;
  TFile rootFile(rootFileName);
  TTree *t=(TTree *)rootFile.Get("RAW");
  if(!t) {
@@ -26,15 +23,38 @@ int deroot(const char *rootFileName, const char *dateFileName) {
  
  t->SetBranchAddress("rawevent", &rootEvent);
 
+ FILE *dateFile;
  if(!(dateFile=fopen(dateFileName, "wb"))) {
   cerr << "Error opening DATE file" << endl;
   return(1);
  }
  
- for(gdcCounter=0; gdcCounter<t->GetEntries(); gdcCounter++) {
+ UInt_t eventSize = 10000000; // 10MB by default
+ unsigned char *dateEvent = new unsigned char[eventSize];
+ for(size_t gdcCounter=0; gdcCounter<t->GetEntries(); gdcCounter++) {
   rootEvent=new AliRawEvent;
   t->GetEntry(gdcCounter);
-  gdcSize=Root2Date(rootEvent, dateEvent);
+  if (rootEvent->GetHeader()->GetEventSize() > eventSize) {
+    delete [] dateEvent;
+    eventSize = (UInt_t)(1.05*rootEvent->GetHeader()->GetEventSize());
+    dateEvent = new unsigned char[eventSize];
+  }
+
+  size_t gdcSize;
+  if (ddlFilesFolder) {
+    char command[256];
+    sprintf(command, "rm -r %s/raw%d", ddlFilesFolder, gdcCounter);
+    gSystem->Exec(command);
+    sprintf(command, "%s/raw%d", ddlFilesFolder, gdcCounter);
+    if (gSystem->MakeDirectory(command) < 0) {
+      cerr << "Can not create directory " << command << endl;
+      return(1);
+    }
+    gdcSize=Root2Date(rootEvent, dateEvent, command);
+  }
+  else
+    gdcSize=Root2Date(rootEvent, dateEvent, NULL);
+
   delete rootEvent;
   cerr << "\r     \r" << setprecision(3) << 100*(float)(gdcCounter+1)/t->GetEntries() << "% ";
   fwrite(dateEvent, gdcSize, 1, dateFile);
@@ -55,12 +75,15 @@ int deroot(const char *rootFileName, const char *dateFileName) {
 
 int main(int argc, char **argv) {
 
-  if (argc != 3) {
-    cerr << "Usage: deroot <input_root_file> <output_date_file>" << endl;
+  if (argc != 3 && argc != 4) {
+    cerr << "Usage: deroot <input_root_file> <output_date_file> [<optional_folder_for_ddl_files>]" << endl;
     return 1;
   }
 
- deroot(argv[1], argv[2]);
+  if (argc ==3)
+    deroot(argv[1], argv[2], NULL);
+  else
+    deroot(argv[1], argv[2], argv[3]);
 
  return(0);
 

diff --git a/MONITOR/root2date.cxx b/MONITOR/root2date.cxx
index 093c0beb7e39cca74b04db892592874fe56fb2e0..e5eff0275d54b02973e840176279ecf116573826 100644 (file)
--- a/MONITOR/root2date.cxx
+++ b/MONITOR/root2date.cxx
@@ -7,7 +7,7 @@
 
 #include "root2date.h"
 
-int Root2Date(AliRawEvent *gdcRootEvent, unsigned char *gdcDateEvent) {
+int Root2Date(AliRawEvent *gdcRootEvent, unsigned char *gdcDateEvent, char *ddlDir) {
 
  unsigned char *p=gdcDateEvent;
  int ldcCounter, equipmentCounter, chunkSize;
@@ -36,6 +36,18 @@ int Root2Date(AliRawEvent *gdcRootEvent, unsigned char *gdcDateEvent) {
     p+=chunkSize;
    }
    memcpy(p, aliEquipment->GetRawData()->GetBuffer(), chunkSize=aliEquipment->GetRawData()->GetSize()); // Write Equipment payload (including CDH)
+   // Write ddl files if requested by the user
+   if (ddlDir) {
+     Int_t ddlIndex;
+     Int_t detId = AliDAQ::DetectorIDFromDdlID(aliEquipmentHeader->GetId(),ddlIndex);
+     char ddlFileName[256];
+     sprintf(ddlFileName,"%s/%s",ddlDir,AliDAQ::DdlFileName(detId,ddlIndex));
+     FILE *ddlFile;
+     if(ddlFile=fopen(ddlFileName, "wb")) {
+       fwrite(p, chunkSize, 1, ddlFile);
+     }
+     fclose(ddlFile);
+   }
    p+=chunkSize;
   }
  }

diff --git a/MONITOR/root2date.h b/MONITOR/root2date.h
index c71a414ae59840fe5d69ec87709b948bd71d1f27..4227130f4fe6801abc169bd335c5184bd49ff844 100644 (file)
--- a/MONITOR/root2date.h
+++ b/MONITOR/root2date.h
@@ -12,10 +12,11 @@
 #include "AliRawEventHeaderBase.h"
 #include "AliRawEquipment.h"
 #include "AliRawEquipmentHeader.h"
-#include "AliRawReaderRoot.h"
+#include "AliRawData.h"
+#include "AliDAQ.h"
 
 #include <Riostream.h>
 
-int Root2Date(AliRawEvent *gdcRootEvent, unsigned char *gdcDateEvent);
+int Root2Date(AliRawEvent *gdcRootEvent, unsigned char *gdcDateEvent, char *ddlDir);
 
 #endif