fDoMerge = 1;
- if (iResult>=0) iResult = ConfigureFromCDBTObjString(fgkOCDBEntry);
+ //!! if (iResult>=0) iResult = ConfigureFromCDBTObjString(fgkOCDBEntry);
if (iResult>=0 && argc>0) iResult = ConfigureFromArgumentString(argc, argv);
// see header file for class documentation
fDoMerge = 1;
- int iResult = ConfigureFromCDBTObjString(fgkOCDBEntry);
+ int iResult = 0;
+ //!! iResult = ConfigureFromCDBTObjString(fgkOCDBEntry);
if ( iResult>=0 ) iResult = InitClusterMerger();
return iResult;
}
// OCDB entries for component arguments
- targetMap->Add(new TObjString(fgkOCDBEntry), new TObjString("component argument for HW cluster decoder"));
+ //!! targetMap->Add(new TObjString(fgkOCDBEntry), new TObjString("component argument for HW cluster decoder"));
}
fBenchmark.StartNewEvent();
fBenchmark.Start(0);
- UInt_t outputBlocksSize = outputBlocks.size();
+ AliHLTUInt8_t* origOutputPtr = outputPtr;
+ UInt_t origOutputBlocksSize = outputBlocks.size();
for( unsigned long ndx=0; ndx<evtData.fBlockCnt; ndx++ ){
AliHLTComponentBlockData bd;
FillBlockData( bd );
bd.fOffset = size;
- bd.fSize = iter->fSize;
- bd.fPtr = outputPtr;
+ bd.fSize = iter->fSize;
bd.fSpecification = iter->fSpecification;
bd.fDataType = iter->fDataType;
outputBlocks.push_back( bd );
// fill into HLT output data
AliHLTComponentBlockData bdRawClusters;
FillBlockData( bdRawClusters );
- bdRawClusters.fOffset = size;
- bdRawClusters.fPtr = outputPtr;
+ bdRawClusters.fOffset = size;
bdRawClusters.fSize = sizeof(AliHLTTPCRawClusterData)+outputRaw->fCount*sizeof(AliHLTTPCRawCluster);
bdRawClusters.fSpecification = iter->fSpecification;
bdRawClusters.fDataType = AliHLTTPCDefinitions::fgkRawClustersDataType | kAliHLTDataOriginTPC;
if( fDoMerge && fpClusterMerger ){
fpClusterMerger->Clear();
- for( UInt_t i=outputBlocksSize; i<outputBlocks.size(); i++){
+ fpClusterMerger->SetDataPointer(origOutputPtr);
+ for( UInt_t i=origOutputBlocksSize; i<outputBlocks.size(); i++){
fpClusterMerger->SetDataBlock(&(outputBlocks[i]));
}
int nMerged = fpClusterMerger->Merge();
fpClusterMerger->Clear();
HLTInfo("Merged %d clusters",nMerged);
}
-
+
fBenchmark.Stop(0);
HLTInfo(fBenchmark.GetStatistics());