improvements in RawReaderPublisher (merged from v4-07-Release)

diff --git a/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx b/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx
index 28e1ba68ca8a62c8dc7e588fe8ca7eea49c08df1..8b1da04b8218596b714dc0298662cabf28f2d929 100644 (file)
--- a/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx
+++ b/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx
@@ -47,7 +47,7 @@ AliHLTLoaderPublisherComponent::AliHLTLoaderPublisherComponent()
   fTreeType("digits"),
   fVerbose(kFALSE),
   fDataType(kAliHLTAnyDataType),
-  fSpecification(0),
+  fSpecification(kAliHLTVoidDataSpec),
   fpLoader(NULL)
 {
   // see header file for class documentation

diff --git a/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx b/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx
index 02d2d526bd82194006494e551c8759f81fb8742f..01e26e67c1af8cc2fa1e8e36d3fd1c8491f5115f 100644 (file)
--- a/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx
+++ b/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx
@@ -42,13 +42,13 @@ ClassImp(AliHLTRawReaderPublisherComponent)
 
 AliHLTRawReaderPublisherComponent::AliHLTRawReaderPublisherComponent()
   :
-  fMaxSize(50000),
+  fMaxSize(5000000),
   fDetector(),
   fMinEquId(-1),
   fMaxEquId(-1),
   fVerbose(kFALSE),
-  fDataType(kAliHLTAnyDataType),
-  fSpecification(0)
+  fDataType(kAliHLTVoidDataType),
+  fSpecification(kAliHLTVoidDataSpec)
 {
   // see header file for class documentation
   // or
@@ -184,7 +184,6 @@ int AliHLTRawReaderPublisherComponent::DoInit( int argc, const char** argv )
 
   AliRawReader* pRawReader=GetRawReader();
   if ((pRawReader=GetRawReader())!=NULL) {
-    pRawReader->SelectEquipment(-1, fMinEquId, fMaxEquId);
   } else {
     AliErrorStream() << "RawReader instance needed" << endl;
     return -EINVAL;
@@ -213,27 +212,35 @@ int AliHLTRawReaderPublisherComponent::GetEvent(const AliHLTComponentEventData&
   assert(outputPtr!=NULL || size==0);
   AliRawReader* pRawReader=GetRawReader();
   if (pRawReader) {
-    AliInfo(Form("get event from RawReader %p", pRawReader));
+    pRawReader->Reset();
+    pRawReader->SelectEquipment(-1, fMinEquId, fMaxEquId);
+    AliInfo(Form("get event from RawReader %p equipment id range [%d,%d]", pRawReader, fMinEquId, fMaxEquId));
     while (pRawReader->ReadHeader() && (iResult>=0 || iResult==-ENOSPC)) {
-      int readSize=pRawReader->GetDataSize();
+      const AliRawDataHeader* pHeader=pRawReader->GetDataHeader();
+      assert(pHeader!=NULL);
+      if (pHeader==NULL) continue;
+      int readSize=pRawReader->GetDataSize()+sizeof(AliRawDataHeader);
       int id=pRawReader->GetEquipmentId();
       AliInfo(Form("got header for id %d, size %d", id, readSize));
-      if (fMinEquId<id || fMaxEquId>id) {
+      if (fMinEquId>id || fMaxEquId<id) {
        AliError(Form("id %d returned from RawReader is outside range [%d,%d]", id, fMinEquId, fMaxEquId));
        continue;
       }
-      if (readSize>0) {
-       if (readSize<=size-offset) {
-         if (!pRawReader->ReadNext(pTgt, readSize)) {
-           AliError(Form("error reading %d bytes from RawReader %p", readSize, pRawReader));
+      if (readSize<=size-offset) {
+       memcpy(pTgt, pHeader, sizeof(AliRawDataHeader));
+       pTgt+=sizeof(AliRawDataHeader);
+       if (readSize>0) {
+         if (!pRawReader->ReadNext(pTgt, readSize-sizeof(AliRawDataHeader))) {
+           AliError(Form("error reading %d bytes from RawReader %p", readSize-sizeof(AliRawDataHeader), pRawReader));
            iResult=-ENODATA;
            break;
          }
-       } else {
-         // we keep the loop going in order to collect the full size
-         fMaxSize=offset+readSize;
-         iResult=-ENOSPC;
+         pTgt+=readSize-sizeof(AliRawDataHeader);
        }
+      } else {
+       // we keep the loop going in order to collect the full size
+       fMaxSize=offset+readSize;
+       iResult=-ENOSPC;
       }
       if (iResult>=0) {
        AliHLTComponentBlockData bd;
@@ -241,16 +248,15 @@ int AliHLTRawReaderPublisherComponent::GetEvent(const AliHLTComponentEventData&
        bd.fOffset = offset;
        bd.fSize = readSize;
        bd.fDataType = fDataType;
-       bd.fSpecification = 0;
-       GetSpecificationFromEquipmentId(id, bd.fSpecification);
+       if (fSpecification == kAliHLTVoidDataSpec) {
+         GetSpecificationFromEquipmentId(id, bd.fSpecification);
+       } else {
+         bd.fSpecification=fSpecification;
+       }
        outputBlocks.push_back( bd );
       }
       offset+=readSize;
     }
-    // go to next event, or beginning if last event was processed
-//     if (pRawReader->NextEvent()) {
-//       pRawReader->RewindEvents();
-//     }
     if (offset<=size) size=offset;
   } else {
     AliErrorStream() << "RawReader uninitialized" << endl;
@@ -259,6 +265,6 @@ int AliHLTRawReaderPublisherComponent::GetEvent(const AliHLTComponentEventData&
   return iResult;
 }
 
-int AliHLTRawReaderPublisherComponent::GetSpecificationFromEquipmentId(int id, AliHLTUInt32_t& /*specification*/) const {
-  return -ENOSYS;
+int AliHLTRawReaderPublisherComponent::GetSpecificationFromEquipmentId(int id, AliHLTUInt32_t& specification) const {
+  return specification=id;
 }

diff --git a/HLT/BASE/util/AliHLTRawReaderPublisherComponent.h b/HLT/BASE/util/AliHLTRawReaderPublisherComponent.h
index 532db654a3148b33ac3e9e85bdc39210fa6c1dc2..0789a391ff438e3da1398f802608aab8dd83abd5 100644 (file)
--- a/HLT/BASE/util/AliHLTRawReaderPublisherComponent.h
+++ b/HLT/BASE/util/AliHLTRawReaderPublisherComponent.h
@@ -26,9 +26,9 @@
  * A general data publisher component for the AliRawReader.
  * The component publishs the data of a given detector and equipment ID.
  * 
- * Publication of several IDs, i.e. DDLs, requires derivation of
- * the data type and/or specification from the ID. This requires a child
- * class and implementation of @ref GetSpecificationFromEquipmentId.
+ * If no data specification is given, the equipment id is used as default.
+ * A child class can implement @ref GetSpecificationFromEquipmentId to
+ * provide a different rule.
  * 
  * Component ID: \b AliRawReaderPublisher <br>
  * Library: \b libAliHLTUtil.