--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/01/31 16:15:55	1.24
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/08/17 13:25:14	1.38
@@ -12,11 +12,15 @@
 extern "C" {    
     void dotrack_(int*, double*, double*, double*, double*, int*);
     void dotrack2_(int*, double*, double*, double*, double*,double*, double*, double*,int*);
-//    int  readb_(const char*);
-    int  readb_();
     void mini2_(int*,int*,int*); 
     void guess_();
+    void gufld_(float*, float*);
+    float risxeta2_(float *);
+    float risxeta3_(float *);
+    float risxeta4_(float *);
+    float risyeta2_(float *);
 }
+
 //--------------------------------------
 //
 //
@@ -39,6 +43,8 @@
 	zm[ip]     = 0;
 	resx[ip]   = 0;
 	resy[ip]   = 0;
+	tailx[ip]   = 0;
+	taily[ip]   = 0;
 	xv[ip]     = 0;
 	yv[ip]     = 0;
 	zv[ip]     = 0;
@@ -47,10 +53,18 @@
 	dedx_x[ip] = 0;
 	dedx_y[ip] = 0;
     };
-    clx = 0;
-    cly = 0;
-//    clx = new TRefArray(6,0);
-//    cly = new TRefArray(6,0);
+//    clx = 0;
+//    cly = 0;
+//    clx = new TRefArray(6,0); //forse causa memory leak???
+//    cly = new TRefArray(6,0); //forse causa memory leak???
+//    clx = TRefArray(6,0);
+//    cly = TRefArray(6,0);
+
+    TrkParams::SetTrackingMode();
+    TrkParams::SetPrecisionFactor();
+    TrkParams::SetStepMin();
+    TrkParams::SetPFA();
+
 };
 //--------------------------------------
 //
@@ -73,6 +87,8 @@
 	zm[ip]     = t.zm[ip];
 	resx[ip]   = t.resx[ip];
 	resy[ip]   = t.resy[ip];
+	tailx[ip]  = t.tailx[ip];
+	taily[ip]  = t.taily[ip];
 	xv[ip]     = t.xv[ip];
 	yv[ip]     = t.yv[ip];
 	zv[ip]     = t.zv[ip];
@@ -81,11 +97,18 @@
 	dedx_x[ip] = t.dedx_x[ip];
 	dedx_y[ip] = t.dedx_y[ip];
     };
-    clx = 0;
-    cly = 0;
-    if(t.clx)clx = new TRefArray(*(t.clx));
-    if(t.cly)cly = new TRefArray(*(t.cly));
-	
+//    clx = 0;
+//    cly = 0;
+//    if(t.clx)clx = new TRefArray(*(t.clx));
+//    if(t.cly)cly = new TRefArray(*(t.cly));
+//    clx = TRefArray(t.clx);
+//    cly = TRefArray(t.cly);
+
+    TrkParams::SetTrackingMode();
+    TrkParams::SetPrecisionFactor(); 
+    TrkParams::SetStepMin();   
+    TrkParams::SetPFA();
+
 };
 //--------------------------------------
 //
@@ -109,6 +132,8 @@
 	t.zm[ip]     = zm[ip];
 	t.resx[ip]   = resx[ip];
 	t.resy[ip]   = resy[ip];
+	t.tailx[ip]  = tailx[ip];
+	t.taily[ip]  = taily[ip];
 	t.xv[ip]     = xv[ip];
 	t.yv[ip]     = yv[ip];
 	t.zv[ip]     = zv[ip];
@@ -118,6 +143,9 @@
 	t.dedx_y[ip] = dedx_y[ip];
 	    
     };
+
+//    t.clx = TRefArray(clx);
+//    t.cly = TRefArray(cly);
     
 };
 //--------------------------------------
@@ -143,6 +171,11 @@
     for (int i=0; i<5; i++)         dal[i]  = (double)al[i];
     for (int i=0; i<t->npoint; i++) dzin[i] = (double)t->z[i];
 
+    TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "int TrkTrack::DoTrack(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
+	return 0;
+    }
     dotrack_(&(t->npoint),dzin,dxout,dyout,dal,&ifail);
     
     for (int i=0; i<t->npoint; i++){
@@ -182,6 +215,11 @@
     for (int i=0; i<5; i++)         dal[i]  = (double)al[i];
     for (int i=0; i<t->npoint; i++) dzin[i] = (double)t->z[i];
 
+    TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "int TrkTrack::DoTrack2(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
+	return 0;
+    }
     dotrack2_(&(t->npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
     
     for (int i=0; i<t->npoint; i++){
@@ -221,13 +259,168 @@
 	return def;
 };
 //
-Float_t TrkTrack::GetDEDX(){
-	Float_t dedx=0; 
-	for(Int_t i=0; i<6; i++)dedx+=dedx_x[i]*xgood[i]+dedx_y[i]*ygood[i]; 
-	dedx = dedx/(this->GetNX()+this->GetNY());
-	return dedx;
+/**
+ * Method to retrieve the dE/dx measured on a tracker view.
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Float_t TrkTrack::GetDEDX(int ip, int iv){
+    if(iv==0 && ip>=0 && ip<6)return fabs(dedx_x[ip]);
+    else if(iv==1 && ip>=0 && ip<6)return fabs(dedx_y[ip]);
+    else {
+	cout << "TrkTrack::GetDEDX(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+	return 0.;
+    }
+}
+/**
+ * Method to evaluate the dE/dx measured on a tracker plane. 
+ * The two measurements on x- and y-view are averaged.
+ * @param ip plane (0-5)
+ */
+Float_t TrkTrack::GetDEDX(int ip){
+    if( (Int_t)XGood(ip)+(Int_t)YGood(ip) == 0 ) return 0; 
+    return (GetDEDX(ip,0)+GetDEDX(ip,1))/((Int_t)XGood(ip)+(Int_t)YGood(ip));
 };
 
+/**
+ * Method to evaluate the dE/dx averaged over all planes. 
+ */
+Float_t TrkTrack::GetDEDX(){
+    Float_t dedx=0; 
+    for(Int_t ip=0; ip<6; ip++)dedx+=GetDEDX(ip,0)*XGood(ip)+GetDEDX(ip,1)*YGood(ip); 
+    dedx = dedx/(GetNX()+GetNY());
+    return dedx;
+};
+/**
+ * Returns 1 if the cluster on a tracker view includes bad strips.
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Bool_t TrkTrack::IsBad(int ip,int iv){
+    if(iv==0 && ip>=0 && ip<6)return (xgood[ip]<0) ;
+    else if(iv==1 && ip>=0 && ip<6)return (ygood[ip]<0) ;
+    else {
+	cout << "TrkTrack::IsBad(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+	return 0.;
+    }
+};
+/**
+ * Returns 1 if the signal on a tracker view is saturated.
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Bool_t TrkTrack::IsSaturated(int ip,int iv){
+    if(iv==0 && ip>=0 && ip<6)return (dedx_x[ip]<0) ;
+    else if(iv==1 && ip>=0 && ip<6)return (dedx_y[ip]<0) ;
+    else {
+	cout << "TrkTrack::IsSaturated(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+	return 0.;
+    }
+};
+/**
+ * Returns 1 if either the x or the y signal on a tracker plane is saturated.
+ * @param ip plane (0-5)
+ */
+Bool_t TrkTrack::IsSaturated(int ip){
+    return (IsSaturated(ip,0)||IsSaturated(ip,1));
+};
+/**
+ * Returns 1 if there is at least a saturated signal along the track.
+ */
+Bool_t TrkTrack::IsSaturated(){
+    for(int ip=0; ip<6; ip++)for(int iv=0; iv<2; iv++)if(IsSaturated(ip,iv))return true;
+    return false;
+}
+/**
+ * Returns the track "lever-arm" on the x view, defined as the distance (in planes) between 
+ * the upper and lower x measurements (the maximum value of lever-arm is 6). 
+ */
+Int_t TrkTrack::GetLeverArmX(){
+    int first_plane = -1;
+    int last_plane  = -1;
+    for(Int_t ip=0; ip<6; ip++){
+	if( XGood(ip) && first_plane == -1 )first_plane = ip;
+	if( XGood(ip) && first_plane != -1 )last_plane = ip;
+    }
+    if( first_plane == -1 || last_plane == -1){
+	cout<< "Int_t TrkTrack::GetLeverArmX() -- XGood(ip) always false ??? "<<endl; 
+	return 0;
+    }
+    return (last_plane-first_plane+1);
+}
+/**
+ * Returns the track "lever-arm" on the y view, defined as the distance (in planes) between 
+ * the upper and lower y measurements (the maximum value of lever-arm is 6). 
+ */
+Int_t TrkTrack::GetLeverArmY(){
+    int first_plane = -1;
+    int last_plane  = -1;
+    for(Int_t ip=0; ip<6; ip++){
+	if( YGood(ip) && first_plane == -1 )first_plane = ip;
+	if( YGood(ip) && first_plane != -1 )last_plane = ip;
+    }
+    if( first_plane == -1 || last_plane == -1){
+	cout<< "Int_t TrkTrack::GetLeverArmY() -- YGood(ip) always false ??? "<<endl; 
+	return 0;
+    }
+    return (last_plane-first_plane+1);
+}
+/**
+ * Returns the reduced chi-square of track x-projection
+ */
+Float_t  TrkTrack::GetChi2X(){
+    float chiq=0;
+    for(int ip=0; ip<6; ip++)if(XGood(ip))chiq+= pow((xv[ip]-xm[ip])/resx[ip],2.); 
+    if(GetNX()>3)chiq=chiq/(GetNX()-3);
+    else chiq=0;
+    if(chiq==0)cout << " Float_t  TrkTrack::GetChi2X() -- WARNING -- value not defined "<<chiq<<endl;
+    return chiq;
+}
+/**
+ * Returns the reduced chi-square of track y-projection
+ */
+Float_t  TrkTrack::GetChi2Y(){
+    float chiq=0;
+    for(int ip=0; ip<6; ip++)if(YGood(ip))chiq+= pow((yv[ip]-ym[ip])/resy[ip],2.); 
+    if(GetNY()>2)chiq=chiq/(GetNY()-2);
+    else chiq=0;
+    if(chiq==0)cout << " Float_t  TrkTrack::GetChi2Y() -- WARNING -- value not defined "<<chiq<<endl;
+    return chiq;
+}
+/**
+ * Returns the logarythm of the likeliwood-function of  track x-projection
+ */
+Float_t TrkTrack::GetLnLX(){
+    float lnl=0;
+    for(int ip=0; ip<6; ip++)
+	if( XGood(ip) && tailx[ip]!=0 )
+	    lnl += (tailx[ip]+1.) * log( (tailx[ip]*pow(resx[ip],2.) + pow(xv[ip]-xm[ip],2.)) / (tailx[ip]*pow(resx[ip],2)) ); 
+    if(GetNX()>3)lnl=lnl/(GetNX()-3);
+    else lnl=0;
+    if(lnl==0){
+	cout << " Float_t  TrkTrack::GetLnLX() -- WARNING -- value not defined "<<lnl<<endl;
+	Dump();
+    }
+    return lnl;
+    
+}
+/**
+ * Returns the logarythm of the likeliwood-function of  track y-projection
+ */
+Float_t TrkTrack::GetLnLY(){
+    float lnl=0;
+    for(int ip=0; ip<6; ip++)
+	if( YGood(ip) && taily[ip]!=0 )
+	    lnl += (taily[ip]+1.) * log( (taily[ip]*pow(resy[ip],2.) + pow(yv[ip]-ym[ip],2.)) / (taily[ip]*pow(resy[ip],2)) ); 
+    if(GetNY()>2)lnl=lnl/(GetNY()-2);
+    else lnl=0;
+    if(lnl==0){
+	cout << " Float_t  TrkTrack::GetLnLY() -- WARNING -- value not defined "<<lnl<<endl;
+	Dump();
+    }
+    return lnl;
+    
+}
 //--------------------------------------
 //
 //
@@ -239,8 +432,8 @@
     cout << endl << "al       : "; for(int i=0; i<5; i++)cout << al[i] << " ";
     cout << endl << "chi^2    : "<< chi2;
     cout << endl << "n.step   : "<< nstep;
-    cout << endl << "xgood    : "; for(int i=0; i<6; i++)cout << xgood[i] ;
-    cout << endl << "ygood    : "; for(int i=0; i<6; i++)cout << ygood[i] ;
+    cout << endl << "xgood    : "; for(int i=0; i<6; i++)cout << XGood(i) ;
+    cout << endl << "ygood    : "; for(int i=0; i<6; i++)cout << YGood(i) ;
     cout << endl << "xm       : "; for(int i=0; i<6; i++)cout << xm[i] << " ";
     cout << endl << "ym       : "; for(int i=0; i<6; i++)cout << ym[i] << " ";
     cout << endl << "zm       : "; for(int i=0; i<6; i++)cout << zm[i] << " ";
@@ -249,6 +442,8 @@
     cout << endl << "zv       : "; for(int i=0; i<6; i++)cout << zv[i] << " ";
     cout << endl << "resx     : "; for(int i=0; i<6; i++)cout << resx[i] << " ";
     cout << endl << "resy     : "; for(int i=0; i<6; i++)cout << resy[i] << " ";
+    cout << endl << "tailx    : "; for(int i=0; i<6; i++)cout << tailx[i] << " ";
+    cout << endl << "taily    : "; for(int i=0; i<6; i++)cout << taily[i] << " ";
     cout << endl << "coval    : "; for(int i=0; i<5; i++)cout << coval[0][i]<<" ";
     cout << endl << "           "; for(int i=0; i<5; i++)cout << coval[1][i]<<" ";
     cout << endl << "           "; for(int i=0; i<5; i++)cout << coval[2][i]<<" ";
@@ -274,9 +469,89 @@
     for(int i=0; i<6; i++) resy[i]=*ry++;
 }
 /**
+ * Set the TrkTrack tails position resolution 
+ */
+void TrkTrack::SetTail(double *tx, double *ty, double factor){
+    for(int i=0; i<6; i++) tailx[i]=factor*(*tx++);
+    for(int i=0; i<6; i++) taily[i]=factor*(*ty++);
+}
+/**
+ * Set the TrkTrack Student parameter (resx,resy,tailx,taily)
+ * from previous gausian fit
+ *@param flag =0 standard, =1 with noise correction 
+ */
+void TrkTrack::SetStudentParam(int flag){
+    float sx[11]={0.000128242,
+		   0.000136942,
+		   0.000162718,
+		   0.000202644,
+		   0.00025597,
+		   0.000317456,
+		   0.000349048,
+		   0.000384638,
+		   0.000457295,
+		   0.000512319,
+		   0.000538573};
+    float tx[11]={1.79402,
+		   2.04876,
+		   2.88376,
+		   3.3,
+		   3.14084,
+		   4.07686,
+		   4.44736,
+		   3.5179,
+		   3.38697,
+		   3.45739,
+		   3.18627};
+    float sy[11]={0.000483075,
+		   0.000466925,
+		   0.000431658,
+		   0.000428317,
+		   0.000433854,
+		   0.000444044,
+		   0.000482098,
+		   0.000537579,
+		   0.000636279,
+		   0.000741998,
+		   0.000864261};
+    float ty[11]={0.997032,
+		   1.11147,
+		   1.18526,
+		   1.61404,
+		   2.21908,
+		   3.08959,
+		   4.48833,
+		   4.42687,
+		   4.65253,
+		   4.52043,
+		   4.29926};
+    int index;
+    float fact;
+    for(int i=0; i<6; i++) {
+	index = int((fabs(axv[i])+1.)/2.);
+	if(index>10) index=10;
+	tailx[i]=tx[index];
+	if(flag==1) {
+	    if(fabs(axv[i])<=10.) fact = resx[i]/risxeta2_(&(axv[i]));
+	    if(fabs(axv[i])>10.&&fabs(axv[i])<=15.) fact = resx[i]/risxeta3_(&(axv[i]));
+	    if(fabs(axv[i])>15.) fact = resx[i]/risxeta4_(&(axv[i]));
+	} else fact = 1.;
+	resx[i] = sx[index]*fact;
+    }
+    for(int i=0; i<6; i++) {
+	index = int((fabs(ayv[i])+1.)/2.);
+	if(index>10) index=10;
+	taily[i]=ty[index];
+	if(flag==1) fact = resy[i]/risyeta2_(&(ayv[i]));
+	else fact = 1.;
+	resy[i] = sy[index]*fact;
+    }
+}
+/**
  * Set the TrkTrack good measurement 
  */
 void TrkTrack::SetGood(int *xg, int *yg){
+
     for(int i=0; i<6; i++) xgood[i]=*xg++;
     for(int i=0; i<6; i++) ygood[i]=*yg++;
 }
@@ -286,13 +561,21 @@
  */
 void TrkTrack::LoadField(TString path){
     
-    strcpy(path_.path,path.Data());
-    path_.pathlen = path.Length();
-    path_.error   = 0;
-    readb_();
+//     strcpy(path_.path,path.Data());
+//     path_.pathlen = path.Length();
+//     path_.error   = 0;
+//     readb_();
+
+    TrkParams::SetTrackingMode();
+    TrkParams::SetPrecisionFactor();
+    TrkParams::SetStepMin();
+
+    TrkParams::Set(path,1);
+    TrkParams::Load(1);
 
 };
 
+
 /**
  * Method to fill minimization-routine common
  */
@@ -300,8 +583,10 @@
 
     for(int i=0; i<6; i++){ 
 
-	track.xgood[i]=xgood[i];
-	track.ygood[i]=ygood[i];
+// 	cout << i<<" - "<<xgood[i]<<" "<<XGood(i)<<endl;
+// 	cout << i<<" - "<<ygood[i]<<" "<<YGood(i)<<endl;
+	track.xgood[i]=XGood(i);
+	track.ygood[i]=YGood(i);
 	
 	track.xm[i]=xm[i];
 	track.ym[i]=ym[i];
@@ -314,10 +599,10 @@
 	track.xm_b[i]=xm[i];
 	track.ym_a[i]=ym[i];
 	track.ym_b[i]=ym[i];
-	if(       xgood[i] && !ygood[i] ){
+	if(       XGood(i) && !YGood(i) ){
 	    track.ym_a[i] = track.ym_a[i]+segment;
 	    track.ym_b[i] = track.ym_b[i]-segment;
-	}else if( !xgood[i] && ygood[i]){
+	}else if( !XGood(i) && YGood(i)){
 	    track.xm_a[i] = track.xm_a[i]+segment;
 	    track.xm_b[i] = track.xm_b[i]-segment;
 	}
@@ -325,6 +610,8 @@
 	
 	track.resx[i]=resx[i];
 	track.resy[i]=resy[i];
+	track.tailx[i]=tailx[i];
+	track.taily[i]=taily[i];
     }
 
     for(int i=0; i<5; i++) track.al[i]=al[i]; 
@@ -353,20 +640,111 @@
 	axv[i] = track->axv[i];
 	ayv[i] = track->ayv[i];	
     }
-
     
 }
 /**
- * Tracking method. It calls F77 mini routine.
+ * \brief Method to re-evaluate coordinates of clusters associated with a track.
+ *
+ * The method can be applied only after recovering level1 information 
+ * (either by reprocessing single events from level0 or from  
+ * the TrkLevel1 branch, if present); it calls F77 subroutines that 
+ * read the level1 common and fill the minimization-routine common.
+ * Some clusters can be excluded or added by means of the methods:
+ *
+ * TrkTrack::ResetXGood(int ip)
+ * TrkTrack::ResetYGood(int ip)
+ * TrkTrack::SetXGood(int ip, int cid, int is)
+ * TrkTrack::SetYGood(int ip, int cid, int is)
+ *
+ * NB! The method TrkTrack::SetGood(int *xg, int *yg) set the plane-mask (0-1) 
+ * for the minimization-routine common. It deletes the cluster information
+ * (at least for the moment...) thus cannot be applied before 
+ * TrkTrack::EvaluateClusterPositions().  
+ *
+ * Different p.f.a. can be applied by calling (once) the method:
+ * 
+ * TrkParams::SetPFA(0); //Set ETA p.f.a.
+ *
+ * @see TrkParams::SetPFA(int)
+ */
+Bool_t TrkTrack::EvaluateClusterPositions(){
+    
+//     cout << "void TrkTrack::GetClusterPositions() "<<endl;
+
+    TrkParams::Load( );
+    if( !TrkParams::IsLoaded() )return false;
+    
+    for(int ip=0; ip<6; ip++){
+//	cout << ip<<" ** "<<xm[ip]<<" / "<<ym[ip]<<endl;;
+	int icx = GetClusterX_ID(ip)+1;
+	int icy = GetClusterY_ID(ip)+1;
+	int sensor = GetSensor(ip)+1;//<< convenzione "Paolo"
+	if(ip==5 && sensor!=0)sensor=3-sensor;//<< convenzione "Elena"
+	int ladder = GetLadder(ip)+1;
+	float ax = axv[ip];
+	float ay = ayv[ip];
+	float v[3];
+	v[0]=xv[ip];
+	v[1]=yv[ip];
+	v[2]=zv[ip];
+	float bfx = 10*TrkParams::GetBX(v);//Tesla
+	float bfy = 10*TrkParams::GetBY(v);//Tesla
+	int ipp=ip+1;
+	xyzpam_(&ipp,&icx,&icy,&ladder,&sensor,&ax,&ay,&bfx,&bfy);
+	if(icx<0 || icy<0)return false;
+    }
+    return true;
+}
+/**
+ * \brief Tracking method. It calls F77 mini routine.
+ *
+ * @param pfixed Particle momentum. If pfixed=0 the momentum 
+ * is left as a free parameter, otherwise it is fixed to the input value.
+ * @param fail Output flag (!=0 if the fit failed). 
+ * @param iprint Flag to set debug mode ( 0 = no output; 1 = verbose; 2 = debug).
+ * @param froml1 Flag to re-evaluate positions (see TrkTrack::GetClusterPositions()). 
+ *
+ * The option to re-evaluate positions can be used only after recovering
+ * level1 information, eg. by reprocessing the single event. 
+ *
+ * Example:
+ *
+ * if( !event->GetTrkLevel0() )return false;
+ * event->GetTrkLevel0()->ProcessEvent(); // re-processing level0->level1
+ * int fail=0;
+ * event->GetTrkLevel2()->GetTrack(0)->Fit(0.,fail,0,1);
+ *
+ * @see EvaluateClusterPositions()
+ *
+ * The fitting procedure can be varied by changing the tracking mode, 
+ * the fit-precision factor and the minimum number of step.
+ * @see SetTrackingMode(int)
+ * @see SetPrecisionFactor(double)
+ * @see SetStepMin(int)
  */
-void TrkTrack::Fit(double pfixed, int& fail, int iprint){
+void TrkTrack::Fit(double pfixed, int& fail, int iprint, int froml1){
 
     float al_ini[] = {0.,0.,0.,0.,0.};
 
+    TrkParams::Load( );
+    if( !TrkParams::IsLoaded() )return;
+
     extern cMini2track track_;
     fail = 0;
-    FillMiniStruct(track_);
 
+    FillMiniStruct(track_);
+        
+    if(froml1!=0){
+	if( !EvaluateClusterPositions() ){
+	    cout << "void TrkTrack::Fit("<<pfixed<<","<<fail<<","<<iprint<<","<<froml1<<") --- ERROR evaluating cluster positions "<<endl;
+	    FillMiniStruct(track_) ;
+	    fail = 1;
+	    return;
+	}
+    }else{
+	FillMiniStruct(track_);	
+    }
+    
     // if fit variables have been reset, evaluate the initial guess
     if(al[0]==-9999.&&al[1]==-9999.&&al[2]==-9999.&&al[3]==-9999.&&al[4]==-9999.)guess_();
 
@@ -385,6 +763,11 @@
 
     //  ------------------------------------------
     //  call mini routine
+//     TrkParams::Load(1);
+//     if( !TrkParams::IsLoaded(1) ){
+// 	cout << "void TrkTrack::Fit(double pfixed, int& fail, int iprint) --- ERROR --- m.field not loaded"<<endl;
+// 	return;
+//     }
     int istep=0;
     int ifail=0;
     mini2_(&istep,&ifail, &iprint);
@@ -395,42 +778,129 @@
     //  ------------------------------------------
     
     SetFromMiniStruct(&track_);
-//    cout << endl << "eta ===> " << track_.al[4] << endl;
-
-//     for(int i=0; i<5; i++) al[i]=track_.al[i];
-//     chi2=track_.chi2;
-//     nstep=track_.nstep;
-//     for(int i=0; i<6; i++) xv[i]=track_.xv[i];
-//     for(int i=0; i<6; i++) yv[i]=track_.yv[i];
-//     for(int i=0; i<6; i++) zv[i]=track_.zv[i];
-//     for(int i=0; i<6; i++) axv[i]=track_.axv[i];
-//     for(int i=0; i<6; i++) ayv[i]=track_.ayv[i];
-//     for(int i=0; i<5; i++) {
-// 	for(int j=0; j<5; j++) coval[i][j]=track_.cov[i][j];
-//     }
 
     if(fail){
- 	if(iprint)cout << " >>>> fit failed >>>> drawing initial par"<<endl;
+ 	if(iprint)cout << " >>>> fit failed "<<endl;
  	for(int i=0; i<5; i++) al[i]=al_ini[i]; 
     }
 
 };
-/*
+/**
  * Reset the fit parameters 
  */
 void TrkTrack::FitReset(){
     for(int i=0; i<5; i++) al[i]=-9999.;
     chi2=0.;
     nstep=0;
-    for(int i=0; i<6; i++) xv[i]=0.;
-    for(int i=0; i<6; i++) yv[i]=0.;
-    for(int i=0; i<6; i++) zv[i]=0.;
-    for(int i=0; i<6; i++) axv[i]=0.;
-    for(int i=0; i<6; i++) ayv[i]=0.;
+//     for(int i=0; i<6; i++) xv[i]=0.;
+//     for(int i=0; i<6; i++) yv[i]=0.;
+//     for(int i=0; i<6; i++) zv[i]=0.;
+//     for(int i=0; i<6; i++) axv[i]=0.;
+//     for(int i=0; i<6; i++) ayv[i]=0.;
     for(int i=0; i<5; i++) {
 	for(int j=0; j<5; j++) coval[i][j]=0.;
     }
 }
+/**
+ * Set the tracking mode 
+ */
+void TrkTrack::SetTrackingMode(int trackmode){
+    extern cMini2track track_;
+    track_.trackmode = trackmode;
+}
+/**
+ * Set the factor scale for tracking precision 
+ */
+void TrkTrack::SetPrecisionFactor(double fact){
+    extern cMini2track track_;
+    track_.fact = fact;
+}
+/**
+ * Set the minimum number of steps for tracking precision 
+ */
+void TrkTrack::SetStepMin(int istepmin){
+    extern cMini2track track_;
+    track_.istepmin = istepmin;
+}
+/**
+ * Returns 1 if the track is inside the magnet cavity
+ * Set the minimum number of steps for tracking precision 
+ */
+Bool_t TrkTrack::IsInsideCavity(){
+    float xmagntop, ymagntop, xmagnbottom, ymagnbottom;
+    xmagntop = xv[0] + (ZMAGNHIGH-zv[0])*tan(cos(-1.0)*axv[0]/180.);
+    ymagntop = yv[0] + (ZMAGNHIGH-zv[0])*tan(cos(-1.0)*ayv[0]/180.);
+    xmagnbottom = xv[5] + (ZMAGNLOW-zv[5])*tan(cos(-1.0)*axv[5]/180.);
+    ymagnbottom = yv[5] + (ZMAGNLOW-zv[5])*tan(cos(-1.0)*ayv[5]/180.);
+    if( xmagntop>XMAGNLOW && xmagntop<XMAGNHIGH &&
+	ymagntop>YMAGNLOW && ymagntop<YMAGNHIGH &&
+	xmagnbottom>XMAGNLOW && xmagnbottom<XMAGNHIGH &&
+	ymagnbottom>YMAGNLOW && ymagnbottom<YMAGNHIGH ) return(true);
+    else return(false);
+}
+/**
+ * Method to retrieve ID (0,1,...) of x-cluster (if any) associated to this track.
+ * If no cluster is associated, ID=-1.
+ * @param ip Tracker plane (0-5)
+ */
+Int_t TrkTrack::GetClusterX_ID(int ip){
+    return ((Int_t)fabs(xgood[ip]))%10000000-1;
+};
+/**
+ * Method to retrieve ID (0-xxx) of y-cluster (if any) associated to this track.
+ * If no cluster is associated, ID=-1.
+ * @param ip Tracker plane (0-5)
+ */
+Int_t TrkTrack::GetClusterY_ID(int ip){
+    return ((Int_t)fabs(ygood[ip]))%10000000-1;
+};
+/**
+ * Method to retrieve the ladder (0-4, increasing x) traversed by the track on this plane.
+ * If no ladder is traversed (dead area) the metod retuns -1.
+ * @param ip Tracker plane (0-5)
+ */
+Int_t TrkTrack::GetLadder(int ip){
+    if(XGood(ip))return (Int_t)fabs(xgood[ip]/100000000)-1;
+    if(YGood(ip))return (Int_t)fabs(ygood[ip]/100000000)-1;
+    return -1;
+};
+/**
+ * Method to retrieve the sensor (0-1, increasing y) traversed by the track on this plane.
+ * If no sensor is traversed (dead area) the metod retuns -1.
+ * @param ip Tracker plane (0-5)
+ */
+Int_t TrkTrack::GetSensor(int ip){
+    if(XGood(ip))return (Int_t)((Int_t)fabs(xgood[ip]/10000000)%10)-1;
+    if(YGood(ip))return (Int_t)((Int_t)fabs(ygood[ip]/10000000)%10)-1;
+    return -1;
+};
+
+/**
+ * \brief Method to include a x-cluster to the track.
+ * @param ip Tracker plane (0-5)
+ * @param clid Cluster ID (0,1,...)
+ * @param is Sensor (0-1, increasing y) 
+ * @see Fit(double pfixed, int& fail, int iprint, int froml1)
+ */
+void TrkTrack::SetXGood(int ip, int clid, int is){
+    int il=0;       //ladder (temporary)
+    bool bad=false; //ladder (temporary)
+    xgood[ip]=il*100000000+is*10000000+clid;
+    if(bad)xgood[ip]=-xgood[ip];
+};
+/**
+ * \brief Method to include a y-cluster to the track.
+ * @param ip Tracker plane (0-5)
+ * @param clid Cluster ID (0,1,...)
+ * @param is Sensor (0-1)
+ * @see Fit(double pfixed, int& fail, int iprint, int froml1)
+ */
+void TrkTrack::SetYGood(int ip, int clid, int is){
+    int il=0;       //ladder (temporary)
+    bool bad=false; //ladder (temporary)
+    ygood[ip]=il*100000000+is*10000000+clid;
+    if(bad)ygood[ip]=-ygood[ip];
+};
 
 //--------------------------------------
 //
@@ -454,6 +924,8 @@
 	zm[ip]     = 0;
 	resx[ip]   = 0;
 	resy[ip]   = 0;
+	tailx[ip]  = 0;
+	taily[ip]  = 0;
 	xv[ip]     = 0;
 	yv[ip]     = 0;
 	zv[ip]     = 0;
@@ -463,8 +935,10 @@
 	dedx_y[ip] = 0;
 
     };
-    if(clx)clx->Clear();
-    if(cly)cly->Clear();
+//     if(clx)clx->Clear();
+//     if(cly)cly->Clear();
+//    clx.Clear();
+//    cly.Clear();
 };
 //--------------------------------------
 //
@@ -472,9 +946,9 @@
 //--------------------------------------
 void TrkTrack::Delete(){
 //    cout << "TrkTrack::Delete()"<<endl;
-//    Clear();
-    if(clx)delete clx;
-    if(cly)delete cly;
+    Clear();
+//    if(clx)delete clx;
+//    if(cly)delete cly;
 };
 //--------------------------------------
 //
@@ -504,7 +978,7 @@
     coord[1] = s.coord[1];
     sgnl     = s.sgnl;
 //	cls      = 0;//<<<<pointer
-    cls      = TRef(s.cls);
+//    cls      = TRef(s.cls);
 };
 //--------------------------------------
 //
@@ -537,12 +1011,10 @@
 TrkLevel2::TrkLevel2(){
   //    cout <<"TrkLevel2::TrkLevel2()"<<endl;
     for(Int_t i=0; i<12 ; i++){
-		good[i] = -1;
-	};
-// okkio!! memory-leak
-//     Track    = new TClonesArray("TrkTrack");
-//     SingletX = new TClonesArray("TrkSinglet");
-//     SingletY = new TClonesArray("TrkSinglet");
+	good[i] = -1;
+	VKmask[i] = 0;
+	VKflag[i] = 0;	
+    };
     Track    = 0;
     SingletX = 0;
     SingletY = 0;
@@ -569,12 +1041,6 @@
     cout << endl << "ntrk()   : " << this->ntrk() ;
     cout << endl << "nclsx()  : " << this->nclsx();
     cout << endl << "nclsy()  : " << this->nclsy();
-//     TClonesArray &t  = *Track;
-//     TClonesArray &sx = *SingletX;
-//     TClonesArray &sy = *SingletY;
-//     for(int i=0; i<ntrk(); i++)     ((TrkTrack *)t[i])->Dump();
-//     for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
-//     for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
     if(Track){
 	TClonesArray &t  = *Track;
 	for(int i=0; i<ntrk(); i++)     ((TrkTrack *)t[i])->Dump();
@@ -588,32 +1054,109 @@
 	for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
     }
 }
+/**
+ * \brief Dump processing status
+ */
+void TrkLevel2::StatusDump(int view){
+    cout << "DSP n. "<<view+1<<" status: "<<hex<<good[view]<<endl;    
+};
+/**
+ * \brief Check event status
+ *
+ * Check the event status, according to a flag-mask given as input. 
+ * Return true if the view passes the check.
+ * 
+ * @param view View number (0-11)
+ * @param flagmask Mask of flags to check (eg. flagmask=0x111 no missing packet, 
+ *  no crc error, no software alarm)
+ *
+ * @see TrkLevel2 class definition to know how the status flag is defined
+ *
+ */
+Bool_t TrkLevel2::StatusCheck(int view, int flagmask){
+
+    if( view<0 || view >= 12)return false;
+    return !(good[view]&flagmask);
+
+};
+
+
 //--------------------------------------
 //
 //
 //--------------------------------------
 /**
- * Fills a TrkLevel2 object with values from a struct cTrkLevel2 (to get data from F77 common).
+ * The method returns false if the viking-chip was masked  
+ * either apriori ,on the basis of the mask read from the DB, 
+ * or run-by-run, on the basis of the calibration parameters)
+ * @param iv Tracker view (0-11)
+ * @param ivk Viking-chip number (0-23)
+ */
+Bool_t TrkLevel2::GetVKMask(int iv, int ivk){
+    Int_t whichbit = (Int_t)pow(2,ivk);
+    return (whichbit&VKmask[iv])!=0;    
+}
+/**
+ * The method returns false if the viking-chip was masked  
+ * for this event due to common-noise computation failure.
+ * @param iv Tracker view (0-11)
+ * @param ivk Viking-chip number (0-23)
+ */
+Bool_t TrkLevel2::GetVKFlag(int iv, int ivk){
+    Int_t whichbit = (Int_t)pow(2,ivk);
+    return (whichbit&VKflag[iv])!=0;    
+}
+/**
+ * The method returns true if the viking-chip was masked, either
+ * forced (see TrkLevel2::GetVKMask(int,int)) or 
+ * for this event only (TrkLevel2::GetVKFlag(int,int)). 
+ * @param iv Tracker view (0-11)
+ * @param ivk Viking-chip number (0-23)
  */
-void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2){
+Bool_t TrkLevel2::IsMaskedVK(int iv, int ivk){
+    return !(GetVKMask(iv,ivk)&&GetVKFlag(iv,ivk) ); 
+};
 
-	//  temporary objects:
+//--------------------------------------
+//
+//
+//--------------------------------------
+/**
+ * Fills a TrkLevel2 object with values from a struct cTrkLevel2 (to get data from F77 common). 
+ * Ref to Level1 data (clusters) is also set. If l1==NULL no references are set.
+ * (NB It make sense to set references only if events are stored in a tree that contains also the Level1 branch)
+ */
+void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2, TrkLevel1 *l1){
+
+//    cout << "void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2, TrkLevel1 *l1)"<<endl;
+    Clear();
+
+//  temporary objects:
     TrkSinglet* t_singlet = new TrkSinglet();
     TrkTrack*   t_track   = new TrkTrack();
 
-	//  **** general variables ****
-//    good2 = l2->good2;
+//  -----------------
+//  general variables
+//  -----------------
     for(Int_t i=0; i<12 ; i++){
-//		crc[i] = l2->crc[i];
-		good[i] = l2->good[i];
+	good[i] = l2->good[i];
+	VKmask[i]=0;
+	VKflag[i]=0;
+	for(Int_t ii=0; ii<24 ; ii++){
+	    Int_t setbit = (Int_t)pow(2,ii);
+	    if( l2->vkflag[ii][i]!=-1 )VKmask[i]=VKmask[i]|setbit;
+	    if( l2->vkflag[ii][i]!=0  )VKflag[i]=VKflag[i]|setbit;
 	};
-	//  *** TRACKS ***
+    };
+//  --------------
+//  *** TRACKS ***
+//  --------------
     if(!Track) Track = new TClonesArray("TrkTrack");
     TClonesArray &t = *Track;
+
     for(int i=0; i<l2->ntrk; i++){
 	t_track->seqno = i;// NBNBNBNB deve sempre essere = i
 	t_track->image = l2->image[i]-1;
-	//	cout << "track "<<i<<t_track->seqno << t_track->image<<endl;
 	t_track->chi2  = l2->chi2_nt[i];
 	t_track->nstep = l2->nstep_nt[i];
 	for(int it1=0;it1<5;it1++){
@@ -622,13 +1165,30 @@
 		t_track->coval[it1][it2] = l2->coval[i][it2][it1];
 	};
 	for(int ip=0;ip<6;ip++){
-	    t_track->xgood[ip]  = l2->xgood_nt[i][ip];
-	    t_track->ygood[ip]  = l2->ygood_nt[i][ip];
+	    // ---------------------------------
+	    // new implementation of xgood/ygood 
+	    // ---------------------------------
+	    t_track->xgood[ip]  = l2->cltrx[i][ip]; //cluster ID
+	    t_track->ygood[ip]  = l2->cltry[i][ip]; //cluster ID
+	    t_track->xgood[ip] += 10000000*l2->ls[i][ip]; // ladder+sensor
+	    t_track->ygood[ip] += 10000000*l2->ls[i][ip]; // ladder+sensor
+	    if(l2->xbad[i][ip]>0)t_track->xgood[ip]=-t_track->xgood[ip];
+	    if(l2->ybad[i][ip]>0)t_track->ygood[ip]=-t_track->ygood[ip];
+//  	    if(l2->xbad[i][ip]>0 || l2->ybad[i][ip]>0){
+//   	    if(l2->dedx_x[i][ip]<0 || l2->dedx_y[i][ip]<0){
+//   		cout << ip << " - "<< l2->cltrx[i][ip] << " "<<l2->cltry[i][ip]<<" "<<l2->ls[i][ip]<<endl;
+//   		cout << ip << " - "<<t_track->xgood[ip]<<" "<<t_track->ygood[ip]<<endl;
+//   		cout << ip << " - "<<t_track->GetClusterX_ID(ip)<<" "<<t_track->GetClusterY_ID(ip)<<" "<<t_track->GetLadder(ip)<<" "<<t_track->GetSensor(ip)<<endl;
+//  		cout << ip << " - "<<t_track->BadClusterX(ip)<<" "<<t_track->BadClusterY(ip)<<endl;
+//  		cout << ip << " - "<<t_track->SaturatedClusterX(ip)<<" "<<t_track->SaturatedClusterY(ip)<<endl;
+//   	    }
 	    t_track->xm[ip]     = l2->xm_nt[i][ip];
 	    t_track->ym[ip]     = l2->ym_nt[i][ip];
 	    t_track->zm[ip]     = l2->zm_nt[i][ip];
 	    t_track->resx[ip]   = l2->resx_nt[i][ip];
 	    t_track->resy[ip]   = l2->resy_nt[i][ip];
+	    t_track->tailx[ip]  = l2->tailx[i][ip];
+	    t_track->taily[ip]  = l2->taily[i][ip];
 	    t_track->xv[ip]     = l2->xv_nt[i][ip];
 	    t_track->yv[ip]     = l2->yv_nt[i][ip];
 	    t_track->zv[ip]     = l2->zv_nt[i][ip];
@@ -636,13 +1196,19 @@
 	    t_track->ayv[ip]    = l2->ayv_nt[i][ip];
 	    t_track->dedx_x[ip] = l2->dedx_x[i][ip];
 	    t_track->dedx_y[ip] = l2->dedx_y[i][ip];
-//			t_track->clx[ip] = 0;
-//			t_track->cly[ip] = 0;
+	    //-----------------------------------------------------
+	    //-----------------------------------------------------
+	    //-----------------------------------------------------
+	    //-----------------------------------------------------
 	};
+// 	if(t_track->IsSaturated())t_track->Dump();
 	new(t[i]) TrkTrack(*t_track);
 	t_track->Clear();
     };
+
+//  ----------------
 //  *** SINGLETS ***
+//  ----------------
     if(!SingletX)SingletX = new TClonesArray("TrkSinglet");
     TClonesArray &sx = *SingletX;
     for(int i=0; i<l2->nclsx; i++){
@@ -650,7 +1216,9 @@
 	t_singlet->coord[0] = l2->xs[i][0];
 	t_singlet->coord[1] = l2->xs[i][1];
 	t_singlet->sgnl     = l2->signlxs[i];
-//		t_singlet->cls      = 0;
+	//-----------------------------------------------------
+//	if(l1) t_singlet->cls      = l1->GetCluster(l2->clsx[i]-1);
+	//-----------------------------------------------------
 	new(sx[i]) TrkSinglet(*t_singlet);
 	t_singlet->Clear();
     }
@@ -661,7 +1229,9 @@
 	t_singlet->coord[0] = l2->ys[i][0];
 	t_singlet->coord[1] = l2->ys[i][1];
 	t_singlet->sgnl     = l2->signlys[i];
-//		t_singlet->cls      = 0;
+	//-----------------------------------------------------
+//	if(l1) t_singlet->cls      = l1->GetCluster(l2->clsy[i]-1);
+	//-----------------------------------------------------
 	new(sy[i]) TrkSinglet(*t_singlet);
 	t_singlet->Clear();
     };
@@ -669,104 +1239,6 @@
     delete t_track;
     delete t_singlet;
 }
-//--------------------------------------
-//
-//
-//--------------------------------------
-/**
- * Fills a TrkLevel2 object with values from a struct cTrkLevel2 (to get data from F77 common). 
- * Ref to Level1 data (clusters) is also set.
- */
-void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2, TrkLevel1 *l1){
-
-//  temporary objects:
-	TrkSinglet* t_singlet = new TrkSinglet();
-	TrkTrack*   t_track   = new TrkTrack();
-// general variables
-//	good2 = l2->good2;
-	for(Int_t i=0; i<12 ; i++){
-//		crc[i] = l2->crc[i];
-		good[i] = l2->good[i];
-	};
-// *** TRACKS ***
-	if(!Track) Track = new TClonesArray("TrkTrack");
-	TClonesArray &t = *Track;
-	if(!t_track->clx)t_track->clx = new TRefArray(6,0);
-	if(!t_track->cly)t_track->cly = new TRefArray(6,0);
-	for(int i=0; i<l2->ntrk; i++){
-		t_track->seqno = i;// NBNBNBNB deve sempre essere = i
-		t_track->image = l2->image[i]-1;
-//		cout << "track "<<i<<t_track->seqno << t_track->image<<endl;
-		t_track->chi2  = l2->chi2_nt[i];
-		t_track->nstep = l2->nstep_nt[i];
-		for(int it1=0;it1<5;it1++){
-			t_track->al[it1] = l2->al_nt[i][it1];
-			for(int it2=0;it2<5;it2++)
-				t_track->coval[it1][it2] = l2->coval[i][it2][it1];
-		};
-		for(int ip=0;ip<6;ip++){
-			t_track->xgood[ip]  = l2->xgood_nt[i][ip];
-			t_track->ygood[ip]  = l2->ygood_nt[i][ip];
-			t_track->xm[ip]     = l2->xm_nt[i][ip];
-			t_track->ym[ip]     = l2->ym_nt[i][ip];
-			t_track->zm[ip]     = l2->zm_nt[i][ip];
-			t_track->resx[ip]   = l2->resx_nt[i][ip];
-			t_track->resy[ip]   = l2->resy_nt[i][ip];
-			t_track->xv[ip]     = l2->xv_nt[i][ip];
-			t_track->yv[ip]     = l2->yv_nt[i][ip];
-			t_track->zv[ip]     = l2->zv_nt[i][ip];
-			t_track->axv[ip]    = l2->axv_nt[i][ip];
-			t_track->ayv[ip]    = l2->ayv_nt[i][ip];
-			t_track->dedx_x[ip] = l2->dedx_x[i][ip];
-			t_track->dedx_y[ip] = l2->dedx_y[i][ip];
-//			cout << "traccia "<<i<<"  --  "<< ip << " "<< l2->cltrx[i][ip] <<" "<< l2->cltry[i][ip] <<" "<< t_track->xgood[ip] << t_track->ygood[ip]<<endl;
-			//-----------------------------------------------------
-			//-----------------------------------------------------
-			if(t_track->xgood[ip])t_track->clx->AddAt(l1->GetCluster(l2->cltrx[i][ip]-1),ip);
-			if(t_track->ygood[ip])t_track->cly->AddAt(l1->GetCluster(l2->cltry[i][ip]-1),ip);
-//			if(t_track->ygood[ip])cout<<" i "<<i<<" ip "<<ip<<" l2->cltry[i][ip] "<<l2->cltry[i][ip]<< " l1->GetCluster(l2->cltry[i][ip]-1) "<<l1->GetCluster(l2->cltry[i][ip]-1)<<endl;
-//			if(t_track->xgood[ip])cout<<" i "<<i<<" ip "<<ip<<" l2->cltrx[i][ip] "<<l2->cltrx[i][ip]<< " l1->GetCluster(l2->cltrx[i][ip]-1) "<<l1->GetCluster(l2->cltrx[i][ip]-1)<<endl;
-			//-----------------------------------------------------
-			//-----------------------------------------------------
-		};
-		new(t[i]) TrkTrack(*t_track);
-		t_track->Clear();
-	};
-// *** SINGLETS ***
-	if(!SingletX)SingletX = new TClonesArray("TrkSinglet");
-	TClonesArray &sx = *SingletX;
-	for(int i=0; i<l2->nclsx; i++){
-		t_singlet->plane    = l2->planex[i];
-		t_singlet->coord[0] = l2->xs[i][0];
-		t_singlet->coord[1] = l2->xs[i][1];
-		t_singlet->sgnl     = l2->signlxs[i];
-		//-----------------------------------------------------
-//		cout << "singolo x "<<i<<"  --  "<<  l2->clsx[i] <<endl;
-		t_singlet->cls      = l1->GetCluster(l2->clsx[i]-1);
-//		cout<<" i "<<i<<" l2->clsx[i] "<<l2->clsx[i]<< " l1->GetCluster(l2->clsx[i]-1) "<<l1->GetCluster(l2->clsx[i]-1)<<endl;		
-		//-----------------------------------------------------
-		new(sx[i]) TrkSinglet(*t_singlet);
-		t_singlet->Clear();
-	}
-	if(!SingletY)SingletY = new TClonesArray("TrkSinglet");
-	TClonesArray &sy = *SingletY;
-	for(int i=0; i<l2->nclsy; i++){
-		t_singlet->plane    = l2->planey[i];
-		t_singlet->coord[0] = l2->ys[i][0];
-		t_singlet->coord[1] = l2->ys[i][1];
-		t_singlet->sgnl     = l2->signlys[i];
-		//-----------------------------------------------------
-//		cout << "singolo y "<<i<<"  --  "<<  l2->clsy[i] <<endl;
-		t_singlet->cls      = l1->GetCluster(l2->clsy[i]-1);
-//		cout<<" i "<<i<<" l2->clsy[i] "<<l2->clsy[i]<< " l1->GetCluster(l2->clsy[i]-1) "<<l1->GetCluster(l2->clsy[i]-1)<<endl;		
-		//-----------------------------------------------------
-		new(sy[i]) TrkSinglet(*t_singlet);
-		t_singlet->Clear();
-	};
-	
-	delete t_track;
-	delete t_singlet;
-}
 /**
  * Fills a struct cTrkLevel2 with values from a TrkLevel2 object (to put data into a F77 common).
  */
@@ -793,13 +1265,15 @@
 		    l2->coval[i][it2][it1] = ((TrkTrack *)Track->At(i))->coval[it1][it2];
 	    };
 	    for(int ip=0;ip<6;ip++){
-		l2->xgood_nt[i][ip] = ((TrkTrack *)Track->At(i))->xgood[ip];
-		l2->ygood_nt[i][ip] = ((TrkTrack *)Track->At(i))->ygood[ip];
+		l2->xgood_nt[i][ip] = ((TrkTrack *)Track->At(i))->XGood(ip);
+		l2->ygood_nt[i][ip] = ((TrkTrack *)Track->At(i))->YGood(ip);
 		l2->xm_nt[i][ip]    = ((TrkTrack *)Track->At(i))->xm[ip];
 		l2->ym_nt[i][ip]    = ((TrkTrack *)Track->At(i))->ym[ip];
 		l2->zm_nt[i][ip]    = ((TrkTrack *)Track->At(i))->zm[ip];
 		l2->resx_nt[i][ip]  = ((TrkTrack *)Track->At(i))->resx[ip];
 		l2->resy_nt[i][ip]  = ((TrkTrack *)Track->At(i))->resy[ip];
+		l2->tailx[i][ip]  = ((TrkTrack *)Track->At(i))->tailx[ip];
+		l2->taily[i][ip]  = ((TrkTrack *)Track->At(i))->taily[ip];
 		l2->xv_nt[i][ip]    = ((TrkTrack *)Track->At(i))->xv[ip];
 		l2->yv_nt[i][ip]    = ((TrkTrack *)Track->At(i))->yv[ip];
 		l2->zv_nt[i][ip]    = ((TrkTrack *)Track->At(i))->zv[ip];
@@ -838,6 +1312,8 @@
 void TrkLevel2::Clear(){
     for(Int_t i=0; i<12 ; i++){
 	good[i] = -1;
+	VKflag[i] = 0;
+	VKmask[i] = 0;
     };
 //    if(Track)Track->Clear("C");
 //    if(SingletX)SingletX->Clear("C");
@@ -881,7 +1357,8 @@
 	
     int indo=0;
     int indi=0;
-    while(N != 0){
+    while(N > 0){
+//    while(N != 0){
 	int nfit =0;
 	float chi2ref = numeric_limits<float>::max();
 		
@@ -892,9 +1369,9 @@
 	    }
 	}
 	//second loop to search minimum chi2 among selected
-	for(int i=0; i<this->ntrk(); i++){
+	for(int i=0; i<ntrk(); i++){
 	    Float_t chi2 = ((TrkTrack *)t[i])->chi2; 
-	    if(chi2 < 0) chi2 = chi2*1000;
+	    if(chi2 < 0) chi2 = -chi2*1000;
 	    if(    chi2 < chi2ref
 		   && ((TrkTrack *)t[i])->GetNtot() == nfit 
 		   && m[i]==1){
@@ -906,17 +1383,17 @@
 	    m[((TrkTrack *)t[indi])->image] = 0;
 	    N--;
 	
-	    //	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
+//	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
 	};
 	sorted->Add( (TrkTrack*)t[indi] );	
 		
 	m[indi] = 0;
-//		cout << "SORTED "<< indo << " "<< indi << " "<< N << endl; 
+//	cout << "SORTED "<< indo << " "<< indi << " "<< N << " "<<((TrkTrack *)t[indi])->image<<" "<<chi2ref<<endl; 
 	N--;	
 	indo++;	
     }
     m.clear();
-//	cout << "GetTracks_NFitSorted(it): Done"<< endl;
+//    cout << "GetTracks_NFitSorted(it): Done"<< endl;
 
     return sorted;
 //    return PhysicalTrack;
@@ -1066,12 +1543,47 @@
  */
 void TrkLevel2::LoadField(TString path){
 //
-    strcpy(path_.path,path.Data());
-    path_.pathlen = path.Length();
-    path_.error   = 0;
-    readb_();
+//     strcpy(path_.path,path.Data());
+//     path_.pathlen = path.Length();
+//     path_.error   = 0;
+//     readb_();
+
+    TrkParams::SetTrackingMode();
+    TrkParams::SetPrecisionFactor();
+    TrkParams::SetStepMin();
+
+    TrkParams::Set(path,1);
+    TrkParams::Load(1);
+
 //
 };
+// /**
+//  * Get BY (kGauss)
+//  * @param v (x,y,z) coordinates in cm
+//  */
+// float TrkLevel2::GetBX(float* v){
+//     float b[3];
+//     gufld_(v,b);
+//     return b[0]/10.;
+// }
+// /**
+//  * Get BY (kGauss)
+//  * @param v (x,y,z) coordinates in cm
+//  */
+// float TrkLevel2::GetBY(float* v){
+//     float b[3];
+//     gufld_(v,b);
+//     return b[1]/10.;
+// }
+// /**
+//  * Get BY (kGauss)
+//  * @param v (x,y,z) coordinates in cm
+//  */
+// float TrkLevel2::GetBZ(float* v){
+//     float b[3];
+//     gufld_(v,b);
+//     return b[2]/10.;
+// }
 //--------------------------------------
 //
 //
@@ -1249,6 +1761,11 @@
     for (int i=0; i<5; i++)      dal[i]  = (double)al[i];
     for (int i=0; i<npoint; i++) dzin[i] = (double)z[i];
 
+    TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "int Trajectory::DoTrack2(float* al) --- ERROR --- m.field not loaded"<<endl;
+	return 0;
+    }
     dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
     
     for (int i=0; i<npoint; i++){