--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/06/06 09:36:07	1.37
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/11/27 11:43:50	1.41
@@ -52,17 +52,19 @@
 	ayv[ip]    = 0;
 	dedx_x[ip] = 0;
 	dedx_y[ip] = 0;
+	multmaxx[ip] = 0; 
+	multmaxy[ip] = 0;
+	seedx[ip]  = 0;  
+	seedy[ip]  = 0;
+	xpu[ip]    = 0;   
+	ypu[ip]    = 0;   
+
     };
-//    clx = 0;
-//    cly = 0;
-//    clx = new TRefArray(6,0); //forse causa memory leak???
-//    cly = new TRefArray(6,0); //forse causa memory leak???
-//    clx = TRefArray(6,0);
-//    cly = TRefArray(6,0);
-
-    TrkParams::SetTrackingMode();
-    TrkParams::SetPrecisionFactor();
-    TrkParams::SetStepMin();
+
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
     TrkParams::SetPFA();
 
 };
@@ -96,17 +98,18 @@
 	ayv[ip]    = t.ayv[ip];
 	dedx_x[ip] = t.dedx_x[ip];
 	dedx_y[ip] = t.dedx_y[ip];
+	multmaxx[ip] = t.multmaxx[ip]; 
+	multmaxy[ip] = t.multmaxy[ip];
+	seedx[ip]    = t.seedx[ip];  
+	seedy[ip]    = t.seedy[ip];
+	xpu[ip]      = t.xpu[ip];   
+	ypu[ip]      = t.ypu[ip];   
     };
-//    clx = 0;
-//    cly = 0;
-//    if(t.clx)clx = new TRefArray(*(t.clx));
-//    if(t.cly)cly = new TRefArray(*(t.cly));
-//    clx = TRefArray(t.clx);
-//    cly = TRefArray(t.cly);
-
-    TrkParams::SetTrackingMode();
-    TrkParams::SetPrecisionFactor(); 
-    TrkParams::SetStepMin();   
+
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor(); 
+//     TrkParams::SetStepMin();   
+    TrkParams::SetMiniDefault();
     TrkParams::SetPFA();
 
 };
@@ -141,11 +144,15 @@
 	t.ayv[ip]    = ayv[ip];
 	t.dedx_x[ip] = dedx_x[ip];
 	t.dedx_y[ip] = dedx_y[ip];
+	t.multmaxx[ip] = multmaxx[ip]; 
+	t.multmaxy[ip] = multmaxy[ip];
+	t.seedx[ip]    = seedx[ip];  
+	t.seedy[ip]    = seedy[ip];
+	t.xpu[ip]      = xpu[ip];   
+	t.ypu[ip]      = ypu[ip];   
 	    
     };
 
-//    t.clx = TRefArray(clx);
-//    t.cly = TRefArray(cly);
     
 };
 //--------------------------------------
@@ -397,7 +404,10 @@
 	    lnl += (tailx[ip]+1.) * log( (tailx[ip]*pow(resx[ip],2.) + pow(xv[ip]-xm[ip],2.)) / (tailx[ip]*pow(resx[ip],2)) ); 
     if(GetNX()>3)lnl=lnl/(GetNX()-3);
     else lnl=0;
-    if(lnl==0)cout << " Float_t  TrkTrack::GetLnLX() -- WARNING -- value not defined "<<lnl<<endl;
+    if(lnl==0){
+	cout << " Float_t  TrkTrack::GetLnLX() -- WARNING -- value not defined "<<lnl<<endl;
+	Dump();
+    }
     return lnl;
     
 }
@@ -411,10 +421,54 @@
 	    lnl += (taily[ip]+1.) * log( (taily[ip]*pow(resy[ip],2.) + pow(yv[ip]-ym[ip],2.)) / (taily[ip]*pow(resy[ip],2)) ); 
     if(GetNY()>2)lnl=lnl/(GetNY()-2);
     else lnl=0;
-    if(lnl==0)cout << " Float_t  TrkTrack::GetLnLY() -- WARNING -- value not defined "<<lnl<<endl;
+    if(lnl==0){
+	cout << " Float_t  TrkTrack::GetLnLY() -- WARNING -- value not defined "<<lnl<<endl;
+	Dump();
+    }
     return lnl;
     
 }
+/**
+ * Returns the effective angle, relative to the sensor, on each plane.
+ * @param ip plane (0-5)
+ * @param iv view (0=x 1=y)
+ */
+Float_t TrkTrack::GetEffectiveAngle(int ip, int iv){
+
+    if(ip<0 || ip>5){
+	cout << "Float_t TrkTrack::GetEffectiveAngle(int "<<ip<<", int "<<iv<<") ==> wrong input"<<endl;
+	return 0.;
+    }
+
+    float v[3]={xv[ip],yv[ip],zv[ip]};
+    //-----------------------------------------
+    // effective angle (relative to the sensor)
+    //-----------------------------------------
+    float axv_geo  = axv[ip];
+    float muhall_h = 297.61; //cm**2/Vs
+    float BY = TrkParams::GetBY(v);
+    float axv_eff = 0;
+    if(ip==5) axv_geo = -1*axv_geo;
+    if(ip==5) BY      = -1*BY;
+    axv_eff = 180.*atan( tan(axv_geo*acos(-1.)/180.) + muhall_h * BY * 0.0001)/acos(-1.);
+    //-----------------------------------------
+    // effective angle (relative to the sensor)
+    //-----------------------------------------
+    float ayv_geo = ayv[ip];
+    float muhall_e = 1258.18; //cm**2/Vs
+    float BX = TrkParams::GetBX(v);
+    float ayv_eff = 0;
+    ayv_eff = 180.*atan( tan(ayv_geo*acos(-1.)/180.) + muhall_e * BX * 0.0001)/acos(-1.);
+  
+    if     (iv==0)return axv_eff;
+    else if(iv==1)return ayv_eff;
+    else{
+	cout << "Float_t TrkTrack::GetEffectiveAngle(int "<<ip<<", int "<<iv<<") ==> wrong input"<<endl;
+	return 0.;
+    }
+  
+};
+
 //--------------------------------------
 //
 //
@@ -445,6 +499,15 @@
     cout << endl << "           "; for(int i=0; i<5; i++)cout << coval[4][i]<<" ";
     cout << endl << "dedx_x   : "; for(int i=0; i<6; i++)cout << dedx_x[i] << " ";
     cout << endl << "dedx_y   : "; for(int i=0; i<6; i++)cout << dedx_y[i] << " ";
+    cout << endl << "maxs x   : "; for(int i=0; i<6; i++)cout << GetClusterX_MaxStrip(i) << " ";
+    cout << endl << "maxs y   : "; for(int i=0; i<6; i++)cout << GetClusterY_MaxStrip(i) << " ";
+    cout << endl << "mult x   : "; for(int i=0; i<6; i++)cout << GetClusterX_Multiplicity(i) << " ";
+    cout << endl << "mult y   : "; for(int i=0; i<6; i++)cout << GetClusterY_Multiplicity(i) << " ";
+    cout << endl << "seed x   : "; for(int i=0; i<6; i++)cout << GetClusterX_Seed(i) << " ";
+    cout << endl << "seed y   : "; for(int i=0; i<6; i++)cout << GetClusterY_Seed(i) << " ";
+    cout << endl << "xpu      : "; for(int i=0; i<6; i++)cout << xpu[i] << " ";
+    cout << endl << "ypu      : "; for(int i=0; i<6; i++)cout << ypu[i] << " ";
+
     cout << endl;
 }
 /**
@@ -560,9 +623,10 @@
 //     path_.error   = 0;
 //     readb_();
 
-    TrkParams::SetTrackingMode();
-    TrkParams::SetPrecisionFactor();
-    TrkParams::SetStepMin();
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
@@ -711,10 +775,11 @@
  * @see EvaluateClusterPositions()
  *
  * The fitting procedure can be varied by changing the tracking mode, 
- * the fit-precision factor and the minimum number of step.
+ * the fit-precision factor, the minimum number of step, etc.
  * @see SetTrackingMode(int)
  * @see SetPrecisionFactor(double)
  * @see SetStepMin(int)
+ * @see SetDeltaB(int,double)
  */
 void TrkTrack::Fit(double pfixed, int& fail, int iprint, int froml1){
 
@@ -817,6 +882,14 @@
     track_.istepmin = istepmin;
 }
 /**
+ * Set deltaB parameters (id=0,1). By default they are set to zero.
+ */
+void TrkTrack::SetDeltaB(int id, double db){
+    if(id!=0 && id!=1)cout << "void TrkTrack::SetDeltaB(int id,double db) -- wrong input parameters: "<<id<<" "<<db<<endl;
+    TrkParams::SetDeltaB(id,db);
+}
+
+/**
  * Returns 1 if the track is inside the magnet cavity
  * Set the minimum number of steps for tracking precision 
  */
@@ -848,6 +921,7 @@
 Int_t TrkTrack::GetClusterY_ID(int ip){
     return ((Int_t)fabs(ygood[ip]))%10000000-1;
 };
+
 /**
  * Method to retrieve the ladder (0-4, increasing x) traversed by the track on this plane.
  * If no ladder is traversed (dead area) the metod retuns -1.
@@ -1031,22 +1105,23 @@
 	
 	//
     cout << endl << endl << "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-";
-    cout << endl << "good     : "; for(int i=0; i<12; i++) cout << good[i]<<" ";
-    cout << endl << "ntrk()   : " << this->ntrk() ;
-    cout << endl << "nclsx()  : " << this->nclsx();
-    cout << endl << "nclsy()  : " << this->nclsy();
+    cout << endl << "good     : "; for(int i=0; i<12; i++) cout << hex <<" 0x"<< good[i]<<dec;
+    cout << endl << "ntrk()   : " << ntrk() ;
+    cout << endl << "nclsx()  : " << nclsx();
+    cout << endl << "nclsy()  : " << nclsy();
     if(Track){
 	TClonesArray &t  = *Track;
 	for(int i=0; i<ntrk(); i++)     ((TrkTrack *)t[i])->Dump();
     }	    
-    if(SingletX){
-	TClonesArray &sx = *SingletX;
-	for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
-    }
-    if(SingletY){
-	TClonesArray &sy = *SingletY;
-	for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
-    }
+//     if(SingletX){
+// 	TClonesArray &sx = *SingletX;
+// 	for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
+//     }
+//     if(SingletY){
+// 	TClonesArray &sy = *SingletY;
+// 	for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
+//     }
+    cout << endl;
 }
 /**
  * \brief Dump processing status
@@ -1190,6 +1265,12 @@
 	    t_track->ayv[ip]    = l2->ayv_nt[i][ip];
 	    t_track->dedx_x[ip] = l2->dedx_x[i][ip];
 	    t_track->dedx_y[ip] = l2->dedx_y[i][ip];
+	    t_track->multmaxx[ip] = l2->multmaxx[i][ip]; 
+	    t_track->multmaxy[ip] = l2->multmaxy[i][ip];
+	    t_track->seedx[ip]  = l2->seedx[i][ip];  
+	    t_track->seedy[ip]  = l2->seedy[i][ip];
+	    t_track->xpu[ip]    = l2->xpu[i][ip];   
+	    t_track->ypu[ip]    = l2->ypu[i][ip];   
 	    //-----------------------------------------------------
 	    //-----------------------------------------------------
 	    //-----------------------------------------------------
@@ -1542,9 +1623,10 @@
 //     path_.error   = 0;
 //     readb_();
 
-    TrkParams::SetTrackingMode();
-    TrkParams::SetPrecisionFactor();
-    TrkParams::SetStepMin();
+//     TrkParams::SetTrackingMode();
+//     TrkParams::SetPrecisionFactor();
+//     TrkParams::SetStepMin();
+    TrkParams::SetMiniDefault();
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);