--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/05/24 13:29:09	1.34
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/05/24 16:45:48	1.36
@@ -611,12 +611,12 @@
  *
  * @see TrkParams::SetPFA(int)
  */
-void TrkTrack::EvaluateClusterPositions(){
+Bool_t TrkTrack::EvaluateClusterPositions(){
     
 //     cout << "void TrkTrack::GetClusterPositions() "<<endl;
 
     TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return;
+    if( !TrkParams::IsLoaded() )return false;
     
     for(int ip=0; ip<6; ip++){
 //	cout << ip<<" ** "<<xm[ip]<<" / "<<ym[ip]<<endl;;
@@ -635,7 +635,9 @@
 	float bfy = 10*TrkParams::GetBY(v);//Tesla
 	int ipp=ip+1;
 	xyzpam_(&ipp,&icx,&icy,&ladder,&sensor,&ax,&ay,&bfx,&bfy);
+	if(icx<0 || icy<0)return false;
     }
+    return true;
 }
 /**
  * \brief Tracking method. It calls F77 mini routine.
@@ -673,9 +675,19 @@
 
     extern cMini2track track_;
     fail = 0;
+
     FillMiniStruct(track_);
-    
-    if(froml1!=0)EvaluateClusterPositions();
+        
+    if(froml1!=0){
+	if( !EvaluateClusterPositions() ){
+	    cout << "void TrkTrack::Fit("<<pfixed<<","<<fail<<","<<iprint<<","<<froml1<<") --- ERROR evaluating cluster positions "<<endl;
+	    FillMiniStruct(track_) ;
+	    fail = 1;
+	    return;
+	}
+    }else{
+	FillMiniStruct(track_);	
+    }
     
     // if fit variables have been reset, evaluate the initial guess
     if(al[0]==-9999.&&al[1]==-9999.&&al[2]==-9999.&&al[3]==-9999.&&al[4]==-9999.)guess_();
@@ -754,8 +766,22 @@
     extern cMini2track track_;
     track_.istepmin = istepmin;
 }
-
-
+/**
+ * Returns 1 if the track is inside the magnet cavity
+ * Set the minimum number of steps for tracking precision 
+ */
+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.);
+    if( xmagntop>XMAGNLOW && xmagntop<XMAGNHIGH &&
+	ymagntop>YMAGNLOW && ymagntop<YMAGNHIGH &&
+	xmagnbottom>XMAGNLOW && xmagnbottom<XMAGNHIGH &&
+	ymagnbottom>YMAGNLOW && ymagnbottom<YMAGNHIGH ) return(true);
+    else return(false);
+}
 /**
  * Method to retrieve ID (0,1,...) of x-cluster (if any) associated to this track.
  * If no cluster is associated, ID=-1.
@@ -972,6 +998,33 @@
 	for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
     }
 }
+/**
+ * \brief Dump processing status
+ */
+void TrkLevel2::StatusDump(int view){
+    cout << "DSP n. "<<view+1<<" status: "<<hex<<good[view]<<endl;    
+};
+/**
+ * \brief Check event status
+ *
+ * Check the event status, according to a flag-mask given as input. 
+ * Return true if the view passes the check.
+ * 
+ * @param view View number (0-11)
+ * @param flagmask Mask of flags to check (eg. flagmask=0x111 no missing packet, 
+ *  no crc error, no software alarm)
+ *
+ * @see TrkLevel2 class definition to know how the status flag is defined
+ *
+ */
+Bool_t TrkLevel2::StatusCheck(int view, int flagmask){
+
+    if( view<0 || view >= 12)return false;
+    return !(good[view]&flagmask);
+
+};
+
+
 //--------------------------------------
 //
 //