- process TRD on-line tracklets and tracks in the same way as digits,

  i.e. write during digits conversion and read back (if digits conversion
  active)

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index dc45ca9366f7ea1cb0c2c98122b2fa2c31dd4901..9dd4b6f92a33c59025e20903f3801a6487ab87ff 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -185,8 +185,6 @@ void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
   ResetContainers();
 
   AliTRDrawData rawData;
-  rawData.SetTracklets(GetTracklets("AliTRDtrackletMCM")); // link allocated online tracklets
-  rawData.SetTracks(GetTracks());                          // link allocated online tracks
 
   AliTRDdigitsManager *manager = rawData.Raw2Digits(rawReader);
   manager->MakeBranch(digitsTree);
@@ -237,16 +235,15 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
     return;
   }
 
-  if(fgClusters){
-    AliDebug(1, Form("Removing %5d clusters @ %p", fgClusters->GetEntriesFast(), (void*)fgClusters));
-    fgClusters->Clear();
-  }
+  ResetContainers();
   AliTRDclusterizer clusterizer(fgTaskNames[AliTRDrecoParam::kClusterizer], fgTaskNames[AliTRDrecoParam::kClusterizer]);
   clusterizer.SetReconstructor(this);
   clusterizer.SetUseLabels(kTRUE);
   clusterizer.SetStoreRawSignals(kTRUE);
   clusterizer.OpenOutput(clusterTree);
   clusterizer.ReadDigits(digitsTree);
+  clusterizer.ReadTracklets();
+  clusterizer.ReadTracks();
   clusterizer.MakeClusters();
   fgNTimeBins = clusterizer.GetNTimeBins();
 }
@@ -389,7 +386,7 @@ TClonesArray* AliTRDReconstructor::GetTracklets(const char *trkltype)
 {
 // Build/ Retrieve online tracklets array
 
-  if (trkltype != 0) {
+  if (trkltype && strlen(trkltype) > 0) {
     if(fgTracklets && (TClass::GetClass(trkltype) != fgTracklets->GetClass())){
       fgTracklets->Delete();
       delete fgTracklets;

diff --git a/TRD/AliTRDReconstructor.h b/TRD/AliTRDReconstructor.h
index a71d9b897f81de6141994ba9981e546d8ce47794..450440585819793756ea195ded8c2324ef9d11ce 100644 (file)
--- a/TRD/AliTRDReconstructor.h
+++ b/TRD/AliTRDReconstructor.h
@@ -50,7 +50,7 @@ public:
   virtual void        FillESD(AliRawReader *, TTree *clusterTree, AliESDEvent *esd) const { FillESD((TTree * )NULL, clusterTree, esd);                    }
   virtual void        FillESD(TTree *digitsTree, TTree *clusterTree, AliESDEvent *esd) const;
   static TClonesArray* GetClusters();
-  static TClonesArray* GetTracklets(const char *trkltype = "AliTRDtrackletMCM");
+  static TClonesArray* GetTracklets(const char *trkltype = "");
   static TClonesArray* GetTracks();
   static Int_t        GetNTimeBins()             { return fgNTimeBins;}
   Int_t               GetNdEdxSlices() const     { return (Int_t)AliTRDpidUtil::GetNdEdxSlices(GetPIDMethod());}