--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/01/22 08:55:07	1.43
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/03/05 17:00:19	1.44
@@ -60,13 +60,20 @@
 	ypu[ip]    = 0;   
 
     };
-
+    
 //     TrkParams::SetTrackingMode();
 //     TrkParams::SetPrecisionFactor();
 //     TrkParams::SetStepMin();
     TrkParams::SetMiniDefault();
     TrkParams::SetPFA();
 
+    int ngf = TrkParams::nGF;
+    for(int i=0; i<ngf; i++){
+	xGF[i] = 0.;
+	yGF[i] = 0.;
+    }
+
+
 };
 //--------------------------------------
 //
@@ -112,6 +119,11 @@
     TrkParams::SetMiniDefault();
     TrkParams::SetPFA();
 
+    int ngf = TrkParams::nGF;
+    for(int i=0; i<ngf; i++){
+	xGF[i] = t.xGF[i];
+	yGF[i] = t.yGF[i];
+    }
 };
 //--------------------------------------
 //
@@ -152,6 +164,11 @@
 	t.ypu[ip]      = ypu[ip];   
 	    
     };
+    int ngf = TrkParams::nGF;
+    for(int i=0; i<ngf; i++){
+	t.xGF[i] = xGF[i];
+	t.yGF[i] = yGF[i];
+    }
 
     
 };
@@ -165,9 +182,15 @@
  * @param t pointer to an object of the class Trajectory, 
  * which z coordinates should be previously initialized by calling the proper constructor ( Trajectory::Trajectory(int n, float* zin) ).
  * @return error flag.
+ *
+ * >>> OBSOLETE !!! use TrkTrack::DoTrack2(Trajectory* t) instead
+ *
  */
 int TrkTrack::DoTrack(Trajectory* t){
 
+    cout << " int TrkTrack::DoTrack(Trajectory* t) --->> OBSOLETE !!! "<<endl;
+    cout << " use int TrkTrack::DoTrack2(Trajectory* t)"<<endl;
+
     double *dxout = new double[t->npoint];
     double *dyout = new double[t->npoint];
     double *dzin = new double[t->npoint];
@@ -299,7 +322,8 @@
     return dedx;
 };
 /**
- * Returns 1 if the cluster on a tracker view includes bad strips.
+ * 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)
  */
@@ -890,20 +914,69 @@
 }
 
 /**
- * Returns 1 if the track is inside the magnet cavity
- * Set the minimum number of steps for tracking precision 
+ * Returns true if the track is inside the magnet cavity.
+ * @param toll Tolerance around the nominal volume (toll>0 define an inner fiducial volume)
  */
-Bool_t TrkTrack::IsInsideCavity(){
-    float xmagntop, ymagntop, xmagnbottom, ymagnbottom;
-    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 &&
-	ymagnbottom>YMAGNLOW && ymagnbottom<YMAGNHIGH ) return(true);
-    else return(false);
+Bool_t TrkTrack::IsInsideCavity(float toll){
+
+//     float xmagntop, ymagntop, xmagnbottom, ymagnbottom;
+//     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 &&
+// 	ymagnbottom>YMAGNLOW && ymagnbottom<YMAGNHIGH ) return(true);
+//     else return(false);
+
+    int ngf = TrkParams::nGF;
+    for(int i=0; i<ngf; i++){
+	//
+//	cout << endl << TrkParams::GF_element[i];
+	if( 
+	    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") &&
+	    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 true if the track is inside the nominal acceptance, which is defined 
+ * by the intersection among magnet cavity, silicon-plane sensitive area and 
+ * ToF sensitive area (nominal values from the official document used to 
+ * calculate the geometrical factor)
+ */
+Bool_t TrkTrack::IsInsideAcceptance(){
+
+    int ngf = TrkParams::nGF;
+    for(int i=0; i<ngf; i++){
+	if( 
+	    xGF[i] <= TrkParams::xGF_min[i] ||
+	    xGF[i] >= TrkParams::xGF_max[i] ||
+	    yGF[i] <= TrkParams::yGF_min[i] ||
+	    yGF[i] >= TrkParams::yGF_max[i] ||
+	    false)return false;
+    }
+    return true;
+
 }
 /**
  * Method to retrieve ID (0,1,...) of x-cluster (if any) associated to this track.
@@ -1219,6 +1292,11 @@
 	dedx_y[ip] = 0;
 
     };
+    int ngf = TrkParams::nGF;
+    for(int i=0; i<ngf; i++){
+	xGF[i] = 0.;
+	yGF[i] = 0.;
+    }
 //     if(clx)clx->Clear();
 //     if(cly)cly->Clear();
 //    clx.Clear();
@@ -1245,11 +1323,13 @@
 //--------------------------------------
 TrkSinglet::TrkSinglet(){
 //    cout << "TrkSinglet::TrkSinglet() " << GetUniqueID()<<endl;
-    plane    = 0;
-    coord[0] = 0; 
-    coord[1] = 0;
-    sgnl     = 0;
+//     plane    = 0;
+//     coord[0] = 0; 
+//     coord[1] = 0;
+//     sgnl     = 0;
+//     multmax  = 0;
 //    cls      = 0;
+    Clear();
 };
 //--------------------------------------
 //
@@ -1261,6 +1341,7 @@
     coord[0] = s.coord[0]; 
     coord[1] = s.coord[1];
     sgnl     = s.sgnl;
+    multmax  = s.multmax;
 //	cls      = 0;//<<<<pointer
 //    cls      = TRef(s.cls);
 };
@@ -1271,9 +1352,11 @@
 void TrkSinglet::Dump(){
     int i=0;
     cout << endl << "========== Singlet " ;
-    cout << endl << "plane    : " << plane;
-    cout << endl << "coord[2] : "; while( i<2 && cout << coord[i] << " ") i++;
-    cout << endl << "sgnl     : " << sgnl;
+    cout << endl << "plane        : " << plane;
+    cout << endl << "coord[2]     : "; while( i<2 && cout << coord[i] << " ") i++;
+    cout << endl << "sgnl         : " << sgnl;
+    cout << endl << "max.strip    : ";
+    cout << endl << "multiplicity : ";
 }
 //--------------------------------------
 //
@@ -1286,6 +1369,7 @@
     coord[0]=-999;
     coord[1]=-999;
     sgnl=0;
+    multmax  = 0;
     
 }
 //--------------------------------------
@@ -1396,7 +1480,7 @@
  * forced (see TrkLevel2::GetVKMask(int,int)) or 
  * for this event only (TrkLevel2::GetVKFlag(int,int)). 
  * @param iv Tracker view (0-11)
- * @param ivk Viking-chip number (0-23)
+ * @param ivk Viking-chip number (0-23) 
  */
 Bool_t TrkLevel2::IsMaskedVK(int iv, int ivk){
     return !(GetVKMask(iv,ivk)&&GetVKFlag(iv,ivk) ); 
@@ -1492,10 +1576,22 @@
 	    //-----------------------------------------------------
 	    //-----------------------------------------------------
 	};
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// evaluated coordinates (to define GF)
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	int    ngf = TrkParams::nGF;
+	float *zgf = TrkParams::zGF;
+	Trajectory tgf = Trajectory(ngf,zgf);
+	tgf.DoTrack2(t_track->al);//<<<< integrate the trajectory
+	for(int ip=0; ip<ngf; ip++){
+	    t_track->xGF[ip] = tgf.x[ip];
+	    t_track->yGF[ip] = tgf.y[ip];
+	}
+	
 // 	if(t_track->IsSaturated())t_track->Dump();
 	new(t[i]) TrkTrack(*t_track);
 	t_track->Clear();
-    };
+    };//end loop over track
 
 //  ----------------
 //  *** SINGLETS ***
@@ -1507,6 +1603,8 @@
 	t_singlet->coord[0] = l2->xs[i][0];
 	t_singlet->coord[1] = l2->xs[i][1];
 	t_singlet->sgnl     = l2->signlxs[i];
+	t_singlet->multmax = l2->multmaxsx[i]; 
+	if(l2->sxbad[i]>0) t_singlet->multmax = -1*t_singlet->multmax;
 	//-----------------------------------------------------
 //	if(l1) t_singlet->cls      = l1->GetCluster(l2->clsx[i]-1);
 	//-----------------------------------------------------
@@ -1520,12 +1618,16 @@
 	t_singlet->coord[0] = l2->ys[i][0];
 	t_singlet->coord[1] = l2->ys[i][1];
 	t_singlet->sgnl     = l2->signlys[i];
+	t_singlet->multmax  = l2->multmaxsy[i]; 
+	if(l2->sybad[i]>0) t_singlet->multmax = -1*t_singlet->multmax;
 	//-----------------------------------------------------
 //	if(l1) t_singlet->cls      = l1->GetCluster(l2->clsy[i]-1);
 	//-----------------------------------------------------
 	new(sy[i]) TrkSinglet(*t_singlet);
 	t_singlet->Clear();
     };
+
+
 	
     delete t_track;
     delete t_singlet;