--- DarthVader/TrackerLevel2/src/ExtTrack.cpp	2014/10/15 08:45:51	1.7
+++ DarthVader/TrackerLevel2/src/ExtTrack.cpp	2016/02/26 12:03:36	1.9
@@ -497,22 +497,17 @@
 //
 //--------------------------------------
 /**
- * Clear the track. If option C is specied, deallocate the hit vectors.
+ * Clear the track. If option C is specified, deallocates the hit vectors.
  */
 void ExtTrack::Clear(Option_t* option){
-
-   Reset();
-
-
-  //  cout << " ExtTrack::Clear("<<option<<")  "<<this<<endl;
-
-
-  //  cout << " xgood "<<xgood<<endl;
-  
-  //  if(nplanes>0){
+    
+//    cout << " ExtTrack::Clear( "<<option<<" )"<<this<<endl;
+        
+    Reset();
 
    if (option && option[0] == 'C') {
 
+//       cout << " uccidi!! "<<endl;
 
        if(xgood) delete []	xgood;
        if(ygood) delete []	ygood;
@@ -537,6 +532,28 @@
        if(dedx_x)delete []	dedx_x;
        if(dedx_y)delete []	dedx_y;
        //}
+//        delete []	xgood;
+//        delete []	ygood;
+//        delete [] multmaxx;
+//        delete [] multmaxy;
+//        delete []	xm;
+//        delete []	ym;
+//        delete []	zm;
+//        delete []	xma;
+//        delete []	yma;
+//        delete []	zma;
+//        delete []	xmb;
+//        delete []	ymb;
+//        delete []	zmb;
+//        delete []	resx;
+//        delete []	resy;
+//        delete []	xv;
+//        delete []	yv;
+//        delete []	zv;
+//        delete []	axv;
+//        delete []	ayv;
+//        delete []	dedx_x;
+//        delete []	dedx_y;
 
        xgood   = NULL;
        ygood   = NULL;
@@ -746,6 +763,17 @@
     if(iprint)cout << " >>>> fit failed "<<endl;
     for(int i=0; i<5; i++) al[i]=al_ini[i]; 
   }
+
+  int ngf = TrkParams::nGF;
+  float* zgf =  TrkParams::zGF;    
+  Trajectory tj = Trajectory(ngf,zgf);
+  tj.DoTrack(al,zini);
+  for(int i=0; i<14; i++){
+      xGF[i] = tj.x[i];
+      yGF[i] = tj.y[i];
+  }
+
+
 };
 
 /**
@@ -862,6 +890,50 @@
     return dedx;
 };
 
+
+/**
+ * Method to evaluate the dE/dx averaged over all X views. 
+ */
+Float_t ExtTrack::GetDEDXX(bool cutSat){
+    Float_t dedx=0;
+    Int_t   np=0;
+    for(Int_t ip=0; ip<nplanes; ip++){
+	dedx += GetDEDX(ip,0)*XGood(ip)*(cutSat ? !IsSaturated(ip,0) : 1); 
+	np   +=               XGood(ip)*(cutSat ? !IsSaturated(ip,0) : 1);
+    }
+    if(np>0)return dedx/np;
+    return -1;
+};
+/**
+ * Method to evaluate the dE/dx averaged over all Y views. 
+ */
+Float_t ExtTrack::GetDEDXY(bool cutSat){
+    Float_t dedx=0;
+    Int_t   np=0;
+    for(Int_t ip=0; ip<nplanes; ip++){
+	dedx += GetDEDX(ip,1)*YGood(ip)*(cutSat ? !IsSaturated(ip,1) : 1); 
+	np   +=               YGood(ip)*(cutSat ? !IsSaturated(ip,1) : 1);
+    }
+    if(np>0)return dedx/np;
+    return -1;
+};
+
+/**
+ * Returns 1 if the cluster on a tracker view includes bad strips 
+ * (at least one bad strip among the four strip used by p.f.a.)
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Bool_t ExtTrack::IsBad(int ip,int iv){
+    if(ip>=6&&ip<8)return false;
+    if(iv==0 && ip>=0 && ip<6)return (xgood[ip]<0) ;
+    else if(iv==1 && ip>=0 && ip<6)return (ygood[ip]<0) ;
+    else {
+	cout << "ExtTrack::IsBad(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+	return 0.;
+    }
+};
+
 /**
  * Method to retrieve the ladder, if assigned
  */
@@ -940,32 +1012,49 @@
 //
 Bool_t ExtTrack::IsInsideAcceptance(float toll){
     int ngf = TrkParams::nGF;
+    float* zgf =  TrkParams::zGF;
+    
+    //this is a patch, to assign correctly xGF and yGF cordinates.
+
+    Trajectory tj = Trajectory(ngf,zgf);
+    tj.DoTrack(al,zini);
+
+    //NB the folowing assignment is NOT permanent!!! 
+    for(int i=0; i<14; i++){
+	xGF[i] = tj.x[i];
+	yGF[i] = tj.y[i];
+    }
+
     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;
+// 	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 ||
+// 	    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 ||
+	    tj.x[i] <= TrkParams::xGF_min[i] + toll ||
+	    tj.x[i] >= TrkParams::xGF_max[i] - toll ||
+	    tj.y[i] <= TrkParams::yGF_min[i] + toll ||
+	    tj.y[i] >= TrkParams::yGF_max[i] - toll ||
 	    false){
 	    
 	    return false;
@@ -1050,5 +1139,37 @@
 }
 
 
+/**
+ * Returns 1 if the signal on a tracker view is saturated.
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Bool_t ExtTrack::IsSaturated(int ip,int iv){
+    if(ip>=6 && ip<8)return false;
+    if(iv==0 && ip>=0 && ip<6)return (dedx_x[ip]<0) ;
+    else if(iv==1 && ip>=0 && ip<6)return (dedx_y[ip]<0) ;
+    else {
+	cout << "ExtTrack::IsSaturated(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+	return 0.;
+    }
+};
+/**
+ * Returns 1 if either the x or the y signal on a tracker plane is saturated.
+ * @param ip plane (0-5)
+ */
+Bool_t ExtTrack::IsSaturated(int ip){
+    return (IsSaturated(ip,0)||IsSaturated(ip,1));
+};
+/**
+ * Returns 1 if there is at least a saturated signal along the track.
+ */
+Bool_t ExtTrack::IsSaturated(){
+    for(int ip=0; ip<nplanes; ip++)for(int iv=0; iv<2; iv++)if(IsSaturated(ip,iv))return true;
+    return false;
+}
+
+
+
+
 
 ClassImp(ExtTrack);