--- DarthVader/TrackerLevel2/src/ExtTrack.cpp	2014/06/04 07:57:03	1.2
+++ DarthVader/TrackerLevel2/src/ExtTrack.cpp	2014/08/07 16:04:14	1.5
@@ -190,6 +190,8 @@
     Clear();//deallocate vectors
     cout << "SetDimension("<<t.GetNhit()<<")"<<endl; 
     SetDimension(t.GetNhit()); //allocate vectors
+//   }else{
+//       SetDimension(6+index);
   }
   // default fit settings (the same as TrkTrack)
   SetMiniDefault();
@@ -816,6 +818,39 @@
 };
 
 /**
+ * Method to retrieve the dE/dx measured on a tracker view.
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Float_t ExtTrack::GetDEDX(int ip, int iv){
+    if(iv==0 && ip>=0 && ip<6)return fabs(dedx_x[ip]);
+    else if(iv==1 && ip>=0 && ip<6)return fabs(dedx_y[ip]);
+    else {
+	cout << "TrkTrack::GetDEDX(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+	return 0.;
+    }
+}
+/**
+ * Method to evaluate the dE/dx measured on a tracker plane. 
+ * The two measurements on x- and y-view are averaged.
+ * @param ip plane (0-5)
+ */
+Float_t ExtTrack::GetDEDX(int ip){
+    if( (Int_t)XGood(ip)+(Int_t)YGood(ip) == 0 ) return 0; 
+    return (GetDEDX(ip,0)+GetDEDX(ip,1))/((Int_t)XGood(ip)+(Int_t)YGood(ip));
+};
+
+/**
+ * Method to evaluate the dE/dx averaged over all planes. 
+ */
+Float_t ExtTrack::GetDEDX(){
+    Float_t dedx=0; 
+    for(Int_t ip=0; ip<6; ip++)dedx+=GetDEDX(ip,0)*XGood(ip)+GetDEDX(ip,1)*YGood(ip); 
+    dedx = dedx/(GetNX()+GetNY());
+    return dedx;
+};
+
+/**
  * Method to retrieve the ladder, if assigned
  */
 int ExtTrack::GetLadder(int ip){
@@ -880,4 +915,74 @@
 	if(rig<0) rig=-rig;
 	return rig;
 };
+//
+Float_t ExtTrack::GetDeflection(){
+	Float_t def=0;
+	if(chi2>0)def=al[4];
+	return def;
+};
+
+
+//
+// all that follows: EM porting from TrkLevel2
+//
+Bool_t ExtTrack::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] + 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 the reduced chi-square of track x-projection
+ */
+Float_t  ExtTrack::GetChi2X(){
+    float chiq=0;
+    for(int ip=0; ip<nplanes; ip++)if(XGood(ip))chiq+= pow((xv[ip]-xm[ip])/resx[ip],2.); 
+    if(GetNX()>3)chiq=chiq/(GetNX()-3);
+    else chiq=0;
+    if(chiq==0)cout << " Float_t  ExtTrack::GetChi2X() -- WARNING -- value not defined "<<chiq<<endl;
+    return chiq;
+}
+/**
+ * Returns the reduced chi-square of track y-projection
+ */
+Float_t  ExtTrack::GetChi2Y(){
+    float chiq=0;
+    for(int ip=0; ip<nplanes; ip++)if(YGood(ip))chiq+= pow((yv[ip]-ym[ip])/resy[ip],2.); 
+    if(GetNY()>2)chiq=chiq/(GetNY()-2);
+    else chiq=0;
+    if(chiq==0)cout << " Float_t  ExtTrack::GetChi2Y() -- WARNING -- value not defined "<<chiq<<endl;
+    return chiq;
+}
+
 ClassImp(ExtTrack);