Dimitri : bug in PPSD geometry fixed

[u/mrichter/AliRoot.git] / PHOS / AliPHOSTrackSegmentMakerv1.h

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h
index 7e4244cd1906e8b2a58db7dc51a56f622db14b1e..ce203ded756901623a7fc541ac376ad64a407e28 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.h
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.h
@@ -30,25 +30,31 @@ class  AliPHOSTrackSegmentMakerv1 : public AliPHOSTrackSegmentMaker {
 public:
 
   AliPHOSTrackSegmentMakerv1() ;                     
+  AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) {
+    // cpy ctor: no implementation yet
+    // requested by the Coding Convention
+    assert(0==1) ; 
+  }
+   
   virtual ~ AliPHOSTrackSegmentMakerv1() ; // dtor
   
   Bool_t  FindFit(AliPHOSEmcRecPoint * emcRP, int * MaxAt, Float_t * maxAtEnergy, 
                  Int_t NPar, Float_t * FitParametres) ; //Used in UnfoldClusters, calls TMinuit
-  void    FillOneModule(DigitsList * Dl, AliPHOSRecPoint::RecPointsList * emcIn, 
-                       TObjArray * emcOut, 
+  void    FillOneModule(AliPHOSRecPoint::RecPointsList * emcIn, 
+                       TArrayI * emcOut, 
                        AliPHOSRecPoint::RecPointsList * ppsdIn, 
-                       TObjArray * ppsdOutUp, 
-                       TObjArray * ppsdOutLow, 
+                       TArrayI * ppsdOutUp, 
+                       TArrayI * ppsdOutLow, 
                        Int_t &PHOSModule, 
                        Int_t & emcStopedAt, 
-                       Int_t & ppsdStopedAt) ; // Unfolds clusters and fills temporary arrais   
+                       Int_t & ppsdStopedAt) ; // Fills temporary arrais with clusters from one module  
   Float_t GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * EmcClu , AliPHOSPpsdRecPoint * Ppsd , Bool_t & TooFar ) ; // see R0
 
-  void    MakeLinks(TObjArray * EmcRecPoints, TObjArray * PpsdRecPointsUp, TObjArray * PpsdRecPointsLow, 
+  void    MakeLinks(TArrayI * EmcRecPoints, TArrayI * PpsdRecPointsUp, TArrayI * PpsdRecPointsLow, 
                    TClonesArray * LinkLowArray, TClonesArray *LinkUpArray) ; //Evaluates distances(links) between EMC and PPSD
-  void    MakePairs(TObjArray * EmcRecPoints, 
-                   TObjArray * PpsdRecPointsUp, 
-                   TObjArray * PpsdRecPointsLow, 
+  void    MakePairs(TArrayI * EmcRecPoints, 
+                   TArrayI * PpsdRecPointsUp, 
+                   TArrayI * PpsdRecPointsLow, 
                    TClonesArray * LinkLowArray, 
                    TClonesArray * LinkUpArray, 
                    AliPHOSTrackSegment::TrackSegmentsList * trsl) ; //Finds pairs(triplets) with smallest link
@@ -56,22 +62,32 @@ public:
                            AliPHOSRecPoint::RecPointsList * emcl, 
                            AliPHOSRecPoint::RecPointsList * ppsdl, 
                            AliPHOSTrackSegment::TrackSegmentsList * trsl ) ; // does the job
+  virtual void MakeTrackSegmentsCPV(DigitsList * DL, 
+                                AliPHOSRecPoint::RecPointsList * emcl, 
+                                AliPHOSRecPoint::RecPointsList * ppsdl ); // just unfold EMC and CPV clusters
   virtual void SetMaxEmcPpsdDistance(Float_t r){ fR0 = r ;}
   virtual void    SetUnfoldFlag() { fUnfoldFlag = kTRUE ; } ; 
   static Double_t ShowerShape(Double_t r) ; // Shape of shower used in unfolding; class member function (not object member function)
+  void    UnfoldAll(DigitsList * Dl, AliPHOSRecPoint::RecPointsList * emcIn) ; 
+                                             // Unfolds and sorts all EMC clusters
   void  UnfoldClusters(DigitsList * DL, 
                       AliPHOSRecPoint::RecPointsList * emcIn, 
                       AliPHOSEmcRecPoint * iniEmc, 
                       Int_t Nmax, 
                       int * maxAt, 
-                      Float_t * maxAtEnergy, 
-                      TObjArray * emclist) ; //Unfolds overlaping clusters using TMinuit package
+                      Float_t * maxAtEnergy ) ; //Unfolds overlaping clusters using TMinuit package
   virtual void UnsetUnfoldFlag() { fUnfoldFlag = kFALSE ; } 
 
+  AliPHOSTrackSegmentMakerv1 & operator = (const AliPHOSTrackSegmentMakerv1 & rvalue)  {
+    // assignement operator requested by coding convention
+    // but not needed
+    assert(0==1) ;
+    return *this ; 
+  }
+
 private:
 
   Float_t fDelta ;     // parameter used for sorting
-  TMinuit * fMinuit ;  // Minuit object needed by cluster unfolding
   Float_t fR0 ;        // Maximum distance between a EMC RecPoint and a PPSD RecPoint   
   Bool_t fUnfoldFlag ; // Directive to unfold or not the clusters in case of multiple maxima