--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/03/22 08:32:50	1.45
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2014/06/04 07:57:04	1.57
@@ -12,6 +12,7 @@
 extern "C" {    
     void dotrack_(int*, double*, double*, double*, double*, int*);
     void dotrack2_(int*, double*, double*, double*, double*,double*, double*, double*,int*);
+    void dotrack3_(int*, double*, double*, double*, double*,double*, double*, double*,double*,int*);
     void mini2_(int*,int*,int*); 
     void guess_();
     void gufld_(float*, float*);
@@ -177,60 +178,33 @@
 //
 //--------------------------------------
 /**
- * Evaluates the trajectory in the apparatus associated to the track. 
- * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.  
- * @param t pointer to an object of the class Trajectory, 
- * which z coordinates should be previously initialized by calling the proper constructor ( Trajectory::Trajectory(int n, float* zin) ).
- * @return error flag.
  *
- * >>> OBSOLETE !!! use TrkTrack::DoTrack2(Trajectory* t) instead
+ * >>> OBSOLETE !!! use TrkTrack::DoTrack(Trajectory* t) instead
  *
  */
-int TrkTrack::DoTrack(Trajectory* t){
-
-    cout << " int TrkTrack::DoTrack(Trajectory* t) --->> OBSOLETE !!! "<<endl;
-    cout << " use int TrkTrack::DoTrack2(Trajectory* t)"<<endl;
-
-    double *dxout = new double[t->npoint];
-    double *dyout = new double[t->npoint];
-    double *dzin = new double[t->npoint];
-    double dal[5];
-
-    int ifail = 0;
-
-    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];
+int TrkTrack::DoTrack2(Trajectory* t){
 
-    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++){
-	t->x[i] = (float)*(dxout+i);
-	t->y[i] = (float)*(dyout+i);
-    }
+    cout << endl;
+    cout << " int TrkTrack::DoTrack2(Trajectory* t) --->> NB NB !! this method is going to be eliminated !!! "<<endl;
+    cout << " >>>> replace it with TrkTrack::DoTrack(Trajectory* t) <<<<"<<endl;
+    cout << " (Sorry Wolfgang!! Don't be totally confused!! By Elena)"<<endl;
+    cout << endl;
 
-    delete [] dxout;
-    delete [] dyout;
-    delete [] dzin;
+    return DoTrack(t);
 
-    return ifail;
 };
 //--------------------------------------
 //
 //
 //--------------------------------------
 /**
- * Evaluates the trajectory in the apparatus associated to the track. 
- * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.  
+ * Evaluates the trajectory in the apparatus associated to the track state-vector. 
+ * It integrates the equations of motion in the magnetic field. 
  * @param t pointer to an object of the class Trajectory, 
- * which z coordinates should be previously initialized by calling the proper constructor ( Trajectory::Trajectory(int n, float* zin) ).
+ * which z coordinates should be previously assigned.
  * @return error flag.
  */
-int TrkTrack::DoTrack2(Trajectory* t){
+int TrkTrack::DoTrack(Trajectory* t){
 
     double *dxout   = new double[t->npoint];
     double *dyout   = new double[t->npoint];
@@ -247,7 +221,7 @@
 
     TrkParams::Load(1);
     if( !TrkParams::IsLoaded(1) ){
-	cout << "int TrkTrack::DoTrack2(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
+	cout << "int TrkTrack::DoTrack(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
 	return 0;
     }
     dotrack2_(&(t->npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
@@ -400,6 +374,31 @@
     return (last_plane-first_plane+1);
 }
 /**
+ * Returns the track "lever-arm" on the x+y view, defined as the distance (in planes) between 
+ * the upper and lower x,y (couple) measurements (the maximum value of lever-arm is 6). 
+ */
+Int_t TrkTrack::GetLeverArmXY(){
+    int first_plane = -1;
+    int last_plane  = -1;
+    for(Int_t ip=0; ip<6; ip++){
+	if( XGood(ip)*YGood(ip) && first_plane == -1 )first_plane = ip;
+	if( XGood(ip)*YGood(ip) && first_plane != -1 )last_plane = ip;
+    }
+    if( first_plane == -1 || last_plane == -1){
+	cout<< "Int_t TrkTrack::GetLeverArmXY() -- XGood(ip)*YGood(ip) always false ??? "<<endl; 
+	return 0;
+    }
+    return (last_plane-first_plane+1);
+}
+/**
+ * Returns the number of hit planes
+ */
+Int_t TrkTrack::GetNhit()  {
+  int np=0;
+  for(Int_t ip=0; ip<6; ip++) np += (XGood(ip)||YGood(ip)) ;
+  return np;
+};
+/**
  * Returns the reduced chi-square of track x-projection
  */
 Float_t  TrkTrack::GetChi2X(){
@@ -610,7 +609,7 @@
 		   4.52043,
 		   4.29926};
     int index;
-    float fact;
+    float fact=0.;
     for(int i=0; i<6; i++) {
 	index = int((fabs(axv[i])+1.)/2.);
 	if(index>10) index=10;
@@ -657,6 +656,9 @@
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "void TrkTrack::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+    }
 
 };
 
@@ -670,36 +672,79 @@
 
 // 	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.xgood[i] = (double) XGood(i);
+	track.ygood[i] = (double) YGood(i);
 	
-	track.xm[i]=xm[i];
-	track.ym[i]=ym[i];
-	track.zm[i]=zm[i];
+	track.xm[i]= (double) xm[i];
+	track.ym[i]= (double) ym[i];
+	track.zm[i]= (double) zm[i];
 	
 //      --- temporaneo ----------------------------
-//      andrebbe inserita la dimensione del sensore
-	float segment = 100.;
-	track.xm_a[i]=xm[i];
-	track.xm_b[i]=xm[i];
-	track.ym_a[i]=ym[i];
-	track.ym_b[i]=ym[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)){
-	    track.xm_a[i] = track.xm_a[i]+segment;
-	    track.xm_b[i] = track.xm_b[i]-segment;
-	}
+// 	float segment = 100.;
+// 	track.xm_a[i]=xm[i];
+// 	track.xm_b[i]=xm[i];
+// 	track.ym_a[i]=ym[i];
+// 	track.ym_b[i]=ym[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)){
+// 	    track.xm_a[i] = track.xm_a[i]+segment;
+// 	    track.xm_b[i] = track.xm_b[i]-segment;
+// 	}
 //      --- temporaneo ----------------------------
+
+	if( XGood(i) || YGood(i) ){
+	    //NB!! the length of the sensor is not exactely taken into account	   
+	    double segment = 7.;// 2.;//cm //Elena 10th
+	    // NB: i parametri di allineamento hanno una notazione particolare!!!
+	    // sensor = 0 (hybrid side), 1 
+	    // ladder = 0-2 (increasing x)
+	    // plane  = 0-5 (from bottom to top!!!) 
+	    int is = (int)GetSensor(i); if(i==5)is=1-is;
+	    int ip = 5-i;
+	    int il = (int)GetLadder(i);
+	    
+	    double omega   = 0.; 
+            //	    double beta    = 0.;// EM GCC 4.7
+            //	    double gamma   = 0.;
+	    if( 
+		(is < 0 || is > 1 || ip < 0 || ip > 5 || il < 0 || il > 2) &&
+		true){
+		// se il piano risulta colpito, ladder e sensore devono essere 
+		// assegnati correttamente
+		cout << " void TrkTrack::FillMiniStruct(cMini2track&) --- WARNING --- sensor not defined, cannot read alignment parameters "<<endl;
+		cout << " is ip il = "<<is<<" "<<ip<<" "<<il<<endl;
+	    }else{
+		omega   = alignparameters_.omega[is][il][ip];
+                //		beta    = alignparameters_.beta[is][il][ip];// EM GCC 4.7 unused
+                //		gamma   = alignparameters_.gamma[is][il][ip];// EM GCC 4.7 unused
+	    }
+	    
+	    if(       XGood(i) && !YGood(i) ){
+		track.xm_a[i] =  (double) xm[i] - omega * segment;
+		track.ym_a[i] =  (double) ym[i] + segment;
+//	    track.zm_a[i] = zm[i] + beta * segment;//not used yet
+		track.xm_b[i] =  (double) xm[i] + omega * segment;
+		track.ym_b[i] =  (double) ym[i] - segment;
+//	    track.zm_b[i] = zm[i] - beta * segment;//not used yet
+	    }else if( !XGood(i) && YGood(i) ){
+		track.xm_a[i] =  (double) xm[i] + segment;
+		track.ym_a[i] =  (double) ym[i] + omega * segment;
+//	    track.zm_a[i] = zm[i] - gamma * segment;//not used yet
+		track.xm_b[i] =  (double) xm[i] - segment;
+		track.ym_b[i] =  (double) ym[i] - omega * segment;
+//	    track.zm_b[i] = zm[i] + gamma * segment;//not used yet
+	    }
+	}
 	
-	track.resx[i]=resx[i];
-	track.resy[i]=resy[i];
-	track.tailx[i]=tailx[i];
-	track.taily[i]=taily[i];
+       	track.resx[i]= (double) resx[i];
+	track.resy[i]= (double) resy[i];
+	track.tailx[i]= (double) tailx[i];
+	track.taily[i]= (double) taily[i];
     }
 
-    for(int i=0; i<5; i++) track.al[i]=al[i]; 
+    for(int i=0; i<5; i++) track.al[i]= (double) al[i]; 
     track.zini = 23.5; 
 // ZINI = 23.5 !!! it should be the same parameter in all codes
     
@@ -710,20 +755,22 @@
 void TrkTrack::SetFromMiniStruct(cMini2track *track){
 
     for(int i=0; i<5; i++) {
-	al[i]=track->al[i];
-	for(int j=0; j<5; j++) coval[i][j]=track->cov[i][j];
+      al[i]= (float) (track->al[i]);
+	for(int j=0; j<5; j++) coval[i][j]= (float) (track->cov[i][j]);
     }
-    chi2  = track->chi2;
-    nstep = track->nstep;
+    chi2  =  (float) (track->chi2);
+    nstep =  (float) (track->nstep);
     for(int i=0; i<6; i++){ 
-	xv[i]  = track->xv[i];
-	yv[i]  = track->yv[i];
-	zv[i]  = track->zv[i];
-	xm[i]  = track->xm[i];
-	ym[i]  = track->ym[i];
-	zm[i]  = track->zm[i];
-	axv[i] = track->axv[i];
-	ayv[i] = track->ayv[i];	
+	xv[i]  =  (float) (track->xv[i]);
+	yv[i]  =  (float) (track->yv[i]);
+	zv[i]  =  (float) (track->zv[i]);
+	xm[i]  = (float)  (track->xm[i]);
+	ym[i]  =  (float) (track->ym[i]);
+	zm[i]  =  (float) (track->zm[i]);
+	axv[i] =  (float) (track->axv[i]);
+	ayv[i] =  (float) (track->ayv[i]);	
+	resx[i] = (float)  (track->resx[i]); //Elena 10th
+	resy[i] =  (float) (track->resy[i]);
     }
     
 }
@@ -756,13 +803,26 @@
     
 //     cout << "void TrkTrack::GetClusterositions() "<<endl;
 
-    TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return false;
-    
+    TrkParams::Load(1); 
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- m.field not loaded "<<endl;
+	return false;
+    }    
+    TrkParams::Load(4); 
+    if( !TrkParams::IsLoaded(4) ){
+	cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- p.f.a. par. not loaded "<<endl;
+	return false;
+    }
+    TrkParams::Load(5); 
+    if( !TrkParams::IsLoaded(5) ){
+	cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- alignment par. not loaded "<<endl;
+	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 icx = GetClusterX_ID(ip)+1;//0=no-cluster,1-N
+	int icy = GetClusterY_ID(ip)+1;//0=no-cluster,1-N
 	int sensor = GetSensor(ip)+1;//<< convenzione "Paolo"
 	if(ip==5 && sensor!=0)sensor=3-sensor;//<< convenzione "Elena"
 	int ladder = GetLadder(ip)+1;
@@ -776,7 +836,7 @@
 	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;
+	//	if(icx<0 || icy<0)return false;
     }
     return true;
 }
@@ -810,15 +870,23 @@
  */
 void TrkTrack::Fit(double pfixed, int& fail, int iprint, int froml1){
 
-    float al_ini[] = {0.,0.,0.,0.,0.};
+    TrkParams::Load(1); 
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "void TrkTrack::Fit(double,int&,int,int) ---ERROR--- m.field not loaded "<<endl;
+	return;
+    }
+    TrkParams::Load(5); 
+    if( !TrkParams::IsLoaded(5) ){
+	cout << "void TrkTrack::Fit(double,int&,int,int) ---ERROR--- align.param. not loaded "<<endl;
+	return;
+    }
 
-    TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return;
+    float al_ini[] = {0.,0.,0.,0.,0.};
 
     extern cMini2track track_;
     fail = 0;
 
-    FillMiniStruct(track_);
+    //    FillMiniStruct(track_);
         
     if(froml1!=0){
 	if( !EvaluateClusterPositions() ){
@@ -849,11 +917,7 @@
 
     //  ------------------------------------------
     //  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);
@@ -861,6 +925,11 @@
 	if(iprint)cout << "ERROR: ifail= " << ifail << endl;
 	fail = 1;
     }
+    if(chi2!=chi2){
+	if(iprint)cout << "ERROR: chi2= " << chi2 << endl;	
+	FitReset();
+	fail = 1;	
+    }
     //  ------------------------------------------
     
     SetFromMiniStruct(&track_);
@@ -966,21 +1035,89 @@
  * by the intersection among magnet cavity, silicon-plane sensitive area and 
  * ToF sensitive area (nominal values from the official document used to 
  * calculate the geometrical factor)
+ * @param toll Tolerance around the nominal volume (toll>0 define an inner fiducial volume)
  */
-Bool_t TrkTrack::IsInsideAcceptance(){
+// Bool_t TrkTrack::IsInsideAcceptance(){
+
+//     int ngf = TrkParams::nGF;
+//     for(int i=0; i<ngf; i++){
+// 	if( 
+// 	    xGF[i] <= TrkParams::xGF_min[i] ||
+// 	    xGF[i] >= TrkParams::xGF_max[i] ||
+// 	    yGF[i] <= TrkParams::yGF_min[i] ||
+// 	    yGF[i] >= TrkParams::yGF_max[i] ||
+// 	    false)return false;
+//     }
+//     return true;
+
+// }
+Bool_t TrkTrack::IsInsideAcceptance(float toll){
+
 
     int ngf = TrkParams::nGF;
     for(int i=0; i<ngf; i++){
+	//
+//	cout << endl << TrkParams::GF_element[i];
+	if( 
+	    TrkParams::GF_element[i].CompareTo("S11") &&
+	    TrkParams::GF_element[i].CompareTo("S12") &&
+	    TrkParams::GF_element[i].CompareTo("S21") &&
+	    TrkParams::GF_element[i].CompareTo("S22") &&
+	    TrkParams::GF_element[i].CompareTo("T1")  &&
+	    TrkParams::GF_element[i].CompareTo("CUF") &&
+	    TrkParams::GF_element[i].CompareTo("T2")  &&
+	    TrkParams::GF_element[i].CompareTo("T3")  &&
+	    TrkParams::GF_element[i].CompareTo("T4")  &&
+	    TrkParams::GF_element[i].CompareTo("T5")  &&
+	    TrkParams::GF_element[i].CompareTo("CLF") &&
+	    TrkParams::GF_element[i].CompareTo("T6")  &&
+	    TrkParams::GF_element[i].CompareTo("S31") &&
+	    TrkParams::GF_element[i].CompareTo("S32") &&
+	    true)continue;
+	// apply condition only within the cavity
+//	cout << " -- "<<xGF[i]<<" "<<yGF[i];
 	if( 
-	    xGF[i] <= TrkParams::xGF_min[i] ||
-	    xGF[i] >= TrkParams::xGF_max[i] ||
-	    yGF[i] <= TrkParams::yGF_min[i] ||
-	    yGF[i] >= TrkParams::yGF_max[i] ||
-	    false)return false;
+	    xGF[i] <= TrkParams::xGF_min[i] + toll ||
+	    xGF[i] >= TrkParams::xGF_max[i] - toll ||
+	    yGF[i] <= TrkParams::yGF_min[i] + toll ||
+	    yGF[i] >= TrkParams::yGF_max[i] - toll ||
+	    false){
+	    
+	    return false;
+	}
     }
     return true;
+}
+
+/**
+ * Returns true if the track is inside one of the surfaces which define the 
+ * geometrical acceptance.
+ * @param surf tag of the surface (possible values are: S11 S12 S21 S22 T1 
+ * CUF T2 T3 T4 T5 CLF T6 S31 S32).
+ * @param toll  Tolerance around the nominal surface (toll>0 define an inner 
+ * fiducial surface)
+*/
+Bool_t TrkTrack::IsInsideGFSurface(const char* surf, float toll){
+
+
+    int ngf = TrkParams::nGF;
+    bool SURFOK = false;
+    for(int i=0; i<ngf; i++){
+	if(  !TrkParams::GF_element[i].CompareTo(surf)	){
+	    SURFOK=true;
+	    if( 
+		xGF[i] > TrkParams::xGF_min[i] + toll &&
+		xGF[i] < TrkParams::xGF_max[i] - toll &&
+		yGF[i] > TrkParams::yGF_min[i] + toll &&
+		yGF[i] < TrkParams::yGF_max[i] - toll &&
+		true)return true;
+	}
+    }
+    if( !SURFOK )cout << " Bool_t TrkTrack::IsInsideGFSurface(char* surf, float toll) --> suface "<<surf<<" not defined "<<endl;
+    return false;
 
 }
+
 /**
  * Method to retrieve ID (0,1,...) of x-cluster (if any) associated to this track.
  * If no cluster is associated, ID=-1.
@@ -999,7 +1136,7 @@
 };
 
 /**
- * Method to retrieve the ladder (0-4, increasing x) traversed by the track on this plane.
+ * Method to retrieve the ladder (0-2, 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)
  */
@@ -1022,27 +1159,35 @@
 /**
  * \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) 
+ * @param clid Cluster ID (0 = no-cluster, 1,2,... otherwise )
+ * @param il Ladder (0-2, increasing x, -1 if no sensitive area is hit) 
+ * @param is Sensor (0-1, increasing y, -1 if no sensitive area is hit) 
+ * @param bad True if the cluster contains bad strips  
  * @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;
+void TrkTrack::SetXGood(int ip, int clid, int il, int is, bool bad){
+//    int il=0;       //ladder (temporary)
+//    bool bad=false; //ladder (temporary)
+    if(ip<0||ip>5||clid<1||il<-1||il>2||is<-1||is>1)
+	cout << " void TrkTrack::SetXGood(int,int,int,int,bool) --> MA SEI DI COCCIO?!?!"<<endl;
+    xgood[ip]=(il+1)*100000000+(is+1)*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)
+ * @param clid Cluster ID (0 = no-cluster, 1,2,... otherwise )
+ * @param il Ladder (0-2, increasing x, -1 if no sensitive area is hit) 
+ * @param is Sensor (0-1, increasing y, -1 if no sensitive area is hit) 
+ * @param bad True if the cluster contains bad strips  
  * @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;
+void TrkTrack::SetYGood(int ip, int clid, int il, int is, bool bad){
+//    int il=0;       //ladder (temporary)
+//    bool bad=false; //ladder (temporary)
+    if(ip<0||ip>5||clid<1||il<-1||il>2||is<-1||is>1)
+	cout << " void TrkTrack::SetYGood(int,int,int,int,bool) --> MA SEI DI COCCIO?!?!"<<endl;
+    ygood[ip]=(il+1)*100000000+(is+1)*10000000+clid;
     if(bad)ygood[ip]=-ygood[ip];
 };
 
@@ -1145,9 +1290,10 @@
 	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);
-
+	for(int j=vfrom; j<vto; j++){
+	    if(j==0 && XGood(i) && GetDEDX(i,j)>max)max=GetDEDX(i,j);
+	    if(j==1 && YGood(i) && GetDEDX(i,j)>max)max=GetDEDX(i,j);
+	}
     return max;
 
 };
@@ -1170,15 +1316,16 @@
 	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);
-
+	for(int j=vfrom; j<vto; j++){
+	    if(j==0 && XGood(i) && GetDEDX(i,j)<min)min=GetDEDX(i,j);
+	    if(j==1 && YGood(i) && GetDEDX(i,j)<min)min=GetDEDX(i,j);
+	}
     return min;
 
 };
 
 /**
- * \brief Give the maximum spatial residual release 
+ * \brief Give the maximum spatial residual  
  */
 Float_t TrkTrack::GetResidual_max(int ip, int iv){
     Float_t max=0;
@@ -1195,14 +1342,47 @@
 	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];
+	for(int j=vfrom; j<vto; j++){
+ 	    if(j==0 && XGood(i) && fabs(xm[i]-xv[i])>fabs(max))max=xm[i]-xv[i];
+ 	    if(j==1 && YGood(i) && fabs(ym[i]-yv[i])>fabs(max))max=ym[i]-yv[i];
 	}
     }
     return max;
 
 };
+/**
+ * \brief Give the anerage spatial residual 
+ */
+Float_t TrkTrack::GetResidual_av(int ip, int iv){
+    //
+//Sum$((xm>-50)*(xm-xv)/resx)/sqrt(TrkTrack.GetNX()*TrkTrack.GetChi2X())<0.3
+
+    Float_t av  = 0.;
+    int     nav = 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=vfrom; j<vto; j++){
+	    nav++;
+ 	    if(j==0 && XGood(i)) av += (xm[i]-xv[i])/resx[i];
+ 	    if(j==1 && YGood(i)) av += (ym[i]-yv[i])/resy[i];
+	}
+    }
+    if(nav==0)return -100.;
+    return av/nav;
+
+};
 
 
 /**
@@ -1585,7 +1765,7 @@
 	int    ngf = TrkParams::nGF;
 	float *zgf = TrkParams::zGF;
 	Trajectory tgf = Trajectory(ngf,zgf);
-	tgf.DoTrack2(t_track->al);//<<<< integrate the trajectory
+	tgf.DoTrack(t_track->al);//<<<< integrate the trajectory
 	for(int ip=0; ip<ngf; ip++){
 	    t_track->xGF[ip] = tgf.x[ip];
 	    t_track->yGF[ip] = tgf.y[ip];
@@ -1743,7 +1923,8 @@
 
     if(!Track)return 0;
 
-    TRefArray *sorted = new TRefArray();
+    //    TRefArray *sorted = new TRefArray();
+    TRefArray *sorted = NULL;
 	
     TClonesArray &t  = *Track;
 //    TClonesArray &ts = *PhysicalTrack;
@@ -1781,6 +1962,7 @@
 	
 //	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
 	};
+	if(!sorted)sorted = new TRefArray( TProcessID::GetProcessWithUID(t[indi]));
 	sorted->Add( (TrkTrack*)t[indi] );	
 		
 	m[indi] = 0;
@@ -1951,6 +2133,9 @@
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "void TrkLevel2::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+    }
 
 //
 };
@@ -2009,7 +2194,7 @@
  * (By default is created with z-coordinates inside the tracking volume)
   */
 Trajectory::Trajectory(){
-    npoint = 10;
+    npoint = 6;
     x = new float[npoint];
     y = new float[npoint];
     z = new float[npoint];
@@ -2076,17 +2261,18 @@
     thy = new float[npoint];
     tl = new float[npoint];
     int i=0;
-    do{
-	x[i] = 0;
-	y[i] = 0;
+    do{      
+	x[i] = 0.;
+	y[i] = 0.;
 	z[i] = zin[i];
-	thx[i] = 0;
-	thy[i] = 0;
-	tl[i] = 0;
+	thx[i] = 0.;
+	thy[i] = 0.;
+	tl[i] = 0.;
 	i++;		
     }while(zin[i-1] > zin[i] && i < npoint);
     npoint=i;
-    if(npoint != n)cout << "NB! Trajectory created with "<<npoint<<" points"<<endl;
+    if(npoint != n)cout << "NB! Trajectory created with "<<npoint<<" points instean of "<<n<<endl;
+    //    Dump();
 }
 void Trajectory::Delete(){
     
@@ -2138,12 +2324,18 @@
 
 /**
  * Evaluates the trajectory in the apparatus associated to the track. 
- * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.  
- * @param t pointer to an object of the class Trajectory, 
- * which z coordinates should be previously initialized by calling the proper constructor ( Trajectory::Trajectory(int n, float* zin) ).
+ * It integrates the equations of motion in the magnetic field. 
+ * @param al Track state-vector (X0,Y0,sin(theta),phi,deflection).
+ * @param zini z-coordinate of the reference plane (Z0). 
  * @return error flag.
+ * 
+ * This method is needed when you want to integrate the particle trajectory 
+ * starting from a track state-vector relative to an arbitrary reference plane.
+ * The default reference plane, used by the tracker routines, is at zini=23.5. 
+ * If you give as input the track state-vector from a TrkTrack object, 
+ * you can use Trajectory::DoTrack(float* al) instead. 
  */
-int Trajectory::DoTrack2(float* al){
+int Trajectory::DoTrack(float* al, float zini){
 
 //      double *dxout   = new double[npoint];
 //      double *dyout   = new double[npoint];
@@ -2152,33 +2344,36 @@
 //      double *dtlout  = new double[npoint];
 //      double *dzin    = new double[npoint];
     
-     double *dxout;
-     double *dyout;
-     double *dthxout;
-     double *dthyout;
-     double *dtlout;
-     double *dzin;
-
-     dxout   = (double*) malloc(npoint*sizeof(double));
-     dyout   = (double*) malloc(npoint*sizeof(double));
-     dthxout = (double*) malloc(npoint*sizeof(double));
-     dthyout = (double*) malloc(npoint*sizeof(double));
-     dtlout  = (double*) malloc(npoint*sizeof(double));
-     dzin    = (double*) malloc(npoint*sizeof(double));
+    double *dxout;
+    double *dyout;
+    double *dthxout;
+    double *dthyout;
+    double *dtlout;
+    double *dzin;
+     
+    dxout   = (double*) malloc(npoint*sizeof(double));
+    dyout   = (double*) malloc(npoint*sizeof(double));
+    dthxout = (double*) malloc(npoint*sizeof(double));
+    dthyout = (double*) malloc(npoint*sizeof(double));
+    dtlout  = (double*) malloc(npoint*sizeof(double));
+    dzin    = (double*) malloc(npoint*sizeof(double));
+     
+    double dal[5];
 
-     double dal[5];
+    double dzini = (double)zini;
 
     int ifail = 0;
-
+     
     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;
+	cout << "int Trajectory::DoTrack(float* al) --- ERROR --- m.field not loaded"<<endl;
 	return 0;
     }
-    dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
+//    dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
+    dotrack3_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&dzini,&ifail);
     
     for (int i=0; i<npoint; i++){
 	x[i]   = (float)*(dxout+i);
@@ -2206,6 +2401,25 @@
     return ifail;
 };
 
+/**
+ *
+ * >>> OBSOLETE !!! use Trajectory::DoTrack(float* al, float zini) instead
+ *
+ */
+int Trajectory::DoTrack2(float* al, float zini){
+
+    cout << endl;
+    cout << " int Trajectory::DoTrack2(float* al, float zini) --->> NB NB !! this method is going to be eliminated !!! "<<endl;
+    cout << " >>>> replace it with TrkTrack::DoTrack(Trajectory* t) <<<<"<<endl;
+    cout << " (Sorry Wolfgang!! Don't be totally confused!! By Elena)"<<endl;
+    cout << endl;
+
+    return DoTrack(al,zini);
+
+};
+
+
+
 ClassImp(TrkLevel2);
 ClassImp(TrkSinglet);
 ClassImp(TrkTrack);