--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/11/27 15:28:57	1.42
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/01/22 08:55:07	1.43
@@ -895,10 +895,10 @@
  */
 Bool_t TrkTrack::IsInsideCavity(){
     float xmagntop, ymagntop, xmagnbottom, ymagnbottom;
-    xmagntop = xv[0] + (ZMAGNHIGH-zv[0])*tan(cos(-1.0)*axv[0]/180.);
-    ymagntop = yv[0] + (ZMAGNHIGH-zv[0])*tan(cos(-1.0)*ayv[0]/180.);
-    xmagnbottom = xv[5] + (ZMAGNLOW-zv[5])*tan(cos(-1.0)*axv[5]/180.);
-    ymagnbottom = yv[5] + (ZMAGNLOW-zv[5])*tan(cos(-1.0)*ayv[5]/180.);
+    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 &&
@@ -970,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;
+};
+
+
 //--------------------------------------
 //
 //