Adding AliTPCcalibV0 to the Makefile (Marian)

[u/mrichter/AliRoot.git] / PMD / AliPMDReconstructor.cxx

diff --git a/PMD/AliPMDReconstructor.cxx b/PMD/AliPMDReconstructor.cxx
index 1b5d51235961c532a86d2dc12904ef6812e94764..145942848c6f534990c20fc76d0c09e7c4a22326 100644 (file)
--- a/PMD/AliPMDReconstructor.cxx
+++ b/PMD/AliPMDReconstructor.cxx
@@ -21,67 +21,54 @@
 
 #include "Riostream.h"
 #include "AliPMDReconstructor.h"
-#include "AliRunLoader.h"
 #include "AliRun.h"
 #include "AliPMDClusterFinder.h"
 #include "AliPMDtracker.h"
 #include "AliRawReader.h"
 #include "AliESDPmdTrack.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
+#include "AliLog.h"
 
 ClassImp(AliPMDReconstructor)
 
+// ------------------------------------------------------------------------ //
 
-//_____________________________________________________________________________
-void AliPMDReconstructor::Reconstruct(AliRunLoader* runLoader) const
+void AliPMDReconstructor::Reconstruct(AliRawReader *rawReader,
+                                     TTree *clustersTree) const
 {
-// reconstruct clusters from digits file
+// reconstruct clusters from Raw Data
 
-  AliPMDClusterFinder *pmdClus = new AliPMDClusterFinder(runLoader);
-  pmdClus->Load();
-  pmdClus->SetDebug(1);
-  for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++)
-    {
-      pmdClus->Digits2RecPoints(iEvent);
-    }
-  pmdClus->UnLoad();
-  delete pmdClus;
+  AliPMDClusterFinder pmdClus;
+  pmdClus.Digits2RecPoints(rawReader, clustersTree);
 
 }
-//_____________________________________________________________________________
-void AliPMDReconstructor::Reconstruct(AliRunLoader* runLoader,
-                                     AliRawReader *rawReader) const
+
+// ------------------------------------------------------------------------ //
+void AliPMDReconstructor::Reconstruct(TTree *digitsTree,
+                                     TTree *clustersTree) const
 {
 // reconstruct clusters from Raw Data
 
-  AliPMDClusterFinder pmdClus(runLoader);
-  pmdClus.LoadClusters();
+  AliPMDClusterFinder pmdClus;
+  pmdClus.Digits2RecPoints(digitsTree, clustersTree);
 
-  Int_t iEvent = 0;
-  while (rawReader->NextEvent()) {
-    pmdClus.SetDebug(1);
-    pmdClus.Digits2RecPoints(iEvent,rawReader);
-    
-    iEvent++;
-  }
-  pmdClus.UnLoadClusters();
-  
 }
 
 // ------------------------------------------------------------------------ //
-
-void AliPMDReconstructor::FillESD(AliRunLoader* runLoader,AliESD* esd) const
+void AliPMDReconstructor::FillESD(AliRawReader* /*rawReader*/,
+                                 TTree* clustersTree, AliESDEvent* esd) const
 {
-  AliLoader* loader = runLoader->GetLoader("PMDLoader");
-  if (!loader) {
-    Error("Reconstruct", "PMD loader not found");
-    return;
-  }
-  loader->LoadRecPoints("READ");
-
-  TTree *treeR = loader->TreeR();
   AliPMDtracker pmdtracker;
-  pmdtracker.LoadClusters(treeR);
+  pmdtracker.LoadClusters(clustersTree);
   pmdtracker.Clusters2Tracks(esd);
-  loader->UnloadRecPoints();
 }
+// ------------------------------------------------------------------------ //
+void AliPMDReconstructor::FillESD(TTree * /*digitsTree*/,
+                                 TTree* clustersTree, AliESDEvent* esd) const
+{
+  AliPMDtracker pmdtracker;
+  pmdtracker.LoadClusters(clustersTree);
+  pmdtracker.Clusters2Tracks(esd);
+}
+
+