--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2009/03/11 14:19:10	1.54
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2014/02/27 11:24:43	1.56
@@ -687,7 +687,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 +698,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,8 +709,8 @@
 		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) ){
@@ -760,6 +761,8 @@
 	zm[i]  = track->zm[i];
 	axv[i] = track->axv[i];
 	ayv[i] = track->ayv[i];	
+	resx[i] = track->resx[i]; //Elena 10th
+	resy[i] = track->resy[i];
     }
     
 }
@@ -810,8 +813,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 +828,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 +878,7 @@
     extern cMini2track track_;
     fail = 0;
 
-    FillMiniStruct(track_);
+    //    FillMiniStruct(track_);
         
     if(froml1!=0){
 	if( !EvaluateClusterPositions() ){
@@ -914,6 +917,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 +1160,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 +1177,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];