Partial redesign of identification bits and coding rule corrections

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

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h
index ecfc23fff3d819960051cccceddde8e666de972f..4db5038b0e07a7a205191e90d3d0ebdc03feff53 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.h
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.h
@@ -28,17 +28,17 @@ class  AliPHOSTrackSegmentMakerv1 : public AliPHOSTrackSegmentMaker {
 public:
 
   AliPHOSTrackSegmentMakerv1() ;                     
-  AliPHOSTrackSegmentMakerv1(const char* headerFile, const char* name = "Default", const char * from = 0) ;                     
+  AliPHOSTrackSegmentMakerv1(const char* headerFile, const char* name = "Default", const Bool_t toSplit = kFALSE) ;                     
   AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) {
     // cpy ctor: no implementation yet
     // requested by the Coding Convention
-    abort() ; 
-  }
+    Fatal("cpy ctor", "not implemented") ;
+}
    
   virtual ~ AliPHOSTrackSegmentMakerv1() ; // dtor
   
-  virtual char*  GetRecPointsBranch    (void)const{return (char*)fRecPointsBranchTitle.Data() ;}
-  virtual char*  GetTrackSegmentsBranch(void)const{return (char*)fTrackSegmentsBranchTitle.Data() ;}
+  //  virtual char*  GetRecPointsBranch    (void)const{return (char*)fRecPointsBranchTitle.Data() ;}
+  //  virtual char*  GetTrackSegmentsBranch(void)const{return (char*)fTrackSegmentsBranchTitle.Data() ;}
   virtual const Int_t GetTrackSegmentsInRun()const {return fTrackSegmentsInRun ;}  
 
   virtual void   Exec(Option_t * option) ;
@@ -47,14 +47,17 @@ public:
           void   MakeLinks() const;      //Evaluates distances(links) between EMC and PPSD
           void   MakePairs() ;           //Finds pairs(triplets) with smallest link
   virtual void   Print(Option_t * option) const ;
-  virtual void   SetMaxEmcPpsdDistance(Float_t r){ fR0 = r ;}
-  virtual void   SetRecPointsBranch(const char * title) { fRecPointsBranchTitle = title ;} 
-  virtual void   SetTrackSegmentsBranch(const char * title){ fTrackSegmentsBranchTitle = title ; }
+  virtual void   SetMaxEmcCPVDistance(Float_t r){ fRcpv = r ;} //Maximal distance (in PHOS plane) 
+                                                               //between EMCrp and CPVrp
+  virtual void   SetMaxEmcTPCDistance(Float_t r){ fRtpc = r ;} //Maximal distance (in PHOS plane) 
+                                                               //between EMCrp and extrapolation of TPC track
+  //  virtual void   SetRecPointsBranch(const char * title) { fRecPointsBranchTitle = title ;} 
+  //  virtual void   SetTrackSegmentsBranch(const char * title){ fTrackSegmentsBranchTitle = title ; }
   virtual const char * Version() const { return "tsm-v1" ; }  
 
   AliPHOSTrackSegmentMakerv1 & operator = (const AliPHOSTrackSegmentMakerv1 & )  {
     // assignement operator requested by coding convention but not needed
-    abort() ;
+    Fatal("operator =", "not implemented") ;
     return *this ; 
   }
 
@@ -71,14 +74,15 @@ private:
 private:  
 
   Bool_t  fDefaultInit;               //! Says if the task was created by defaut ctor (only parameters are initialized)
-  TString fFrom ;                     // name of Recpoints 
-  TString fHeaderFileName ;           // name of the file which contains gAlice, Tree headers etc.
-  TString fRecPointsBranchTitle ;     // name of the file, where RecPoints branchs are stored
-  TString fTrackSegmentsBranchTitle ; // name of the file, where TrackSegment branchs is stored
+  //  TString fFrom ;                     // name of Recpoints 
+  //  TString fHeaderFileName ;           // name of the file which contains gAlice, Tree headers etc.
+  //  TString fRecPointsBranchTitle ;     // name of the file, where RecPoints branchs are stored
+  //  TString fTrackSegmentsBranchTitle ; // name of the file, where TrackSegment branchs is stored
  
   Int_t fNTrackSegments ; // number of track segments found 
-  Float_t fR0 ;        // Maximum distance between a EMC RecPoint and a PPSD RecPoint   
- 
+  Float_t fRcpv ;        // Maximum distance between a EMC RecPoint and a CPV RecPoint   
+  Float_t fRtpc ;        // Maximum distance between a EMC RecPoint and extrapolation of a TPC track   
+
   TClonesArray * fLinkUpArray  ;  //!
   Int_t fEmcFirst;     //! Index of first EMC RecPoint belonging to currect PHOS module
   Int_t fEmcLast ;     //!