avoid fixed numner of detector names (15) for selection

[u/mrichter/AliRoot.git] / STEER / AliVertexerTracks.h

diff --git a/STEER/AliVertexerTracks.h b/STEER/AliVertexerTracks.h
index 948fc972cf4904a5ca7d98e99fb8230f7692e0ea..a5e5f4f00fc69cd7f3f1e49d7bbcd38aff2f3072 100644 (file)
--- a/STEER/AliVertexerTracks.h
+++ b/STEER/AliVertexerTracks.h
@@ -30,6 +30,7 @@
 
 class AliVEvent;
 class AliESDEvent;
+class AliStrLine;
 
 class AliVertexerTracks : public TObject {
   
@@ -38,17 +39,22 @@ class AliVertexerTracks : public TObject {
   AliVertexerTracks(Double_t fieldkG); 
   virtual ~AliVertexerTracks();
 
-  AliESDVertex* FindPrimaryVertex(const AliVEvent *vEvent);
+  AliESDVertex* FindPrimaryVertex(AliVEvent *vEvent);
   AliESDVertex* FindPrimaryVertex(TObjArray *trkArrayOrig,UShort_t *idOrig);
   AliESDVertex* VertexForSelectedTracks(TObjArray *trkArray,UShort_t *id,
                                        Bool_t optUseFitter=kTRUE,
-                                       Bool_t optPropagate=kTRUE);
+                                       Bool_t optPropagate=kTRUE,
+                                       Bool_t optUseDiamondConstraint=kFALSE);
   AliESDVertex* VertexForSelectedESDTracks(TObjArray *trkArray,
                                        Bool_t optUseFitter=kTRUE,
-                                       Bool_t optPropagate=kTRUE);
+                                       Bool_t optPropagate=kTRUE,
+                                       Bool_t optUseDiamondConstraint=kFALSE);
   AliESDVertex* RemoveTracksFromVertex(AliESDVertex *inVtx,
                                       TObjArray *trkArray,UShort_t *id,
-                                      Float_t *diamondxy); 
+                                      Float_t *diamondxy) const; 
+  AliESDVertex* RemoveConstraintFromVertex(AliESDVertex *inVtx,
+                                          Float_t *diamondxyz,
+                                          Float_t *diamondcov) const;
   void  SetITSMode(Double_t dcacut=0.1,
                   Double_t dcacutIter0=0.1,
                   Double_t maxd0z0=0.5,
@@ -58,7 +64,9 @@ class AliVertexerTracks : public TObject {
                   Double_t mindetfitter=100.,
                   Double_t maxtgl=1000.,
                   Double_t fidR=3.,
-                  Double_t fidZ=30.); 
+                  Double_t fidZ=30.,
+                  Int_t finderAlgo=1,
+                  Int_t finderAlgoIter0=4); 
   void  SetTPCMode(Double_t dcacut=0.1,
                   Double_t dcacutIter0=1.0,
                   Double_t maxd0z0=5.0,
@@ -68,7 +76,9 @@ class AliVertexerTracks : public TObject {
                   Double_t mindetfitter=0.1,
                   Double_t maxtgl=1.5, 
                   Double_t fidR=3.,
-                  Double_t fidZ=30.);
+                  Double_t fidZ=30.,
+                  Int_t finderAlgo=1,
+                  Int_t finderAlgoIter0=4); 
   void  SetCuts(Double_t *cuts);
   void  SetConstraintOff() { fConstraint=kFALSE; return; }
   void  SetConstraintOn() { fConstraint=kTRUE; return; }
@@ -101,6 +111,7 @@ class AliVertexerTracks : public TObject {
   static void GetStrLinDerivMatrix(Double_t *p0,Double_t *p1,Double_t (*m)[3],Double_t *d);
   static void GetStrLinDerivMatrix(Double_t *p0,Double_t *p1,Double_t *sigmasq,Double_t (*m)[3],Double_t *d);
   static AliESDVertex TrackletVertexFinder(TClonesArray *lines, Int_t optUseWeights=0);
+  static AliESDVertex TrackletVertexFinder(AliStrLine **lines, const Int_t knacc, Int_t optUseWeights=0);
   void     SetFieldkG(Double_t field=-999.) { fFieldkG=field; return; }
   Double_t GetFieldkG() const { 
     if(fFieldkG<-99.) AliFatal("Field value not set");
@@ -152,6 +163,7 @@ class AliVertexerTracks : public TObject {
   Double_t  fFiducialZ;       // length of fiducial cylinder for tracks
   Double_t  fnSigmaForUi00;   // n. sigmas from finder in TrackToPoint
   Int_t     fAlgo;            // option for vertex finding algorythm
+  Int_t     fAlgoIter0;       // this is for iteration 0
   // fAlgo=1 (default) finds minimum-distance point among all selected tracks
   //         approximated as straight lines 
   //         and uses errors on track parameters as weights