fixing bug in the HLT TRD offline running mode due to parameter propagation in DoInit...

diff --git a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
index 39ddbe520a753c53498dc8f597e7ab5f020a10e8..40ec8c25ad50df1abe7a846d75d21329d8283c19 100644 (file)
--- a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
+++ b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
@@ -630,9 +630,19 @@ int AliHLTTRDClusterizerComponent::SetParams()
   fRecoParam->SetStreamLevel(AliTRDrecoParam::kClusterizer, 0);
   fReconstructor->SetRecoParam(fRecoParam);
 
+  if(!fClusterizer){
+    fClusterizer = new AliHLTTRDClusterizer("TRDCclusterizer", "TRDCclusterizer");  
+    HLTDebug("TRDClusterizer at 0x%x", fClusterizer);
+  }
+
   TString recoOptions="!cw";
-  if(fHLTflag)
+  if(fHLTflag){
     recoOptions += ",hlt";
+    
+    // we transfer clusters that do no contain the XYZ coodrinates (AliHLTTRDCluster),
+    // thus this coordinate transformation ist useless
+    fClusterizer->SetSkipTransform();
+  }
   if(fProcessTracklets) recoOptions += ",tp";
   else  recoOptions += ",!tp";
 
@@ -672,11 +682,6 @@ int AliHLTTRDClusterizerComponent::SetParams()
     }
 #endif
 
-  if(!fClusterizer){
-    fClusterizer = new AliHLTTRDClusterizer("TRDCclusterizer", "TRDCclusterizer");  
-    HLTDebug("TRDClusterizer at 0x%x", fClusterizer);
-  }
-
   fClusterizer->SetRawVersion(fRawDataVersion);
 
   return iResult;

diff --git a/HLT/TRD/AliHLTTRDClusterizerComponent.h b/HLT/TRD/AliHLTTRDClusterizerComponent.h
index 210eec9063e07d43396ef8b1d94983eb95808ef3..0abba09d6ce7a822fba1fc8053e8d97e2d6c6965 100644 (file)
--- a/HLT/TRD/AliHLTTRDClusterizerComponent.h
+++ b/HLT/TRD/AliHLTTRDClusterizerComponent.h
@@ -64,7 +64,7 @@ protected:
   using AliHLTProcessor::DoEvent;
 
   int Configure(const char* arguments);
-  int SetParams();
+  virtual int SetParams();
        
 protected:
   /** copy constructor prohibited */

diff --git a/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.cxx b/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.cxx
index 7fefd6e93be0647fc4d9672e7439d2de2478062a..f114c98c00ac8586ed18241783cdf7f5a178bfaa 100644 (file)
--- a/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.cxx
+++ b/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.cxx
@@ -41,7 +41,6 @@ ClassImp(AliHLTTRDOfflineClusterizerComponent)
    
 AliHLTTRDOfflineClusterizerComponent::AliHLTTRDOfflineClusterizerComponent()
   :AliHLTTRDClusterizerComponent()
-  ,fOffClusterizer(NULL)
 {
   // Default constructor
 }
@@ -95,14 +94,15 @@ void AliHLTTRDOfflineClusterizerComponent::GetOutputDataSize( unsigned long& con
   inputMultiplier *= 10;
 }
 
-int AliHLTTRDOfflineClusterizerComponent::DoInit( int argc, const char** argv )
+int AliHLTTRDOfflineClusterizerComponent::SetParams()
 {
-  int iResult = 0;
-  iResult=AliHLTTRDClusterizerComponent::DoInit(argc, argv);
+  int iResult =  AliHLTTRDClusterizerComponent::SetParams();
 
-  return iResult;
+  // here we need the coordinate transformation as we want to ship full flavoured clusters
+  fClusterizer->SetSkipTransform(kFALSE);
 }
 
+
 int AliHLTTRDOfflineClusterizerComponent::DoEvent(const AliHLTComponent_EventData& evtData, const AliHLTComponent_BlockData* blocks, 
                                                  AliHLTComponent_TriggerData& trigData, AliHLTUInt8_t* outputPtr, 
                                                  AliHLTUInt32_t& size, vector<AliHLTComponent_BlockData>& outputBlocks )

diff --git a/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.h b/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.h
index 22e037ca82633103f0aec8a9f785e5010f167a6d..ac684109fb9a44ea9e0905f76fc19a2c816a4535 100644 (file)
--- a/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.h
+++ b/HLT/TRD/AliHLTTRDOfflineClusterizerComponent.h
@@ -29,13 +29,11 @@ public:
   virtual void GetOutputDataSize( unsigned long& constBase, double& inputMultiplier );
   AliHLTComponent* Spawn();
 
-  int DoInit( int argc, const char** argv );
   int DoEvent( const AliHLTComponent_EventData& evtData, const AliHLTComponent_BlockData* blocks, 
               AliHLTComponent_TriggerData& trigData, AliHLTUInt8_t* outputPtr, 
               AliHLTUInt32_t& size, vector<AliHLTComponent_BlockData>& outputBlocks );
 
-protected:  
-  AliTRDclusterizer* fOffClusterizer;
+  int SetParams();
 
 private:
   /// copy constructor prohibited

diff --git a/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx b/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx
index 50398d9932f76f2b2251a82ca185b13e8d45073d..7a2663aa18b9d0ae2e364586078688fc6459d5c6 100644 (file)
--- a/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx
+++ b/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx
@@ -86,20 +86,19 @@ AliHLTComponent* AliHLTTRDOfflineTrackerV1Component::Spawn()
   return new AliHLTTRDOfflineTrackerV1Component;
 };
 
-int AliHLTTRDOfflineTrackerV1Component::DoInit( int argc, const char** argv )
-{
-  int iResult = 0;
-  iResult=AliHLTTRDTrackerV1Component::DoInit(argc, argv);
-  fRecoParam->SetStreamLevel(AliTRDrecoParam::kTracker, 1); // in order to have the friends written
-  return iResult;
-}
-
 const char* AliHLTTRDOfflineTrackerV1Component::GetComponentID()
 {
   // Return the component ID const char *
   return "TRDOfflineTrackerV1"; // The ID of this component
 }
 
+int AliHLTTRDOfflineTrackerV1Component::SetParams()
+{
+  int iResult = AliHLTTRDTrackerV1Component::SetParams();
+  fRecoParam->SetStreamLevel(AliTRDrecoParam::kTracker, 1); // in order to have the friends written
+  return iResult;
+}
+
 int AliHLTTRDOfflineTrackerV1Component::DoEvent(const AliHLTComponent_EventData& evtData, const AliHLTComponent_BlockData* blocks, 
                                                  AliHLTComponent_TriggerData& trigData, AliHLTUInt8_t* outputPtr, 
                                                  AliHLTUInt32_t& size, vector<AliHLTComponent_BlockData>& outputBlocks )

diff --git a/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.h b/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.h
index bbd145737625c25bea869fd6ed1fcc0d5b285611..8b0c833a3f6c1c10e26a5800a835d7fc004bb768 100644 (file)
--- a/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.h
+++ b/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.h
@@ -27,11 +27,12 @@ public:
   virtual void GetOutputDataSize( unsigned long& constBase, double& inputMultiplier );
   AliHLTComponent* Spawn();
 
-  int DoInit( int argc, const char** argv );
   int DoEvent( const AliHLTComponent_EventData& evtData, const AliHLTComponent_BlockData* blocks, 
               AliHLTComponent_TriggerData& trigData, AliHLTUInt8_t* outputPtr, 
               AliHLTUInt32_t& size, vector<AliHLTComponent_BlockData>& outputBlocks );
 
+  int SetParams();
+
 protected:
 
   ClassDef(AliHLTTRDOfflineTrackerV1Component, 1)

diff --git a/HLT/TRD/AliHLTTRDTrackerV1Component.h b/HLT/TRD/AliHLTTRDTrackerV1Component.h
index 4ef7dcb9cea26799b68eed4bec9813d7f680e1dd..0dfff353c4d8c8893a1712a568e84f755beba87d 100644 (file)
--- a/HLT/TRD/AliHLTTRDTrackerV1Component.h
+++ b/HLT/TRD/AliHLTTRDTrackerV1Component.h
@@ -79,7 +79,7 @@ protected:
   using AliHLTProcessor::DoEvent;
   
   int Configure(const char* arguments);
-  int SetParams();
+  virtual int SetParams();
 
 protected:
   /** copy constructor prohibited */