Merge remote-tracking branch 'origin/master' into flatdev

[u/mrichter/AliRoot.git] / HLT / TRD / AliHLTTRDTrackerV1Component.cxx

diff --git a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
index f394947a02ba94eebe8b068ed379afc629abd37a..b1d3c5c6920d231e8839cedd87ab46b523c14bdb 100644 (file)
--- a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
+++ b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
@@ -22,14 +22,11 @@
     @brief  A TRDTrackerV1 processing component for the HLT.
 */
 
-#if __GNUC__ >= 3
-using namespace std;
-#endif
-
 #include "AliHLTTRDTrackerV1Component.h"
 #include "AliHLTTRDDefinitions.h"
 #include "AliHLTTRDTrack.h"
 #include "AliHLTTRDUtils.h"
+#include "AliHLTTRDCluster.h"
 
 #include "TFile.h"
 #include "TChain.h"
@@ -50,6 +47,8 @@ using namespace std;
 #include <cerrno>
 #include <string>
 
+using namespace std;
+
 ClassImp(AliHLTTRDTrackerV1Component)
 
 void AliHLTTRDTrackerV1Component::AliHLTTRDESDEvent::CreateStdContent()
@@ -125,6 +124,7 @@ void AliHLTTRDTrackerV1Component::GetOutputDataSize( unsigned long& constBase, d
   // Get the output data size
   constBase = 0;
   inputMultiplier = fOutputV1Tracks ? 2*((double)fOutputPercentage)/100.0 : 0.5*((double)fOutputPercentage)/100.0;
+  if(sizeof(AliHLTTRDClustersArray::cluster_type) == sizeof(AliHLTTRDCluster)) inputMultiplier *= 28.0/8;
 }
 
 // Spawn function, return new instance of this class
@@ -183,7 +183,7 @@ int AliHLTTRDTrackerV1Component::DoDeinit()
   
   // We need to set clusters in Reconstructor to null to prevent from 
   // double deleting, since we delete TClonesArray by ourself.
-  fReconstructor->SetClusters(0x0);
+  //fReconstructor->SetClusters(0x0);
   delete fReconstructor;
   fReconstructor = NULL;
   delete fESD;
@@ -234,9 +234,9 @@ int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData& evtDat
       double inputMultiplier;
       GetOutputDataSize(constBase,inputMultiplier);
       if(size<(constBase+block.fSize*inputMultiplier)){
-       HLTWarning("Memory Block given might be too small: %i < %i; Event %Lu", size, constBase+block.fSize*inputMultiplier, evtData.fEventID);
+       HLTWarning("Memory Block given might be too small: %i < %f; Event %Lu", size, constBase+block.fSize*inputMultiplier, evtData.fEventID);
       }
-#endif      
+#endif
 
       fESD->Reset();
       //fESD->SetMagneticField(GetBz());
@@ -331,7 +331,7 @@ int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData& evtDat
 
       //here we are deleting clusters (but not the TClonesArray itself)
       fTracker->UnloadClusters();
-      AliTRDReconstructor::SetClusters(0x0);
+      //AliTRDReconstructor::SetClusters(0x0);
       fClusterArray->Delete();
       
     }