--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2009/03/11 14:19:10	1.54
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2014/06/04 07:57:04	1.57
@@ -391,6 +391,14 @@
     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(){
@@ -664,12 +672,12 @@
 
 // 	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 ----------------------------
 // 	float segment = 100.;
@@ -687,7 +695,8 @@
 //      --- temporaneo ----------------------------
 
 	if( XGood(i) || YGood(i) ){
-	    double segment = 2.;//cm
+	    //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)
@@ -697,8 +706,8 @@
 	    int il = (int)GetLadder(i);
 	    
 	    double omega   = 0.; 
-	    double beta    = 0.;
-	    double gamma   = 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){
@@ -708,34 +717,34 @@
 		cout << " is ip il = "<<is<<" "<<ip<<" "<<il<<endl;
 	    }else{
 		omega   = alignparameters_.omega[is][il][ip];
-		beta    = alignparameters_.beta[is][il][ip];
-		gamma   = alignparameters_.gamma[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] = xm[i] - omega * segment;
-		track.ym_a[i] = ym[i] + segment;
+		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] = xm[i] + omega * segment;
-		track.ym_b[i] = ym[i] - segment;
+		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] = xm[i] + segment;
-		track.ym_a[i] = ym[i] + omega * segment;
+		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] = xm[i] - segment;
-		track.ym_b[i] = ym[i] - omega * segment;
+		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
     
@@ -746,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]);
     }
     
 }
@@ -810,8 +821,8 @@
 
     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;
@@ -825,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;
 }
@@ -875,7 +886,7 @@
     extern cMini2track track_;
     fail = 0;
 
-    FillMiniStruct(track_);
+    //    FillMiniStruct(track_);
         
     if(froml1!=0){
 	if( !EvaluateClusterPositions() ){
@@ -914,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_);
@@ -1152,7 +1168,7 @@
 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<0||il<-1||il>2||is<-1||is>1)
+    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];
@@ -1169,7 +1185,7 @@
 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<0||il<-1||il>2||is<-1||is>1)
+    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];
@@ -2178,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];
@@ -2245,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(){