Obsolete tracker output removed

[u/mrichter/AliRoot.git] / HLT / TPCLib / tracking-ca / AliHLTTPCCASliceOutput.cxx

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCASliceOutput.cxx b/HLT/TPCLib/tracking-ca/AliHLTTPCCASliceOutput.cxx
index 59aee0c3be4bc0b6cd18bdd22493580ad45a56b0..c725d3e40cede31972befd81a9b4cd02181ce37a 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCASliceOutput.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCASliceOutput.cxx
@@ -47,36 +47,27 @@ void AliHLTTPCCASliceOutput::SetPointers(int nTracks, int nTrackClusters, const
 
   int size = 0;
 
-  if (outputControl == NULL || outputControl->fDefaultOutput)
   {
     AssignNoAlignment( fTracksOffset,            size, nTracks*sizeof(AliHLTTPCCASliceTrack) );
     AssignNoAlignment( fClusterIdOffset,         size, nTrackClusters*sizeof(int) );
     AssignNoAlignment( fClusterRowOffset,        size, nTrackClusters*sizeof(float) );
-    AssignNoAlignment( fClusterUnpackedYZOffset, size, nTrackClusters*sizeof(float2) );
-    AssignNoAlignment( fClusterUnpackedXOffset,  size, nTrackClusters*sizeof(UChar_t) );
-   }
-
+    AssignNoAlignment( fClusterPackedXYZOffset, size, nTrackClusters*sizeof(AliHLTTPCCACompressedCluster) );
+  }
+  
   char *mem = fMemory + size;
 
-  if (outputControl == NULL || outputControl->fObsoleteOutput)
-  {
-         // memory for output tracks
-         AssignMemory( fOutTracks, mem, nTracks );
-         // arrays for track hits
-         AssignMemory( fOutTrackHits, mem, nTrackClusters );
-  }
   if ((size_t) (mem - fMemory) + sizeof(AliHLTTPCCASliceOutput) > fMemorySize)
   {
-         fMemorySize = NULL;
-         //printf("\nINTERNAL ERROR IN AliHLTTPCCASliceOutput MEMORY MANAGEMENT req: %d avail: %d\n", (int) ((size_t) (mem - fMemory) + sizeof(AliHLTTPCCASliceOutput)), (int) fMemorySize);
+    fMemorySize = NULL;
+    //printf("\nINTERNAL ERROR IN AliHLTTPCCASliceOutput MEMORY MANAGEMENT req: %d avail: %d\n", (int) ((size_t) (mem - fMemory) + sizeof(AliHLTTPCCASliceOutput)), (int) fMemorySize);
   }
 }
 
 void AliHLTTPCCASliceOutput::Allocate(AliHLTTPCCASliceOutput* &ptrOutput, int nTracks, int nTrackHits, outputControlStruct* outputControl)
 {
        //Allocate All memory needed for slice output
-  const int memsize = (outputControl->fDefaultOutput ? EstimateSize(nTracks, nTrackHits) : sizeof(AliHLTTPCCASliceOutput)) +
-         (outputControl->fObsoleteOutput? (nTracks * sizeof(AliHLTTPCCAOutTrack) + nTrackHits * sizeof(int)) : 0);
+  const int memsize =  EstimateSize(nTracks, nTrackHits);
+
   if (outputControl->fOutputPtr)
   {
          if (outputControl->fOutputMaxSize < memsize)