--- DarthVader/TrackerLevel2/src/ExtTrack.cpp	2014/08/07 16:04:14	1.5
+++ DarthVader/TrackerLevel2/src/ExtTrack.cpp	2016/01/28 14:38:24	1.8
@@ -135,7 +135,7 @@
   //  cout << " ExtTrack::Copy( ExtTrack& t ) "<<endl;
 
   t.Reset();//reset variables
-  t.Clear();//deallocate vectors
+  t.Clear("C");//deallocate vectors
   t.SetDimension(nplanes);//allocate vectors
 
   t.zini  = zini;
@@ -145,7 +145,7 @@
     t.al[it1] = al[it1];
     for(int it2=0;it2<5;it2++)t.coval[it1][it2] = coval[it1][it2];
   };    
-  //    cout << "ExtTrack::Copy()........nplanes "<<nplanes<<endl;
+//  cout << "ExtTrack::Copy()........nplanes "<<nplanes<<endl;
   for(int ip=0;ip<nplanes;ip++){
     t.xgood[ip]  = xgood[ip];
     t.ygood[ip]  = ygood[ip];
@@ -185,9 +185,9 @@
 
   //  cout << "Set("<< &t <<", "<<index<<")"<<endl;
   if(index < 0 ){ //NON FUNZIONA
-    cout << "Clear() "<<endl; 
+    cout << "Clear(\"C\") "<<endl; 
     Reset();//reset variables
-    Clear();//deallocate vectors
+    Clear("C");//deallocate vectors
     cout << "SetDimension("<<t.GetNhit()<<")"<<endl; 
     SetDimension(t.GetNhit()); //allocate vectors
 //   }else{
@@ -230,7 +230,7 @@
       ymb[ipp]     = dummy;
       zmb[ipp]     = zm[ipp];
 
-      if( t.XGood(ip)*t.YGood(ip) ){ //double hit
+      if( t.XGood(ip) && t.YGood(ip) ){ //double hit
 	xma[ipp]     = t.xm[ip];
 	yma[ipp]     = t.ym[ip];
 	zma[ipp]     = t.zm[ip];
@@ -496,69 +496,96 @@
 //
 //
 //--------------------------------------
+/**
+ * Clear the track. If option C is specified, deallocates the hit vectors.
+ */
 void ExtTrack::Clear(Option_t* option){
+    
+//    cout << " ExtTrack::Clear( "<<option<<" )"<<this<<endl;
+        
+    Reset();
+
+   if (option && option[0] == 'C') {
+
+//       cout << " uccidi!! "<<endl;
+
+       if(xgood) delete []	xgood;
+       if(ygood) delete []	ygood;
+       if(multmaxx) delete [] multmaxx;
+       if(multmaxy) delete [] multmaxy;
+       if(xm)    delete []	xm;
+       if(ym)    delete []	ym;
+       if(zm)    delete []	zm;
+       if(xma)   delete []	xma;
+       if(yma)   delete []	yma;
+       if(zma)   delete []	zma;
+       if(xmb)   delete []	xmb;
+       if(ymb)   delete []	ymb;
+       if(zmb)   delete []	zmb;
+       if(resx)  delete []	resx;
+       if(resy)  delete []	resy;
+       if(xv)    delete []	xv;
+       if(yv)    delete []	yv;
+       if(zv)    delete []	zv;
+       if(axv)   delete []	axv;
+       if(ayv)   delete []	ayv;
+       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;
+       multmaxx   = NULL;
+       multmaxy   = NULL;
+       xm      = NULL;
+       ym      = NULL;
+       zm      = NULL;
+       xma     = NULL;
+       yma     = NULL;
+       zma     = NULL;
+       xmb     = NULL;
+       ymb     = NULL;
+       zmb     = NULL;
+       resx    = NULL;
+       resy    = NULL;
+       xv      = NULL;
+       yv      = NULL;
+       zv      = NULL;
+       axv     = NULL;
+       ayv     = NULL;
+       dedx_x  = NULL;
+       dedx_y  = NULL;
 
-  //  cout << " ExtTrack::Clear("<<option<<")  "<<this<<endl;
-
-
-  //  cout << " xgood "<<xgood<<endl;
-  
-  //  if(nplanes>0){
-  if(xgood) delete []	xgood;
-  if(ygood) delete []	ygood;
-  if(multmaxx) delete [] multmaxx;
-  if(multmaxy) delete [] multmaxy;
-  if(xm)    delete []	xm;
-  if(ym)    delete []	ym;
-  if(zm)    delete []	zm;
-  if(xma)   delete []	xma;
-  if(yma)   delete []	yma;
-  if(zma)   delete []	zma;
-  if(xmb)   delete []	xmb;
-  if(ymb)   delete []	ymb;
-  if(zmb)   delete []	zmb;
-  if(resx)  delete []	resx;
-  if(resy)  delete []	resy;
-  if(xv)    delete []	xv;
-  if(yv)    delete []	yv;
-  if(zv)    delete []	zv;
-  if(axv)   delete []	axv;
-  if(ayv)   delete []	ayv;
-  if(dedx_x)delete []	dedx_x;
-  if(dedx_y)delete []	dedx_y;
-  //}
-
-  xgood   = NULL;
-  ygood   = NULL;
-  multmaxx   = NULL;
-  multmaxy   = NULL;
-  xm      = NULL;
-  ym      = NULL;
-  zm      = NULL;
-  xma     = NULL;
-  yma     = NULL;
-  zma     = NULL;
-  xmb     = NULL;
-  ymb     = NULL;
-  zmb     = NULL;
-  resx    = NULL;
-  resy    = NULL;
-  xv      = NULL;
-  yv      = NULL;
-  zv      = NULL;
-  axv     = NULL;
-  ayv     = NULL;
-  dedx_x  = NULL;
-  dedx_y  = NULL;
-
-  nplanes = 0;
+       nplanes = 0;
 
-  //  Reset();
+   }
 
 };
 
 void ExtTrack::Delete(){ 
-  Clear();
+  Clear("C");
   // delete [] xGF; 
   // delete [] yGF; 
 }        
@@ -736,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];
+  }
+
+
 };
 
 /**
@@ -807,6 +845,7 @@
  *
  */
 int ExtTrack::GetClusterX_ID(int ip){
+    if(ip<0 || ip>=nplanes)return -1;
     return ((int)fabs(xgood[ip]))%10000000-1;
 };
 /**
@@ -814,6 +853,7 @@
  * 
  */
 int ExtTrack::GetClusterY_ID(int ip){
+    if(ip<0 || ip>=nplanes)return -1;
     return ((int)fabs(ygood[ip]))%10000000-1;
 };
 
@@ -823,8 +863,8 @@
  * @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]);
+    if(iv==0 && ip>=0 && ip<nplanes)return fabs(dedx_x[ip]);
+    else if(iv==1 && ip>=0 && ip<nplanes)return fabs(dedx_y[ip]);
     else {
 	cout << "TrkTrack::GetDEDX(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
 	return 0.;
@@ -845,11 +885,55 @@
  */
 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); 
+    for(Int_t ip=0; ip<nplanes; ip++)dedx+=GetDEDX(ip,0)*XGood(ip)+GetDEDX(ip,1)*YGood(ip); 
     dedx = dedx/(GetNX()+GetNY());
     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
  */
@@ -928,32 +1012,41 @@
 //
 Bool_t ExtTrack::IsInsideAcceptance(float toll){
     int ngf = TrkParams::nGF;
+    float* zgf =  TrkParams::zGF;
+    
+    Trajectory tj = Trajectory(ngf,zgf);
+    tj.DoTrack(al,zini);
+
     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;
@@ -970,7 +1063,7 @@
     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;
+    //    if(chiq==0)cout << " Float_t  ExtTrack::GetChi2X() -- WARNING -- value not defined "<<chiq<<endl;
     return chiq;
 }
 /**
@@ -981,8 +1074,94 @@
     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;
+    //    if(chiq==0)cout << " Float_t  ExtTrack::GetChi2Y() -- WARNING -- value not defined "<<chiq<<endl;
     return chiq;
 }
 
+/**
+ * Returns the track "lever-arm" on the x view, defined as the distance (in planes) between 
+ * the upper and lower x measurements (the maximum value of lever-arm is 6). 
+ */
+Int_t ExtTrack::GetLeverArmX(){
+    int first_plane = -1;
+    int last_plane  = -1;
+    for(Int_t ip=0; ip<nplanes; 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){
+	cout<< "Int_t ExtTrack::GetLeverArmX() -- XGood(ip) always false ??? "<<endl; 
+	return 0;
+    }
+    return (last_plane-first_plane+1);
+}
+/**
+ * Returns the track "lever-arm" on the y view, defined as the distance (in planes) between 
+ * the upper and lower y measurements (the maximum value of lever-arm is 6). 
+ */
+Int_t ExtTrack::GetLeverArmY(){
+    int first_plane = -1;
+    int last_plane  = -1;
+    for(Int_t ip=0; ip<nplanes; ip++){
+	if( YGood(ip) && first_plane == -1 )first_plane = ip;
+	if( YGood(ip) && first_plane != -1 )last_plane = ip;
+    }
+    if( first_plane == -1 || last_plane == -1){
+	cout<< "Int_t ExtTrack::GetLeverArmY() -- YGood(ip) always false ??? "<<endl; 
+	return 0;
+    }
+    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 ExtTrack::GetLeverArmXY(){
+    int first_plane = -1;
+    int last_plane  = -1;
+    for(Int_t ip=0; ip<nplanes; 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 ExtTrack::GetLeverArmXY() -- XGood(ip)*YGood(ip) always false ??? "<<endl; 
+	return 0;
+    }
+    return (last_plane-first_plane+1);
+}
+
+
+/**
+ * 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);