Changed name of merger

diff --git a/HLT/hough/AliL3HoughLinkDef.h b/HLT/hough/AliL3HoughLinkDef.h
index 7ed413460d3c86f952559d325db8faac301ef8e9..3b99495828cd19b88c755be0bccc7a0119f08663 100644 (file)
--- a/HLT/hough/AliL3HoughLinkDef.h
+++ b/HLT/hough/AliL3HoughLinkDef.h
@@ -8,9 +8,11 @@
 #pragma link C++ class AliL3HoughTransformer; 
 #pragma link C++ class AliL3HoughMaxFinder;
 #pragma link C++ class AliL3HoughEval;
-#pragma link C++ class AliL3HoughMerge;
+#pragma link C++ class AliL3HoughMerger;
 #pragma link C++ class AliL3Histogram;
-#pragma link C++ function GetGoodParticles(Int_t,char *,char *);
+#pragma link C++ class AliL3Histogram1D;
+#pragma link C++ class AliL3ClusterFinder;
+#pragma link C++ function GetGoodParticles(Int_t,Int_t,char *,char *);
 
 #endif
 

diff --git a/HLT/hough/AliL3HoughMerge.cxx b/HLT/hough/AliL3HoughMerge.cxx
deleted file mode 100644 (file)
index 81604da..0000000
--- a/HLT/hough/AliL3HoughMerge.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <TH2.h>
-
-#include "AliL3TrackArray.h"
-#include "AliL3HoughTrack.h"
-#include "AliL3HoughMerge.h"
-#include "AliL3HoughTransformer.h"
-
-ClassImp(AliL3HoughMerge)
-
-  
-AliL3HoughMerge::AliL3HoughMerge()
-{
-  //Default constructor
-
-  fInTracks = NULL;
-  fOutTracks = NULL;
-  fNPatches = 5;
-}
-
-
-AliL3HoughMerge::AliL3HoughMerge(Int_t slice,Int_t row_patches)
-{
-  //Constructor
-
-  //fInTracks = (AliL3TrackArray**)new Byte_t[row_patches*sizeof(AliL3TrackArray*)];
-  fInTracks = new AliL3TrackArray*[row_patches];
-  fNPatches = row_patches;
-  for(Int_t i=0; i<row_patches; i++)
-    fInTracks[i] = new AliL3TrackArray("AliL3HoughTrack");
-
-  fOutTracks = new AliL3TrackArray("AliL3HoughTrack");
-}
-
-
-AliL3HoughMerge::~AliL3HoughMerge()
-{
-  //Destructor
-  if(fInTracks)
-    delete fInTracks;
-  if(fOutTracks)
-    delete fOutTracks;
-  
-}
-
-void AliL3HoughMerge::FillTracks(AliL3TrackArray *tracks,Int_t patch)
-{
-  fInTracks[patch]->AddTracks(tracks); //copies tracks to new trackarray. Does not delete the track objects.
-}
-
-void AliL3HoughMerge::FillHisto(TH2F *merge_hist)
-{
-  
-  for(Int_t pat=0; pat < fNPatches; pat++)
-    {
-      for(Int_t t=0; t<fInTracks[pat]->GetNTracks(); t++)
-       {
-         AliL3HoughTrack *tr = (AliL3HoughTrack*)fInTracks[pat]->GetCheckedTrack(t);
-         if(!tr) {printf("AliL3HoughMerge NO TRACK\n"); continue;}
-         merge_hist->Fill(tr->GetKappa(),tr->GetPhi0(),tr->GetNHits());
-       }
-    }
-}
-

diff --git a/HLT/hough/AliL3HoughMerge.h b/HLT/hough/AliL3HoughMerge.h
deleted file mode 100644 (file)
index cf3653b..0000000
--- a/HLT/hough/AliL3HoughMerge.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef ALIL3_HOUGH_Merge
-#define ALIL3_HOUGH_Merge
-
-#include "AliL3RootTypes.h"
-
-class TClonesArray;
-class TObjArray;
-class TH2F;
-class AliL3TrackArray;
-
-class AliL3HoughMerge : public TObject {
-  
- private:
-
-  AliL3TrackArray **fInTracks; //!
-  AliL3TrackArray *fOutTracks; //!
-  
-  Int_t fNPatches;
- public:
-  AliL3HoughMerge(); 
-  AliL3HoughMerge(Int_t slice,Int_t row_patches=5);
-  virtual ~AliL3HoughMerge();
-
-  void FillTracks(AliL3TrackArray *tracks,Int_t patch);
-  void FillHisto(TH2F *merge_hist);
-  
-  ClassDef(AliL3HoughMerge,1)
-
-};
-
-#endif

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 51471850c2460c79f34be54b42b07f065537dcf5..b055c7c7f991213c81cec8dcedfc6a70717f605f 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -11,8 +11,8 @@ PACKAGE = AliL3Hough
 
 
 SRCS          = AliL3HoughTransformer.cxx AliL3Hough.cxx \
-                AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerge.cxx \
-                AliL3Histogram.cxx GetGoodParticles.cxx
+                AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerger.cxx \
+                AliL3Histogram.cxx AliL3Histogram1D.cxx GetGoodParticles.cxx AliL3ClusterFinder.cxx
 
 
 # C++ Headers