--- DarthVader/TrackerLevel2/inc/ExtTrack.h	2014/02/27 11:24:42	1.1
+++ DarthVader/TrackerLevel2/inc/ExtTrack.h	2014/06/04 07:57:01	1.2
@@ -6,6 +6,47 @@
 #define exttrack_h
 
 #include <TrkLevel2.h>
+#include <TrkParams.h>
+
+
+/**
+ * \brief Struct to pass mini2 track parameters to F77 routines
+ */
+#define NPLANEMAX 56
+
+struct cMiniExtTrack {
+    double al[5];
+    double xm[NPLANEMAX],ym[NPLANEMAX],zm[NPLANEMAX];
+    double xm_a[NPLANEMAX],ym_a[NPLANEMAX],zm_a[NPLANEMAX];
+    double xm_b[NPLANEMAX],ym_b[NPLANEMAX],zm_b[NPLANEMAX];
+    double resx[NPLANEMAX],resy[NPLANEMAX];
+    double tailx[NPLANEMAX],taily[NPLANEMAX];
+    double xgood[NPLANEMAX],ygood[NPLANEMAX];
+    double dedxtrk_x[NPLANEMAX];
+    double dedxtrk_y[NPLANEMAX];
+    double zini;
+    double pfixed;
+    double chi2;
+    double xv[NPLANEMAX],yv[NPLANEMAX],zv[NPLANEMAX];
+    double axv[NPLANEMAX],ayv[NPLANEMAX];
+    double cov[5][5];
+    double fact;
+    int nstep;
+    int idcand;
+    int trackmode;
+    int istepmin;
+    int nplanes;
+
+};
+
+extern "C" {
+
+  extern struct cMiniExtTrack exttrack_; 
+  void miniext_(int*,int*,int*); 
+  void guessext_(); 
+
+}
+
 
 class ExtTrack : public TObject {
 
@@ -13,57 +54,105 @@
 
 public:
 
-    	
-    Float_t al[5];           ///<TRACK STATE VECTOR 
-    Float_t coval[5][5];     ///<covariance matrix 
-    Float_t chi2;          
-    Int_t  nstep;           
-    Int_t nplanes;
-    Int_t*   xgood ;        //[nplanes]       
-    Int_t*   ygood ;        //[nplanes]        
-    Float_t* xm ;           //[nplanes]
-    Float_t* ym ;           //[nplanes]
-    Float_t* zm ;           //[nplanes]
-    Float_t* resx ;         //[nplanes]
-    Float_t* resy ;         //[nplanes]
-    Float_t* xv ;           //[nplanes]
-    Float_t* yv ;           //[nplanes]
-    Float_t* zv ;           //[nplanes]
-    Float_t* axv ;          //[nplanes]
-    Float_t* ayv ;          //[nplanes]
-    Float_t* dedx_x ;       //[nplanes]
-    Float_t* dedx_y ;       //[nplanes]
-
-
-    ExtTrack();
-    ExtTrack(Int_t dim);
-    ExtTrack(const ExtTrack&);
-
-    ~ExtTrack(){ Delete(); };
-
-    void Clear(Option_t* option="");
-    void Delete();
-    void Dump();
-
-    void FitReset();
-    void SetDimension(Int_t dim);
-    void SetMeasure(double *xmeas, double *ymeas, double *zmeas);
-    void SetResolution(double *rx, double *ry);
-    void SetGood(Int_t *xg, Int_t *yg);
-
-    void FillMiniStruct(cMini2track& track);
-    void SetFromMiniStruct(cMini2track *track);
-
-
-    Bool_t XGood(int ip){ return xgood[ip]; };
-    Bool_t YGood(int ip){ return ygood[ip]; };
-
-    Int_t GetNX(){Int_t n=0; for(Int_t i=0; i<nplanes; i++)n+=(Int_t)XGood(i); return n;}; 
-    Int_t GetNY(){Int_t n=0; for(Int_t i=0; i<nplanes; i++)n+=(Int_t)YGood(i); return n;};
-    Int_t GetNXY(){Int_t n=0; for(Int_t i=0; i<nplanes; i++)n+=(Int_t)YGood(i)*XGood(i); return n;};
-    Int_t GetNtot(){return GetNX()+GetNY();};
 
-    ClassDef(ExtTrack,1);
+  float zini;
+  float al[5];           ///<TRACK STATE VECTOR 
+  float coval[5][5];     ///<covariance matrix 
+  float chi2;          
+  int  nstep;           
+  int nplanes;
+  int*   xgood ;        //[nplanes]       
+  int*   ygood ;        //[nplanes]        
+  int*   multmaxx;     //[nplanes]  
+  int*   multmaxy;     //[nplanes]  
+  float* xm ;           //[nplanes]
+  float* ym ;           //[nplanes]
+  float* zm ;           //[nplanes]
+  float* xma ;           //[nplanes]
+  float* yma ;           //[nplanes]
+  float* zma ;           //[nplanes]
+  float* xmb ;           //[nplanes]
+  float* ymb ;           //[nplanes]
+  float* zmb ;           //[nplanes]
+  float* resx ;         //[nplanes]
+  float* resy ;         //[nplanes]
+  float* xv ;           //[nplanes]
+  float* yv ;           //[nplanes]
+  float* zv ;           //[nplanes]
+  float* axv ;          //[nplanes]
+  float* ayv ;          //[nplanes]
+  float* dedx_x ;       //[nplanes]
+  float* dedx_y ;       //[nplanes]
+
+  float xGF[14];         ///<calculated x coordinates on GF reference planes
+  float yGF[14];         ///<calculated y coordinates on GF reference planes
+
+  ExtTrack(int dim=0);
+
+  ExtTrack( TrkTrack& t){ Set(t); }
+  ExtTrack( const ExtTrack& );
+
+  ~ExtTrack(){ Delete(); };
+
+  void SetDimension(int dim);    ///< Allocate vectors
+  void Clear(Option_t* option=""); ///< Deallocate vectors
+  void Delete();        ///< Deallocate vectors
+
+  void Copy(ExtTrack&);
+
+
+  void SetMiniDefault();        ///< Set tracking alg. parameters (static)
+  void SetZ0(float zin){zini = zin; } ///< Set z-coord of reference plane
+
+
+  void Set( TrkTrack& t, int index);          ///< Set from TrkTrack object
+  void Set( TrkTrack& t){Set(t,0);};          ///< Set from TrkTrack object
+  void FillMiniStruct(cMiniExtTrack& track);
+  void SetFromMiniStruct(cMiniExtTrack *track);
+  void FillMiniStruct(){FillMiniStruct(exttrack_); };
+  void SetFromMiniStruct(){SetFromMiniStruct(&exttrack_);};
+
+
+  bool SetZ(int ip,float zmeas);
+  bool SetXY(int ip,float xmeas, float ymeas, float rx, float ry); 
+  bool SetX(int ip,float xa, float xb, float ya, float yb, float res); 
+  bool SetY(int ip,float xa, float xb, float ya, float yb, float res); 
+  bool ResetXY(int ip);
+
+  bool SetXGood(int ip,int icl_piu_uno=1, int il=-1, int is=-1 ); ///< same notation as TrkTrack
+  bool SetYGood(int ip,int icl_piu_uno=1, int il=-1, int is=-1 );///< same notation as TrkTrack
+
+  void ResetFit();                       ///<Reset fit variables
+  void ResetXY();                        ///<Reset all measured-position variables
+  void Reset(){ ResetFit(); ResetXY(); } ///<Reset all variables
+
+
+
+  void Dump();
+
+
+  void Fit(double pfixed, int& fail, int iprint);
+
+  Bool_t XGood(int ip){ return GetClusterX_ID(ip)!=-1; };
+  Bool_t YGood(int ip){ return GetClusterY_ID(ip)!=-1; };
+  int GetClusterX_ID(int ip);
+  int GetClusterY_ID(int ip);
+  int GetLadder(int ip);
+  int GetSensor(int ip);
+
+  int GetNX(){int n=0; for(int i=0; i<nplanes; i++)n+=(int)(XGood(i)); return n;}; 
+  int GetNY(){int n=0; for(int i=0; i<nplanes; i++)n+=(int)(YGood(i)); return n;};
+  int GetNXY(){int n=0; for(int i=0; i<nplanes; i++)n+=(int)(YGood(i)&&XGood(i)); return n;};
+  int GetNtot(){return GetNX()+GetNY();};
+
+  Int_t GetClusterX_Multiplicity(int ip);
+  Int_t GetClusterY_Multiplicity(int ip);
+  Int_t GetClusterX_MaxStrip(int ip);
+  Int_t GetClusterY_MaxStrip(int ip);
+
+  Float_t GetRigidity();
+
+  ClassDef(ExtTrack,1);
 
 };