--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/04/27 10:39:57	1.32
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/11/27 11:43:50	1.41
@@ -12,9 +12,13 @@
 extern "C" {    
     void dotrack_(int*, double*, double*, double*, double*, int*);
     void dotrack2_(int*, double*, double*, double*, double*,double*, double*, double*,int*);
-     void mini2_(int*,int*,int*); 
-     void guess_();
-     void gufld_(float*, float*);
+    void mini2_(int*,int*,int*); 
+    void guess_();
+    void gufld_(float*, float*);
+    float risxeta2_(float *);
+    float risxeta3_(float *);
+    float risxeta4_(float *);
+    float risyeta2_(float *);
 }
 
 //--------------------------------------
@@ -48,13 +52,20 @@
 	ayv[ip]    = 0;
 	dedx_x[ip] = 0;
 	dedx_y[ip] = 0;
+	multmaxx[ip] = 0; 
+	multmaxy[ip] = 0;
+	seedx[ip]  = 0;  
+	seedy[ip]  = 0;
+	xpu[ip]    = 0;   
+	ypu[ip]    = 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::SetMiniDefault();
+    TrkParams::SetPFA();
 
 };
 //--------------------------------------
@@ -87,13 +98,19 @@
 	ayv[ip]    = t.ayv[ip];
 	dedx_x[ip] = t.dedx_x[ip];
 	dedx_y[ip] = t.dedx_y[ip];
+	multmaxx[ip] = t.multmaxx[ip]; 
+	multmaxy[ip] = t.multmaxy[ip];
+	seedx[ip]    = t.seedx[ip];  
+	seedy[ip]    = t.seedy[ip];
+	xpu[ip]      = t.xpu[ip];   
+	ypu[ip]      = t.ypu[ip];   
     };
-//    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::SetMiniDefault();
+    TrkParams::SetPFA();
 
 };
 //--------------------------------------
@@ -127,11 +144,15 @@
 	t.ayv[ip]    = ayv[ip];
 	t.dedx_x[ip] = dedx_x[ip];
 	t.dedx_y[ip] = dedx_y[ip];
+	t.multmaxx[ip] = multmaxx[ip]; 
+	t.multmaxy[ip] = multmaxy[ip];
+	t.seedx[ip]    = seedx[ip];  
+	t.seedy[ip]    = seedy[ip];
+	t.xpu[ip]      = xpu[ip];   
+	t.ypu[ip]      = ypu[ip];   
 	    
     };
 
-//    t.clx = TRefArray(clx);
-//    t.cly = TRefArray(cly);
     
 };
 //--------------------------------------
@@ -351,6 +372,103 @@
     }
     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;
+    
+}
+/**
+ * Returns the effective angle, relative to the sensor, on each plane.
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Float_t TrkTrack::GetEffectiveAngle(int ip, int iv){
+
+    if(ip<0 || ip>5){
+	cout << "Float_t TrkTrack::GetEffectiveAngle(int "<<ip<<", int "<<iv<<") ==> wrong input"<<endl;
+	return 0.;
+    }
+
+    float v[3]={xv[ip],yv[ip],zv[ip]};
+    //-----------------------------------------
+    // effective angle (relative to the sensor)
+    //-----------------------------------------
+    float axv_geo  = axv[ip];
+    float muhall_h = 297.61; //cm**2/Vs
+    float BY = TrkParams::GetBY(v);
+    float axv_eff = 0;
+    if(ip==5) axv_geo = -1*axv_geo;
+    if(ip==5) BY      = -1*BY;
+    axv_eff = 180.*atan( tan(axv_geo*acos(-1.)/180.) + muhall_h * BY * 0.0001)/acos(-1.);
+    //-----------------------------------------
+    // effective angle (relative to the sensor)
+    //-----------------------------------------
+    float ayv_geo = ayv[ip];
+    float muhall_e = 1258.18; //cm**2/Vs
+    float BX = TrkParams::GetBX(v);
+    float ayv_eff = 0;
+    ayv_eff = 180.*atan( tan(ayv_geo*acos(-1.)/180.) + muhall_e * BX * 0.0001)/acos(-1.);
+  
+    if     (iv==0)return axv_eff;
+    else if(iv==1)return ayv_eff;
+    else{
+	cout << "Float_t TrkTrack::GetEffectiveAngle(int "<<ip<<", int "<<iv<<") ==> wrong input"<<endl;
+	return 0.;
+    }
+  
+};
+
 //--------------------------------------
 //
 //
@@ -372,6 +490,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]<<" ";
@@ -379,6 +499,15 @@
     cout << endl << "           "; for(int i=0; i<5; i++)cout << coval[4][i]<<" ";
     cout << endl << "dedx_x   : "; for(int i=0; i<6; i++)cout << dedx_x[i] << " ";
     cout << endl << "dedx_y   : "; for(int i=0; i<6; i++)cout << dedx_y[i] << " ";
+    cout << endl << "maxs x   : "; for(int i=0; i<6; i++)cout << GetClusterX_MaxStrip(i) << " ";
+    cout << endl << "maxs y   : "; for(int i=0; i<6; i++)cout << GetClusterY_MaxStrip(i) << " ";
+    cout << endl << "mult x   : "; for(int i=0; i<6; i++)cout << GetClusterX_Multiplicity(i) << " ";
+    cout << endl << "mult y   : "; for(int i=0; i<6; i++)cout << GetClusterY_Multiplicity(i) << " ";
+    cout << endl << "seed x   : "; for(int i=0; i<6; i++)cout << GetClusterX_Seed(i) << " ";
+    cout << endl << "seed y   : "; for(int i=0; i<6; i++)cout << GetClusterY_Seed(i) << " ";
+    cout << endl << "xpu      : "; for(int i=0; i<6; i++)cout << xpu[i] << " ";
+    cout << endl << "ypu      : "; for(int i=0; i<6; i++)cout << ypu[i] << " ";
+
     cout << endl;
 }
 /**
@@ -397,10 +526,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){
-    // NB! si perdera` l'informazione sul numero del cluster
+
     for(int i=0; i<6; i++) xgood[i]=*xg++;
     for(int i=0; i<6; i++) ygood[i]=*yg++;
 }
@@ -415,6 +623,11 @@
 //     path_.error   = 0;
 //     readb_();
 
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
+
     TrkParams::Set(path,1);
     TrkParams::Load(1);
 
@@ -428,8 +641,8 @@
 
     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);
 	
@@ -455,6 +668,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]; 
@@ -486,16 +701,109 @@
     
 }
 /**
- * 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, the minimum number of step, etc.
+ * @see SetTrackingMode(int)
+ * @see SetPrecisionFactor(double)
+ * @see SetStepMin(int)
+ * @see SetDeltaB(int,double)
  */
-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_();
 
@@ -514,11 +822,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;
-    }
+//     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);
@@ -529,66 +837,75 @@
     //  ------------------------------------------
     
     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 factor scale for tracking precision 
+/**
+ * Set the minimum number of steps for tracking precision 
  */
 void TrkTrack::SetStepMin(int istepmin){
     extern cMini2track track_;
     track_.istepmin = istepmin;
 }
+/**
+ * Set deltaB parameters (id=0,1). By default they are set to zero.
+ */
+void TrkTrack::SetDeltaB(int id, double db){
+    if(id!=0 && id!=1)cout << "void TrkTrack::SetDeltaB(int id,double db) -- wrong input parameters: "<<id<<" "<<db<<endl;
+    TrkParams::SetDeltaB(id,db);
+}
 
-
-/*
+/**
+ * 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)
@@ -596,7 +913,7 @@
 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)
@@ -604,7 +921,8 @@
 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)
@@ -614,7 +932,7 @@
     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)
@@ -625,6 +943,32 @@
     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];
+};
 
 //--------------------------------------
 //
@@ -761,23 +1105,51 @@
 	
 	//
     cout << endl << endl << "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-";
-    cout << endl << "good     : "; for(int i=0; i<12; i++) cout << good[i]<<" ";
-    cout << endl << "ntrk()   : " << this->ntrk() ;
-    cout << endl << "nclsx()  : " << this->nclsx();
-    cout << endl << "nclsy()  : " << this->nclsy();
+    cout << endl << "good     : "; for(int i=0; i<12; i++) cout << hex <<" 0x"<< good[i]<<dec;
+    cout << endl << "ntrk()   : " << ntrk() ;
+    cout << endl << "nclsx()  : " << nclsx();
+    cout << endl << "nclsy()  : " << nclsy();
     if(Track){
 	TClonesArray &t  = *Track;
 	for(int i=0; i<ntrk(); i++)     ((TrkTrack *)t[i])->Dump();
     }	    
-    if(SingletX){
-	TClonesArray &sx = *SingletX;
-	for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
-    }
-    if(SingletY){
-	TClonesArray &sy = *SingletY;
-	for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
-    }
+//     if(SingletX){
+// 	TClonesArray &sx = *SingletX;
+// 	for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
+//     }
+//     if(SingletY){
+// 	TClonesArray &sy = *SingletY;
+// 	for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
+//     }
+    cout << endl;
 }
+/**
+ * \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);
+
+};
+
+
 //--------------------------------------
 //
 //
@@ -893,6 +1265,12 @@
 	    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->multmaxx[ip] = l2->multmaxx[i][ip]; 
+	    t_track->multmaxy[ip] = l2->multmaxy[i][ip];
+	    t_track->seedx[ip]  = l2->seedx[i][ip];  
+	    t_track->seedy[ip]  = l2->seedy[i][ip];
+	    t_track->xpu[ip]    = l2->xpu[i][ip];   
+	    t_track->ypu[ip]    = l2->ypu[i][ip];   
 	    //-----------------------------------------------------
 	    //-----------------------------------------------------
 	    //-----------------------------------------------------
@@ -1245,38 +1623,43 @@
 //     path_.error   = 0;
 //     readb_();
 
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
+
     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.;
-}
+// /**
+//  * 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.;
+// }
 //--------------------------------------
 //
 //