--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/05/24 13:29:09	1.34
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/01/22 08:55:07	1.43
@@ -52,17 +52,19 @@
 	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::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
     TrkParams::SetPFA();
 
 };
@@ -96,17 +98,18 @@
 	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::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor(); 
+//     TrkParams::SetStepMin();   
+    TrkParams::SetMiniDefault();
     TrkParams::SetPFA();
 
 };
@@ -141,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);
     
 };
 //--------------------------------------
@@ -365,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.;
+    }
+  
+};
+
 //--------------------------------------
 //
 //
@@ -395,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;
 }
 /**
@@ -510,9 +623,10 @@
 //     path_.error   = 0;
 //     readb_();
 
-    TrkParams::SetTrackingMode();
-    TrkParams::SetPrecisionFactor();
-    TrkParams::SetStepMin();
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
@@ -611,12 +725,12 @@
  *
  * @see TrkParams::SetPFA(int)
  */
-void TrkTrack::EvaluateClusterPositions(){
+Bool_t TrkTrack::EvaluateClusterPositions(){
     
-//     cout << "void TrkTrack::GetClusterPositions() "<<endl;
+//     cout << "void TrkTrack::GetClusterositions() "<<endl;
 
     TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return;
+    if( !TrkParams::IsLoaded() )return false;
     
     for(int ip=0; ip<6; ip++){
 //	cout << ip<<" ** "<<xm[ip]<<" / "<<ym[ip]<<endl;;
@@ -635,7 +749,9 @@
 	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.
@@ -659,10 +775,11 @@
  * @see EvaluateClusterPositions()
  *
  * The fitting procedure can be varied by changing the tracking mode, 
- * the fit-precision factor and the minimum number of step.
+ * 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, int froml1){
 
@@ -673,9 +790,19 @@
 
     extern cMini2track track_;
     fail = 0;
+
     FillMiniStruct(track_);
-    
-    if(froml1!=0)EvaluateClusterPositions();
+        
+    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_();
@@ -754,8 +881,30 @@
     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(acos(-1.0)*axv[0]/180.);
+    ymagntop = yv[0] + (ZMAGNHIGH-zv[0])*tan(acos(-1.0)*ayv[0]/180.);
+    xmagnbottom = xv[5] + (ZMAGNLOW-zv[5])*tan(acos(-1.0)*axv[5]/180.);
+    ymagnbottom = yv[5] + (ZMAGNLOW-zv[5])*tan(acos(-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.
@@ -772,6 +921,7 @@
 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.
@@ -820,6 +970,222 @@
     if(bad)ygood[ip]=-ygood[ip];
 };
 
+/**
+ * \brief Average X
+ * Average value of <xv>, evaluated from the first to the last hit x view.
+ */
+Float_t TrkTrack::GetXav(){
+ 
+    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){
+	return -100;
+    }
+    if( last_plane-first_plane+1 ==0 )return -100;
+
+    Float_t av = 0;    
+    for(int ip=first_plane; ip<=last_plane; ip++)av+=xv[ip];
+    
+    return (av/(last_plane-first_plane+1));    
+}
+/**
+ * \brief Average Y
+ * Average value of <yv>, evaluated from the first to the last hit x view.
+ */
+Float_t TrkTrack::GetYav(){
+
+    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){
+	return -100;
+    }
+    if( last_plane-first_plane+1 ==0 )return -100;
+
+    Float_t av = 0;    
+    for(int ip=first_plane; ip<=last_plane; ip++)av+=yv[ip];
+ 
+    return (av/(last_plane-first_plane+1));    
+}
+/**
+ * \brief Average Z
+ * Average value of <zv>, evaluated from the first to the last hit x view.
+ */
+Float_t TrkTrack::GetZav(){
+
+    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){
+	return -100;
+    }
+    if( last_plane-first_plane+1 ==0 )return -100;
+
+    Float_t av = 0;    
+    for(int ip=first_plane; ip<=last_plane; ip++)av+=zv[ip];
+    
+    return (av/(last_plane-first_plane+1));    
+}
+
+/**
+ * \brief Number of column traversed
+ */
+Int_t TrkTrack::GetNColumns(){
+    int sensors[] = {0,0,0,0,0,0};
+    for(int ip=0; ip<6; ip++){
+	int sensorid = GetLadder(ip)+3*GetSensor(ip);    
+	if(XGood(ip)||YGood(ip))
+	    if(sensorid>=0 && sensorid<6)sensors[sensorid]=1;
+    }
+    int nsensors=0;
+    for(int is=0; is<6; is++)nsensors += sensors[is];
+    return nsensors;
+};
+/**
+ * \brief Give the maximum energy release 
+ */
+Float_t TrkTrack::GetDEDX_max(int ip, int iv){
+    Float_t max=0;
+    int pfrom = 0;
+    int pto   = 6;
+    int vfrom = 0;
+    int vto   = 2;
+    if(ip>=0&&ip<6){
+	pfrom = ip;
+	pto   = ip+1;
+    }
+    if(iv>=0&&iv<2){
+	vfrom = iv;
+	vto   = iv+1;
+    }
+    for(int i=pfrom; i<pto; i++)
+	for(int j=0; j<vto; j++)
+	    if(GetDEDX(i,j)>max)max=GetDEDX(i,j);
+
+    return max;
+
+};
+
+/**
+ * \brief Give the minimum energy release 
+ */
+Float_t TrkTrack::GetDEDX_min(int ip, int iv){
+    Float_t min=100000000;
+    int pfrom = 0;
+    int pto   = 6;
+    int vfrom = 0;
+    int vto   = 2;
+    if(ip>=0&&ip<6){
+	pfrom = ip;
+	pto   = ip+1;
+    }
+    if(iv>=0&&iv<2){
+	vfrom = iv;
+	vto   = iv+1;
+    }
+    for(int i=pfrom; i<pto; i++)
+	for(int j=0; j<vto; j++)
+	    if(GetDEDX(i,j)<min)min=GetDEDX(i,j);
+
+    return min;
+
+};
+
+/**
+ * \brief Give the maximum spatial residual release 
+ */
+Float_t TrkTrack::GetResidual_max(int ip, int iv){
+    Float_t max=0;
+    int pfrom = 0;
+    int pto   = 6;
+    int vfrom = 0;
+    int vto   = 2;
+    if(ip>=0&&ip<6){
+	pfrom = ip;
+	pto   = ip+1;
+    }
+    if(iv>=0&&iv<2){
+	vfrom = iv;
+	vto   = iv+1;
+    }
+    for(int i=pfrom; i<pto; i++){
+	for(int j=0; j<vto; j++){
+ 	    if(j==0 && XGood(i) && fabs(xm[i]-xv[i])>fabs(max))max=xv[i]-xm[i];
+ 	    if(j==1 && YGood(i) && fabs(ym[i]-yv[i])>fabs(max))max=yv[i]-ym[i];
+	}
+    }
+    return max;
+
+};
+
+
+/**
+ * \brief Give the maximum multiplicity on the x view 
+ */
+Int_t TrkTrack::GetClusterX_Multiplicity_max(){
+    int max=0;
+    for(int ip=0; ip<6; ip++)
+	if(GetClusterX_Multiplicity(ip)>max)max=GetClusterX_Multiplicity(ip);
+    return max;
+};
+/**
+ * \brief Give the minimum multiplicity on the x view 
+ */
+Int_t TrkTrack::GetClusterX_Multiplicity_min(){
+    int min=50;
+    for(int ip=0; ip<6; ip++)
+	if(GetClusterX_Multiplicity(ip)<min)min=GetClusterX_Multiplicity(ip);
+    return min;
+};
+/**
+ * \brief Give the maximum multiplicity on the x view 
+ */
+Int_t TrkTrack::GetClusterY_Multiplicity_max(){
+    int max=0;
+    for(int ip=0; ip<6; ip++)
+	if(GetClusterY_Multiplicity(ip)>max)max=GetClusterY_Multiplicity(ip);
+    return max;
+};
+/**
+ * \brief Give the minimum multiplicity on the x view 
+ */
+Int_t TrkTrack::GetClusterY_Multiplicity_min(){
+    int min=50;
+    for(int ip=0; ip<6; ip++)
+	if(GetClusterY_Multiplicity(ip)<min)min=GetClusterY_Multiplicity(ip);
+    return min;
+};
+
+/**
+ * \brief Give the minimum seed on the x view 
+ */
+Float_t TrkTrack::GetClusterX_Seed_min(){
+    Float_t min=100000;
+    for(int ip=0; ip<6; ip++)
+	if(XGood(ip) && GetClusterX_Seed(ip)<min)min=GetClusterX_Seed(ip);
+    return min;
+};
+/**
+ * \brief Give the minimum seed on the x view 
+ */
+Float_t TrkTrack::GetClusterY_Seed_min(){
+    Float_t min=100000;
+    for(int ip=0; ip<6; ip++)
+	if(YGood(ip) && GetClusterY_Seed(ip)<min)min=GetClusterY_Seed(ip);
+    return min;
+};
+
+
 //--------------------------------------
 //
 //
@@ -955,23 +1321,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);
+
+};
+
+
 //--------------------------------------
 //
 //
@@ -1087,6 +1481,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];   
 	    //-----------------------------------------------------
 	    //-----------------------------------------------------
 	    //-----------------------------------------------------
@@ -1301,8 +1701,8 @@
 TrkTrack *TrkLevel2::GetStoredTrack(int is){
 
     if(is >= this->ntrk()){
-	cout << "** TrkLevel2 ** Track "<< is << "doen not exits! " << endl; 
-	cout << "                Stored tracks ntrk() = "<< this->ntrk() << endl;
+	cout << "TrkTrack *TrkLevel2::GetStoredTrack(int) >> Track "<< is << "doen not exits! " << endl; 
+	cout << "Stored tracks ntrk() = "<< this->ntrk() << endl;
 	return 0;
     }
     if(!Track){
@@ -1323,8 +1723,8 @@
 TrkSinglet *TrkLevel2::GetSingletX(int is){
 
 	if(is >= this->nclsx()){
-		cout << "** TrkLevel2 ** Singlet "<< is << "doen not exits! " << endl; 
-		cout << "                Stored x-singlets nclsx() = "<< this->nclsx() << endl;
+		cout << "TrkSinglet *TrkLevel2::GetSingletX(int) >> Singlet "<< is << "doen not exits! " << endl; 
+		cout << "Stored x-singlets nclsx() = "<< this->nclsx() << endl;
 		return 0;
 	}
 	if(!SingletX)return 0;
@@ -1343,8 +1743,8 @@
 TrkSinglet *TrkLevel2::GetSingletY(int is){
 
 	if(is >= this->nclsy()){
-		cout << "** TrkLevel2 ** Singlet "<< is << "doen not exits! " << endl; 
-		cout << "                Stored y-singlets nclsy() = "<< this->nclsx() << endl;
+		cout << "TrkSinglet *TrkLevel2::GetSingletY(int) >> Singlet "<< is << "doen not exits! " << endl; 
+		cout << "Stored y-singlets nclsx() = "<< this->nclsx() << endl;
 		return 0;
 	}
 	if(!SingletY)return 0;
@@ -1364,8 +1764,8 @@
 TrkTrack *TrkLevel2::GetTrack(int it){
     
 	if(it >= this->GetNTracks()){
-		cout << "** TrkLevel2 ** Track "<< it << "does not exits! " << endl; 
-		cout << "                Physical tracks GetNTracks() = "<< this->ntrk() << endl;
+		cout << "TrkTrack *TrkLevel2::GetTrack(int) >> Track "<< it << "does not exits! " << endl; 
+		cout << "Physical tracks GetNTracks() = "<< this->ntrk() << endl;
 		return 0;
 	}
 	
@@ -1402,8 +1802,8 @@
 TrkTrack *TrkLevel2::GetTrackImage(int it){
 
     if(it >= this->GetNTracks()){
-	cout << "** TrkLevel2 ** Track "<< it << "does not exits! " << endl; 
-	cout << "                Physical tracks GetNTracks() = "<< this->ntrk() << endl;
+	cout << "TrkTrack *TrkLevel2::GetTrackImage(int) >> Track "<< it << "does not exits! " << endl; 
+	cout << "Physical tracks GetNTracks() = "<< this->ntrk() << endl;
 	return 0;
     }
 	
@@ -1412,7 +1812,7 @@
     TrkTrack *track = (TrkTrack*)sorted->At(it);
 	
     if(!track->HasImage()){
-	cout << "** TrkLevel2 ** Track "<< it << "does not have image! " << endl; 
+	cout << "TrkTrack *TrkLevel2::GetTrackImage(int) >> Track "<< it << "does not have image! " << endl; 
 	return 0;
     }
     if(!Track)return 0;
@@ -1439,9 +1839,10 @@
 //     path_.error   = 0;
 //     readb_();
 
-    TrkParams::SetTrackingMode();
-    TrkParams::SetPrecisionFactor();
-    TrkParams::SetStepMin();
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);