--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/04/11 13:44:38	1.46
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/12/05 08:30:27	1.51
@@ -400,6 +400,23 @@
     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 reduced chi-square of track x-projection
  */
 Float_t  TrkTrack::GetChi2X(){
@@ -610,7 +627,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 +674,9 @@
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "void TrkTrack::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+    }
 
 };
 
@@ -798,9 +818,12 @@
     
 //     cout << "void TrkTrack::GetClusterositions() "<<endl;
 
-    TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return false;
-    
+    bool OK=true;
+    TrkParams::Load(1); if( !TrkParams::IsLoaded(1) )cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- m.field not loaded "<<endl;
+    TrkParams::Load(4); if( !TrkParams::IsLoaded(4) )cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- p.f.a. par. not loaded "<<endl;
+    TrkParams::Load(5); if( !TrkParams::IsLoaded(5) )cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- alignment par. not loaded "<<endl;
+    if(!OK)return false;
+
     for(int ip=0; ip<6; ip++){
 //	cout << ip<<" ** "<<xm[ip]<<" / "<<ym[ip]<<endl;;
 	int icx = GetClusterX_ID(ip)+1;
@@ -852,10 +875,11 @@
  */
 void TrkTrack::Fit(double pfixed, int& fail, int iprint, int froml1){
 
-    float al_ini[] = {0.,0.,0.,0.,0.};
+    bool OK=true;
+    TrkParams::Load(1); if( !TrkParams::IsLoaded(1) )cout << "void TrkTrack::Fit(double,int&,int,int) ---ERROR--- m.field not loaded "<<endl;
+    if(!OK)return;
 
-    TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return;
+    float al_ini[] = {0.,0.,0.,0.,0.};
 
     extern cMini2track track_;
     fail = 0;
@@ -891,11 +915,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);
@@ -1195,9 +1215,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;
 
 };
@@ -1220,15 +1241,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;
@@ -1245,14 +1267,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;
+
+};
 
 
 /**
@@ -2001,6 +2056,9 @@
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "void TrkLevel2::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+    }
 
 //
 };