/[PAMELA software]/DarthVader/TrackerLevel2/src/TrkLevel2.cpp

Diff of /DarthVader/TrackerLevel2/src/TrkLevel2.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 1.30 by pam-fi,
Fri Mar 16 11:38:33 2007 UTC
+revision 1.58 by mocchiut,
Wed Aug 27 14:44:37 2014 UTC
 Line 12 
 using namespace std;
  extern "C" {
      void dotrack_(int*, double*, double*, double*, double*, int*);
      void dotrack2_(int*, double*, double*, double*, double*,double*, double*, double*,int*);
- //    int  readb_(const char*);
+     void dotrack3_(int*, double*, double*, double*, double*,double*, double*, double*,double*,int*);
- //    int  readb_();
+     void mini2_(int*,int*,int*);
-      void mini2_(int*,int*,int*);
+     void guess_();
-      void guess_();
+     void gufld_(float*, float*);
-      void gufld_(float*, float*);
+     float risxeta2_(float *);
+     float risxeta3_(float *);
+     float risxeta4_(float *);
+     float risyeta2_(float *);
  }
  //--------------------------------------
-Line 41 
 TrkTrack::TrkTrack(){
+Line 44 
 TrkTrack::TrkTrack(){
          zm[ip]     = 0;
          resx[ip]   = 0;
          resy[ip]   = 0;
+         tailx[ip]   = 0;
+         taily[ip]   = 0;
          xv[ip]     = 0;
          yv[ip]     = 0;
          zv[ip]     = 0;
-Line 48 
 TrkTrack::TrkTrack(){
+Line 53 
 TrkTrack::TrkTrack(){
          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;
+ //     TrkParams::SetTrackingMode();
- //    clx = new TRefArray(6,0); //forse causa memory leak???
+ //     TrkParams::SetPrecisionFactor();
- //    cly = new TRefArray(6,0); //forse causa memory leak???
+ //     TrkParams::SetStepMin();
+     TrkParams::SetMiniDefault();
+     TrkParams::SetPFA();
+     int ngf = TrkParams::nGF;
+     for(int i=0; i<ngf; i++){
+         xGF[i] = 0.;
+         yGF[i] = 0.;
+     }
  };
  //--------------------------------------
  //
-Line 75 
 TrkTrack::TrkTrack(const TrkTrack& t){
+Line 97 
 TrkTrack::TrkTrack(const TrkTrack& t){
          zm[ip]     = t.zm[ip];
          resx[ip]   = t.resx[ip];
          resy[ip]   = t.resy[ip];
+         tailx[ip]  = t.tailx[ip];
+         taily[ip]  = t.taily[ip];
          xv[ip]     = t.xv[ip];
          yv[ip]     = t.yv[ip];
          zv[ip]     = t.zv[ip];
-Line 82 
 TrkTrack::TrkTrack(const TrkTrack& t){
+Line 106 
 TrkTrack::TrkTrack(const TrkTrack& t){
          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;
+ //     TrkParams::SetTrackingMode();
-     if(t.clx)clx = new TRefArray(*(t.clx));
+ //     TrkParams::SetPrecisionFactor();
-     if(t.cly)cly = new TRefArray(*(t.cly));
+ //     TrkParams::SetStepMin();
+     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];
+     }
  };
  //--------------------------------------
  //
-Line 111 
 void TrkTrack::Copy(TrkTrack& t){
+Line 148 
 void TrkTrack::Copy(TrkTrack& t){
          t.zm[ip]     = zm[ip];
          t.resx[ip]   = resx[ip];
          t.resy[ip]   = resy[ip];
+         t.tailx[ip]  = tailx[ip];
+         t.taily[ip]  = taily[ip];
          t.xv[ip]     = xv[ip];
          t.yv[ip]     = yv[ip];
          t.zv[ip]     = zv[ip];
-Line 118 
 void TrkTrack::Copy(TrkTrack& t){
+Line 157 
 void TrkTrack::Copy(TrkTrack& t){
          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];
      };
+     int ngf = TrkParams::nGF;
+     for(int i=0; i<ngf; i++){
+         t.xGF[i] = xGF[i];
+         t.yGF[i] = yGF[i];
+     }
  };
  //--------------------------------------
-Line 127 
 void TrkTrack::Copy(TrkTrack& t){
+Line 178 
 void TrkTrack::Copy(TrkTrack& t){
  //
  //--------------------------------------
  /**
-  * Evaluates the trajectory in the apparatus associated to the track.
+  *
-  * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.
+  * >>> OBSOLETE !!! use TrkTrack::DoTrack(Trajectory* t) instead
-  * @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.
   */
- int TrkTrack::DoTrack(Trajectory* t){
+ int TrkTrack::DoTrack2(Trajectory* t){
-     double *dxout = new double[t->npoint];
-     double *dyout = new double[t->npoint];
-     double *dzin = new double[t->npoint];
-     double dal[5];
-     int ifail = 0;
-     for (int i=0; i<5; i++)         dal[i]  = (double)al[i];
-     for (int i=0; i<t->npoint; i++) dzin[i] = (double)t->z[i];
-     TrkParams::Load(1);
+     cout << endl;
-     if( !TrkParams::IsLoaded(1) ){
+     cout << " int TrkTrack::DoTrack2(Trajectory* t) --->> NB NB !! this method is going to be eliminated !!! "<<endl;
-         cout << "int TrkTrack::DoTrack(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
+     cout << " >>>> replace it with TrkTrack::DoTrack(Trajectory* t) <<<<"<<endl;
-         return 0;
+     cout << " (Sorry Wolfgang!! Don't be totally confused!! By Elena)"<<endl;
-     }
+     cout << endl;
-     dotrack_(&(t->npoint),dzin,dxout,dyout,dal,&ifail);
-     for (int i=0; i<t->npoint; i++){
-         t->x[i] = (float)*dxout++;
-         t->y[i] = (float)*dyout++;
-     }
- //    delete [] dxout;
+     return DoTrack(t);
- //    delete [] dyout;
- //    delete [] dzin;
-     return ifail;
  };
  //--------------------------------------
  //
  //
  //--------------------------------------
  /**
-  * Evaluates the trajectory in the apparatus associated to the track.
+  * Evaluates the trajectory in the apparatus associated to the track state-vector.
-  * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.
+  * It integrates the equations of motion in the magnetic field.
   * @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) ).
+  * which z coordinates should be previously assigned.
   * @return error flag.
   */
- int TrkTrack::DoTrack2(Trajectory* t){
+ int TrkTrack::DoTrack(Trajectory* t){
      double *dxout   = new double[t->npoint];
      double *dyout   = new double[t->npoint];
-Line 191 
 int TrkTrack::DoTrack2(Trajectory* t){
+Line 221 
 int TrkTrack::DoTrack2(Trajectory* t){
      TrkParams::Load(1);
      if( !TrkParams::IsLoaded(1) ){
-         cout << "int TrkTrack::DoTrack2(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
+         cout << "int TrkTrack::DoTrack(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
          return 0;
      }
      dotrack2_(&(t->npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
      for (int i=0; i<t->npoint; i++){
-         t->x[i]   = (float)*dxout++;
+         t->x[i]   = (float)*(dxout+i);
-         t->y[i]   = (float)*dyout++;
+         t->y[i]   = (float)*(dyout+i);
-         t->thx[i] = (float)*dthxout++;
+         t->thx[i] = (float)*(dthxout+i);
-         t->thy[i] = (float)*dthyout++;
+         t->thy[i] = (float)*(dthyout+i);
-         t->tl[i]  = (float)*dtlout++;
+         t->tl[i]  = (float)*(dtlout+i);
      }
- //    delete [] dxout;
+     delete [] dxout;
- //    delete [] dyout;
+     delete [] dyout;
- //    delete [] dzin;
+     delete [] dzin;
+     delete [] dthxout;
+     delete [] dthyout;
+     delete [] dtlout;
      return ifail;
  };
-Line 233 
 Float_t TrkTrack::GetDeflection(){
+Line 266 
 Float_t TrkTrack::GetDeflection(){
          return def;
  };
  //
+ /**
+  * Method to retrieve the dE/dx measured on a tracker view.
+  * @param ip plane (0-5)
+  * @param iv view (0=x 1=y)
+  */
+ Float_t TrkTrack::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]);
+     else {
+         cout << "TrkTrack::GetDEDX(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+         return 0.;
+     }
+ }
+ /**
+  * Method to evaluate the dE/dx measured on a tracker plane.
+  * The two measurements on x- and y-view are averaged.
+  * @param ip plane (0-5)
+  */
+ Float_t TrkTrack::GetDEDX(int ip){
+     if( (Int_t)XGood(ip)+(Int_t)YGood(ip) == 0 ) return 0;
+     return (GetDEDX(ip,0)+GetDEDX(ip,1))/((Int_t)XGood(ip)+(Int_t)YGood(ip));
+ };
+ /**
+  * Method to evaluate the dE/dx averaged over all planes.
+  */
  Float_t TrkTrack::GetDEDX(){
-         Float_t dedx=0;
+     Float_t dedx=0;
- //      for(Int_t i=0; i<6; i++)dedx+=dedx_x[i]*xgood[i]+dedx_y[i]*ygood[i];
+     for(Int_t ip=0; ip<6; ip++)dedx+=GetDEDX(ip,0)*XGood(ip)+GetDEDX(ip,1)*YGood(ip);
-         for(Int_t i=0; i<6; i++)dedx+=dedx_x[i]*XGood(i)+dedx_y[i]*YGood(i);
+     dedx = dedx/(GetNX()+GetNY());
-         dedx = dedx/(this->GetNX()+this->GetNY());
+     return dedx;
-         return dedx;
+ };
+ /**
+  * 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 TrkTrack::IsBad(int ip,int iv){
+     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 << "TrkTrack::IsBad(int ip, int iv) -- wrong input parameters "<<ip<<iv<<endl;
+         return 0.;
+     }
+ };
+ /**
+  * 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 TrkTrack::IsSaturated(int ip,int iv){
+     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 << "TrkTrack::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 TrkTrack::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 TrkTrack::IsSaturated(){
+     for(int ip=0; ip<6; ip++)for(int iv=0; iv<2; iv++)if(IsSaturated(ip,iv))return true;
+     return false;
+ }
+ /**
+  * 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 TrkTrack::GetLeverArmX(){
+     int first_plane = -1;
+     int last_plane  = -1;
+     for(Int_t ip=0; ip<6; 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 TrkTrack::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 TrkTrack::GetLeverArmY(){
+     int first_plane = -1;
+     int last_plane  = -1;
+     for(Int_t ip=0; ip<6; 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 TrkTrack::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 TrkTrack::GetLeverArmXY(){
+     int first_plane = -1;
+     int last_plane  = -1;
+     for(Int_t ip=0; ip<6; 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 TrkTrack::GetLeverArmXY() -- XGood(ip)*YGood(ip) always false ??? "<<endl;
+         return 0;
+     }
+     return (last_plane-first_plane+1);
+ }
+ /**
+  * Returns the number of hit planes
+  */
+ Int_t TrkTrack::GetNhit()  {
+   int np=0;
+   for(Int_t ip=0; ip<6; ip++) np += (XGood(ip)||YGood(ip)) ;
+   return np;
+ };
+ /**
+  * Returns the reduced chi-square of track x-projection
+  */
+ Float_t  TrkTrack::GetChi2X(){
+     float chiq=0;
+     for(int ip=0; ip<6; 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  TrkTrack::GetChi2X() -- WARNING -- value not defined "<<chiq<<endl;
+     return chiq;
+ }
+ /**
+  * Returns the reduced chi-square of track y-projection
+  */
+ Float_t  TrkTrack::GetChi2Y(){
+     float chiq=0;
+     for(int ip=0; ip<6; 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  TrkTrack::GetChi2Y() -- WARNING -- value not defined "<<chiq<<endl;
+     return chiq;
+ }
+ /**
+  * Returns the logarythm of the likeliwood-function of  track x-projection
+  */
+ Float_t TrkTrack::GetLnLX(){
+     float lnl=0;
+     for(int ip=0; ip<6; ip++)
+         if( XGood(ip) && tailx[ip]!=0 )
+             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;
+         Dump();
+     }
+     return lnl;
+ }
+ /**
+  * Returns the logarythm of the likeliwood-function of  track y-projection
+  */
+ Float_t TrkTrack::GetLnLY(){
+     float lnl=0;
+     for(int ip=0; ip<6; ip++)
+         if( YGood(ip) && taily[ip]!=0 )
+             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;
+         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.;
+     }
  };
  //--------------------------------------
-Line 262 
 void TrkTrack::Dump(){
+Line 516 
 void TrkTrack::Dump(){
      cout << endl << "zv       : "; for(int i=0; i<6; i++)cout << zv[i] << " ";
      cout << endl << "resx     : "; for(int i=0; i<6; i++)cout << resx[i] << " ";
      cout << endl << "resy     : "; for(int i=0; i<6; i++)cout << resy[i] << " ";
+     cout << endl << "tailx    : "; for(int i=0; i<6; i++)cout << tailx[i] << " ";
+     cout << endl << "taily    : "; for(int i=0; i<6; i++)cout << taily[i] << " ";
      cout << endl << "coval    : "; for(int i=0; i<5; i++)cout << coval[0][i]<<" ";
      cout << endl << "           "; for(int i=0; i<5; i++)cout << coval[1][i]<<" ";
      cout << endl << "           "; for(int i=0; i<5; i++)cout << coval[2][i]<<" ";
-Line 269 
 void TrkTrack::Dump(){
+Line 525 
 void TrkTrack::Dump(){
      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;
  }
  /**
-Line 287 
 void TrkTrack::SetResolution(double *rx,
+Line 552 
 void TrkTrack::SetResolution(double *rx,
      for(int i=0; i<6; i++) resy[i]=*ry++;
  }
  /**
+  * Set the TrkTrack tails position resolution
+  */
+ void TrkTrack::SetTail(double *tx, double *ty, double factor){
+     for(int i=0; i<6; i++) tailx[i]=factor*(*tx++);
+     for(int i=0; i<6; i++) taily[i]=factor*(*ty++);
+ }
+ /**
+  * Set the TrkTrack Student parameter (resx,resy,tailx,taily)
+  * from previous gausian fit
+  *@param flag =0 standard, =1 with noise correction
+  */
+ void TrkTrack::SetStudentParam(int flag){
+     float sx[11]={0.000128242,
+.000136942,
+.000162718,
+.000202644,
+.00025597,
+.000317456,
+.000349048,
+.000384638,
+.000457295,
+.000512319,
+.000538573};
+     float tx[11]={1.79402,
+.04876,
+.88376,
+.3,
+.14084,
+.07686,
+.44736,
+.5179,
+.38697,
+.45739,
+.18627};
+     float sy[11]={0.000483075,
+.000466925,
+.000431658,
+.000428317,
+.000433854,
+.000444044,
+.000482098,
+.000537579,
+.000636279,
+.000741998,
+.000864261};
+     float ty[11]={0.997032,
+.11147,
+.18526,
+.61404,
+.21908,
+.08959,
+.48833,
+.42687,
+.65253,
+.52043,
+.29926};
+     int index;
+     float fact=0.;
+     for(int i=0; i<6; i++) {
+         index = int((fabs(axv[i])+1.)/2.);
+         if(index>10) index=10;
+         tailx[i]=tx[index];
+         if(flag==1) {
+             if(fabs(axv[i])<=10.) fact = resx[i]/risxeta2_(&(axv[i]));
+             if(fabs(axv[i])>10.&&fabs(axv[i])<=15.) fact = resx[i]/risxeta3_(&(axv[i]));
+             if(fabs(axv[i])>15.) fact = resx[i]/risxeta4_(&(axv[i]));
+         } else fact = 1.;
+         resx[i] = sx[index]*fact;
+     }
+     for(int i=0; i<6; i++) {
+         index = int((fabs(ayv[i])+1.)/2.);
+         if(index>10) index=10;
+         taily[i]=ty[index];
+         if(flag==1) fact = resy[i]/risyeta2_(&(ayv[i]));
+         else fact = 1.;
+         resy[i] = sy[index]*fact;
+     }
+ }
+ /**
   * Set the TrkTrack good measurement
   */
  void TrkTrack::SetGood(int *xg, int *yg){
-     // NB! si perdera` l'informazione sul numero del cluster
      for(int i=0; i<6; i++) xgood[i]=*xg++;
      for(int i=0; i<6; i++) ygood[i]=*yg++;
  }
-Line 305 
 void TrkTrack::LoadField(TString path){
+Line 649 
 void TrkTrack::LoadField(TString path){
  //     path_.error   = 0;
  //     readb_();
+ //     TrkParams::SetTrackingMode();
+ //     TrkParams::SetPrecisionFactor();
+ //     TrkParams::SetStepMin();
+     TrkParams::SetMiniDefault();
      TrkParams::Set(path,1);
      TrkParams::Load(1);
+     if( !TrkParams::IsLoaded(1) ){
+         cout << "void TrkTrack::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+     }
  };
-Line 318 
 void TrkTrack::FillMiniStruct(cMini2trac
+Line 670 
 void TrkTrack::FillMiniStruct(cMini2trac
      for(int i=0; i<6; i++){
- //      track.xgood[i]=xgood[i];
+ //      cout << i<<" - "<<xgood[i]<<" "<<XGood(i)<<endl;
- //      track.ygood[i]=ygood[i];
+ //      cout << i<<" - "<<ygood[i]<<" "<<YGood(i)<<endl;
-         track.xgood[i]=XGood(i);
+       track.xgood[i] = (double) XGood(i);
-         track.ygood[i]=YGood(i);
+         track.ygood[i] = (double) YGood(i);
-         track.xm[i]=xm[i];
+         track.xm[i]= (double) xm[i];
-         track.ym[i]=ym[i];
+         track.ym[i]= (double) ym[i];
-         track.zm[i]=zm[i];
+         track.zm[i]= (double) zm[i];
  //      --- temporaneo ----------------------------
- //      andrebbe inserita la dimensione del sensore
+ //      float segment = 100.;
-         float segment = 100.;
+ //      track.xm_a[i]=xm[i];
-         track.xm_a[i]=xm[i];
+ //      track.xm_b[i]=xm[i];
-         track.xm_b[i]=xm[i];
+ //      track.ym_a[i]=ym[i];
-         track.ym_a[i]=ym[i];
+ //      track.ym_b[i]=ym[i];
-         track.ym_b[i]=ym[i];
+ //      if(       XGood(i) && !YGood(i) ){
-         if(       XGood(i) && !YGood(i) ){
+ //          track.ym_a[i] = track.ym_a[i]+segment;
-             track.ym_a[i] = track.ym_a[i]+segment;
+ //          track.ym_b[i] = track.ym_b[i]-segment;
-             track.ym_b[i] = track.ym_b[i]-segment;
+ //      }else if( !XGood(i) && YGood(i)){
-         }else if( !XGood(i) && YGood(i)){
+ //          track.xm_a[i] = track.xm_a[i]+segment;
-             track.xm_a[i] = track.xm_a[i]+segment;
+ //          track.xm_b[i] = track.xm_b[i]-segment;
-             track.xm_b[i] = track.xm_b[i]-segment;
+ //      }
-         }
  //      --- temporaneo ----------------------------
+         if( XGood(i) || YGood(i) ){
+             //NB!! the length of the sensor is not exactely taken into account
+             double segment = 7.;// 2.;//cm //Elena 10th
+             // NB: i parametri di allineamento hanno una notazione particolare!!!
+             // sensor = 0 (hybrid side), 1
+             // ladder = 0-2 (increasing x)
+             // plane  = 0-5 (from bottom to top!!!)
+             int is = (int)GetSensor(i); if(i==5)is=1-is;
+             int ip = 5-i;
+             int il = (int)GetLadder(i);
+             double omega   = 0.;
+             //      double beta    = 0.;// EM GCC 4.7
+             //      double gamma   = 0.;
+             if(
+                 (is < 0 || is > 1 || ip < 0 || ip > 5 || il < 0 || il > 2) &&
+                 true){
+                 // se il piano risulta colpito, ladder e sensore devono essere
+                 // assegnati correttamente
+                 cout << " void TrkTrack::FillMiniStruct(cMini2track&) --- WARNING --- sensor not defined, cannot read alignment parameters "<<endl;
+                 cout << " is ip il = "<<is<<" "<<ip<<" "<<il<<endl;
+             }else{
+                 omega   = alignparameters_.omega[is][il][ip];
+                 //              beta    = alignparameters_.beta[is][il][ip];// EM GCC 4.7 unused
+                 //              gamma   = alignparameters_.gamma[is][il][ip];// EM GCC 4.7 unused
+             }
+             if(       XGood(i) && !YGood(i) ){
+                 track.xm_a[i] =  (double) xm[i] - omega * segment;
+                 track.ym_a[i] =  (double) ym[i] + segment;
+ //          track.zm_a[i] = zm[i] + beta * segment;//not used yet
+                 track.xm_b[i] =  (double) xm[i] + omega * segment;
+                 track.ym_b[i] =  (double) ym[i] - segment;
+ //          track.zm_b[i] = zm[i] - beta * segment;//not used yet
+             }else if( !XGood(i) && YGood(i) ){
+                 track.xm_a[i] =  (double) xm[i] + segment;
+                 track.ym_a[i] =  (double) ym[i] + omega * segment;
+ //          track.zm_a[i] = zm[i] - gamma * segment;//not used yet
+                 track.xm_b[i] =  (double) xm[i] - segment;
+                 track.ym_b[i] =  (double) ym[i] - omega * segment;
+ //          track.zm_b[i] = zm[i] + gamma * segment;//not used yet
+             }
+         }
-         track.resx[i]=resx[i];
+         track.resx[i]= (double) resx[i];
-         track.resy[i]=resy[i];
+         track.resy[i]= (double) resy[i];
+         track.tailx[i]= (double) tailx[i];
+         track.taily[i]= (double) taily[i];
      }
-     for(int i=0; i<5; i++) track.al[i]=al[i];
+     for(int i=0; i<5; i++) track.al[i]= (double) al[i];
      track.zini = 23.5;
  // ZINI = 23.5 !!! it should be the same parameter in all codes
-Line 358 
 void TrkTrack::FillMiniStruct(cMini2trac
+Line 755 
 void TrkTrack::FillMiniStruct(cMini2trac
  void TrkTrack::SetFromMiniStruct(cMini2track *track){
      for(int i=0; i<5; i++) {
-         al[i]=track->al[i];
+       al[i]= (float) (track->al[i]);
-         for(int j=0; j<5; j++) coval[i][j]=track->cov[i][j];
+         for(int j=0; j<5; j++) coval[i][j]= (float) (track->cov[i][j]);
      }
-     chi2  = track->chi2;
+     chi2  =  (float) (track->chi2);
-     nstep = track->nstep;
+     nstep =  (float) (track->nstep);
      for(int i=0; i<6; i++){
-         xv[i]  = track->xv[i];
+         xv[i]  =  (float) (track->xv[i]);
-         yv[i]  = track->yv[i];
+         yv[i]  =  (float) (track->yv[i]);
-         zv[i]  = track->zv[i];
+         zv[i]  =  (float) (track->zv[i]);
-         xm[i]  = track->xm[i];
+         xm[i]  = (float)  (track->xm[i]);
-         ym[i]  = track->ym[i];
+         ym[i]  =  (float) (track->ym[i]);
-         zm[i]  = track->zm[i];
+         zm[i]  =  (float) (track->zm[i]);
-         axv[i] = track->axv[i];
+         axv[i] =  (float) (track->axv[i]);
-         ayv[i] = track->ayv[i];
+         ayv[i] =  (float) (track->ayv[i]);
+         resx[i] = (float)  (track->resx[i]); //Elena 10th
+         resy[i] =  (float) (track->resy[i]);
      }
  }
  /**
-  * Tracking method. It calls F77 mini routine.
+  * \brief Method to re-evaluate coordinates of clusters associated with a track.
+  *
+  * The method can be applied only after recovering level1 information
+  * (either by reprocessing single events from level0 or from
+  * the TrkLevel1 branch, if present); it calls F77 subroutines that
+  * read the level1 common and fill the minimization-routine common.
+  * Some clusters can be excluded or added by means of the methods:
+  *
+  * TrkTrack::ResetXGood(int ip)
+  * TrkTrack::ResetYGood(int ip)
+  * TrkTrack::SetXGood(int ip, int cid, int is)
+  * TrkTrack::SetYGood(int ip, int cid, int is)
+  *
+  * NB! The method TrkTrack::SetGood(int *xg, int *yg) set the plane-mask (0-1)
+  * for the minimization-routine common. It deletes the cluster information
+  * (at least for the moment...) thus cannot be applied before
+  * TrkTrack::EvaluateClusterPositions().
+  *
+  * Different p.f.a. can be applied by calling (once) the method:
+  *
+  * TrkParams::SetPFA(0); //Set ETA p.f.a.
+  *
+  * @see TrkParams::SetPFA(int)
+  */
+ Bool_t TrkTrack::EvaluateClusterPositions(){
+ //     cout << "void TrkTrack::GetClusterositions() "<<endl;
+     TrkParams::Load(1);
+     if( !TrkParams::IsLoaded(1) ){
+         cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- m.field not loaded "<<endl;
+         return false;
+     }
+     TrkParams::Load(4);
+     if( !TrkParams::IsLoaded(4) ){
+         cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- p.f.a. par. not loaded "<<endl;
+         return false;
+     }
+     TrkParams::Load(5);
+     if( !TrkParams::IsLoaded(5) ){
+         cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- alignment par. not loaded "<<endl;
+         return false;
+     }
+     for(int ip=0; ip<6; ip++){
+ //      cout << ip<<" ** "<<xm[ip]<<" / "<<ym[ip]<<endl;;
+         int icx = GetClusterX_ID(ip)+1;//0=no-cluster,1-N
+         int icy = GetClusterY_ID(ip)+1;//0=no-cluster,1-N
+         int sensor = GetSensor(ip)+1;//<< convenzione "Paolo"
+         if(ip==5 && sensor!=0)sensor=3-sensor;//<< convenzione "Elena"
+         int ladder = GetLadder(ip)+1;
+         float ax = axv[ip];
+         float ay = ayv[ip];
+         float v[3];
+         v[0]=xv[ip];
+         v[1]=yv[ip];
+         v[2]=zv[ip];
+         float bfx = 10*TrkParams::GetBX(v);//Tesla
+         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.
+  *
+  * @param pfixed Particle momentum. If pfixed=0 the momentum
+  * is left as a free parameter, otherwise it is fixed to the input value.
+  * @param fail Output flag (!=0 if the fit failed).
+  * @param iprint Flag to set debug mode ( 0 = no output; 1 = verbose; 2 = debug).
+  * @param froml1 Flag to re-evaluate positions (see TrkTrack::GetClusterPositions()).
+  *
+  * The option to re-evaluate positions can be used only after recovering
+  * level1 information, eg. by reprocessing the single event.
+  *
+  * Example:
+  *
+  * if( !event->GetTrkLevel0() )return false;
+  * event->GetTrkLevel0()->ProcessEvent(); // re-processing level0->level1
+  * int fail=0;
+  * event->GetTrkLevel2()->GetTrack(0)->Fit(0.,fail,0,1);
+  *
+  * @see EvaluateClusterPositions()
+  *
+  * The fitting procedure can be varied by changing the tracking mode,
+  * 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){
+ void TrkTrack::Fit(double pfixed, int& fail, int iprint, int froml1){
+     TrkParams::Load(1);
+     if( !TrkParams::IsLoaded(1) ){
+         cout << "void TrkTrack::Fit(double,int&,int,int) ---ERROR--- m.field not loaded "<<endl;
+         return;
+     }
+     TrkParams::Load(5);
+     if( !TrkParams::IsLoaded(5) ){
+         cout << "void TrkTrack::Fit(double,int&,int,int) ---ERROR--- align.param. not loaded "<<endl;
+         return;
+     }
      float al_ini[] = {0.,0.,0.,0.,0.};
      extern cMini2track track_;
      fail = 0;
-     FillMiniStruct(track_);
+     //    FillMiniStruct(track_);
+     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_();
-Line 404 
 void TrkTrack::Fit(double pfixed, int& f
+Line 917 
 void TrkTrack::Fit(double pfixed, int& f
      //  ------------------------------------------
      //  call mini routine
-     TrkParams::Load(1);
+     //  ------------------------------------------
-     if( !TrkParams::IsLoaded(1) ){
-         cout << "void TrkTrack::Fit(double pfixed, int& fail, int iprint) --- ERROR --- m.field not loaded"<<endl;
-         return;
-     }
      int istep=0;
      int ifail=0;
      mini2_(&istep,&ifail, &iprint);
-Line 416 
 void TrkTrack::Fit(double pfixed, int& f
+Line 925 
 void TrkTrack::Fit(double pfixed, int& f
          if(iprint)cout << "ERROR: ifail= " << ifail << endl;
          fail = 1;
      }
+     if(chi2!=chi2){
+         if(iprint)cout << "ERROR: chi2= " << chi2 << endl;
+         FitReset();
+         fail = 1;
+     }
      //  ------------------------------------------
      SetFromMiniStruct(&track_);
- //    cout << endl << "eta ===> " << track_.al[4] << endl;
- //     for(int i=0; i<5; i++) al[i]=track_.al[i];
- //     chi2=track_.chi2;
- //     nstep=track_.nstep;
- //     for(int i=0; i<6; i++) xv[i]=track_.xv[i];
- //     for(int i=0; i<6; i++) yv[i]=track_.yv[i];
- //     for(int i=0; i<6; i++) zv[i]=track_.zv[i];
- //     for(int i=0; i<6; i++) axv[i]=track_.axv[i];
- //     for(int i=0; i<6; i++) ayv[i]=track_.ayv[i];
- //     for(int i=0; i<5; i++) {
- //      for(int j=0; j<5; j++) coval[i][j]=track_.cov[i][j];
- //     }
      if(fail){
-         if(iprint)cout << " >>>> fit failed >>>> drawing initial par"<<endl;
+         if(iprint)cout << " >>>> fit failed "<<endl;
          for(int i=0; i<5; i++) al[i]=al_ini[i];
      }
  };
- /*
+ /**
   * Reset the fit parameters
   */
  void TrkTrack::FitReset(){
      for(int i=0; i<5; i++) al[i]=-9999.;
      chi2=0.;
      nstep=0;
-     for(int i=0; i<6; i++) xv[i]=0.;
+ //     for(int i=0; i<6; i++) xv[i]=0.;
-     for(int i=0; i<6; i++) yv[i]=0.;
+ //     for(int i=0; i<6; i++) yv[i]=0.;
-     for(int i=0; i<6; i++) zv[i]=0.;
+ //     for(int i=0; i<6; i++) zv[i]=0.;
-     for(int i=0; i<6; i++) axv[i]=0.;
+ //     for(int i=0; i<6; i++) axv[i]=0.;
-     for(int i=0; i<6; i++) ayv[i]=0.;
+ //     for(int i=0; i<6; i++) ayv[i]=0.;
      for(int i=0; i<5; i++) {
          for(int j=0; j<5; j++) coval[i][j]=0.;
      }
  }
+ /**
+  * Set the tracking mode
+  */
  void TrkTrack::SetTrackingMode(int trackmode){
      extern cMini2track track_;
      track_.trackmode = trackmode;
  }
+ /**
+  * Set the factor scale for tracking precision
+  */
+ void TrkTrack::SetPrecisionFactor(double fact){
+     extern cMini2track track_;
+     track_.fact = fact;
+ }
+ /**
+  * Set the minimum number of steps for tracking precision
+  */
+ void TrkTrack::SetStepMin(int istepmin){
+     extern cMini2track track_;
+     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 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 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;
- /*
-  * Method to retrieve the X-view clusters associated to the track.
+ }
+ /**
+  * 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)
+  * @param toll Tolerance around the nominal volume (toll>0 define an inner fiducial volume)
+  */
+ // 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;
+ // }
+ Bool_t TrkTrack::IsInsideAcceptance(float toll){
+     int ngf = TrkParams::nGF;
+     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;
+         // 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 one of the surfaces which define the
+  * geometrical acceptance.
+  * @param surf tag of the surface (possible values are: S11 S12 S21 S22 T1
+  * CUF T2 T3 T4 T5 CLF T6 S31 S32).
+  * @param toll  Tolerance around the nominal surface (toll>0 define an inner
+  * fiducial surface)
+ */
+ Bool_t TrkTrack::IsInsideGFSurface(const char* surf, float toll){
+     int ngf = TrkParams::nGF;
+     bool SURFOK = false;
+     for(int i=0; i<ngf; i++){
+         if(  !TrkParams::GF_element[i].CompareTo(surf)  ){
+             SURFOK=true;
+             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 &&
+                 true)return true;
+         }
+     }
+     if( !SURFOK )cout << " Bool_t TrkTrack::IsInsideGFSurface(char* surf, float toll) --> suface "<<surf<<" not defined "<<endl;
+     return false;
+ }
+ /**
+  * Method to retrieve ID (0,1,...) of x-cluster (if any) associated to this track.
+  * If no cluster is associated, ID=-1.
+  * @param ip Tracker plane (0-5)
+  */
+ Int_t TrkTrack::GetClusterX_ID(int ip){
+     return ((Int_t)fabs(xgood[ip]))%10000000-1;
+ };
+ /**
+  * Method to retrieve ID (0-xxx) of y-cluster (if any) associated to this track.
+  * If no cluster is associated, ID=-1.
+  * @param ip Tracker plane (0-5)
+  */
+ Int_t TrkTrack::GetClusterY_ID(int ip){
+     return ((Int_t)fabs(ygood[ip]))%10000000-1;
+ };
+ /**
+  * Method to retrieve the ladder (0-2, increasing x) traversed by the track on this plane.
+  * If no ladder is traversed (dead area) the metod retuns -1.
   * @param ip Tracker plane (0-5)
   */
- TrkCluster *TrkTrack::GetClusterX(int ip){
+ Int_t TrkTrack::GetLadder(int ip){
-     cout << " TrkCluster *TrkTrack::GetClusterX(int ip) -- momentaneamente fuori servizio --"<< endl;
+     if(XGood(ip))return (Int_t)fabs(xgood[ip]/100000000)-1;
-     if(!clx)return NULL;
+     if(YGood(ip))return (Int_t)fabs(ygood[ip]/100000000)-1;
-     TrkCluster *pt = (TrkCluster*)(clx->At(ip));
+     return -1;
-     return pt;
  };
- /*
+ /**
-  * Method to retrieve the Y-view clusters associated to the track.
+  * Method to retrieve the sensor (0-1, increasing y) traversed by the track on this plane.
+  * If no sensor is traversed (dead area) the metod retuns -1.
   * @param ip Tracker plane (0-5)
   */
- TrkCluster *TrkTrack::GetClusterY(int ip){
+ Int_t TrkTrack::GetSensor(int ip){
-     cout << " TrkCluster *TrkTrack::GetClusterY(int ip) -- momentaneamente fuori servizio --"<< endl;
+     if(XGood(ip))return (Int_t)((Int_t)fabs(xgood[ip]/10000000)%10)-1;
-     if(!cly)return NULL;
+     if(YGood(ip))return (Int_t)((Int_t)fabs(ygood[ip]/10000000)%10)-1;
-     TrkCluster *pt = (TrkCluster*)(cly->At(ip));
+     return -1;
-     return pt;
+ };
+ /**
+  * \brief Method to include a x-cluster to the track.
+  * @param ip Tracker plane (0-5)
+  * @param clid Cluster ID (0 = no-cluster, 1,2,... otherwise )
+  * @param il Ladder (0-2, increasing x, -1 if no sensitive area is hit)
+  * @param is Sensor (0-1, increasing y, -1 if no sensitive area is hit)
+  * @param bad True if the cluster contains bad strips
+  * @see Fit(double pfixed, int& fail, int iprint, int froml1)
+  */
+ void TrkTrack::SetXGood(int ip, int clid, int il, int is, bool bad){
+ //    int il=0;       //ladder (temporary)
+ //    bool bad=false; //ladder (temporary)
+     if(ip<0||ip>5||clid<1||il<-1||il>2||is<-1||is>1)
+         cout << " void TrkTrack::SetXGood(int,int,int,int,bool) --> MA SEI DI COCCIO?!?!"<<endl;
+     xgood[ip]=(il+1)*100000000+(is+1)*10000000+clid;
+     if(bad)xgood[ip]=-xgood[ip];
+ };
+ /**
+  * \brief Method to include a y-cluster to the track.
+  * @param ip Tracker plane (0-5)
+  * @param clid Cluster ID (0 = no-cluster, 1,2,... otherwise )
+  * @param il Ladder (0-2, increasing x, -1 if no sensitive area is hit)
+  * @param is Sensor (0-1, increasing y, -1 if no sensitive area is hit)
+  * @param bad True if the cluster contains bad strips
+  * @see Fit(double pfixed, int& fail, int iprint, int froml1)
+  */
+ void TrkTrack::SetYGood(int ip, int clid, int il, int is, bool bad){
+ //    int il=0;       //ladder (temporary)
+ //    bool bad=false; //ladder (temporary)
+     if(ip<0||ip>5||clid<1||il<-1||il>2||is<-1||is>1)
+         cout << " void TrkTrack::SetYGood(int,int,int,int,bool) --> MA SEI DI COCCIO?!?!"<<endl;
+     ygood[ip]=(il+1)*100000000+(is+1)*10000000+clid;
+     if(bad)ygood[ip]=-ygood[ip];
+ };
+ /**
+  * \brief Average X
+  * Average value of <xv>, evaluated from the first to the last hit x view.
+  */
+ Float_t TrkTrack::GetXav(){
+     int first_plane = -1;
+     int last_plane  = -1;
+     for(Int_t ip=0; ip<6; 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){
+         return -100;
+     }
+     if( last_plane-first_plane+1 ==0 )return -100;
+     Float_t av = 0;
+     for(int ip=first_plane; ip<=last_plane; ip++)av+=xv[ip];
+     return (av/(last_plane-first_plane+1));
+ }
+ /**
+  * \brief Average Y
+  * Average value of <yv>, evaluated from the first to the last hit x view.
+  */
+ Float_t TrkTrack::GetYav(){
+     int first_plane = -1;
+     int last_plane  = -1;
+     for(Int_t ip=0; ip<6; 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){
+         return -100;
+     }
+     if( last_plane-first_plane+1 ==0 )return -100;
+     Float_t av = 0;
+     for(int ip=first_plane; ip<=last_plane; ip++)av+=yv[ip];
+     return (av/(last_plane-first_plane+1));
+ }
+ /**
+  * \brief Average Z
+  * Average value of <zv>, evaluated from the first to the last hit x view.
+  */
+ Float_t TrkTrack::GetZav(){
+     int first_plane = -1;
+     int last_plane  = -1;
+     for(Int_t ip=0; ip<6; 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){
+         return -100;
+     }
+     if( last_plane-first_plane+1 ==0 )return -100;
+     Float_t av = 0;
+     for(int ip=first_plane; ip<=last_plane; ip++)av+=zv[ip];
+     return (av/(last_plane-first_plane+1));
+ }
+ /**
+  * \brief Number of column traversed
+  */
+ Int_t TrkTrack::GetNColumns(){
+     int sensors[] = {0,0,0,0,0,0};
+     for(int ip=0; ip<6; ip++){
+         int sensorid = GetLadder(ip)+3*GetSensor(ip);
+         if(XGood(ip)||YGood(ip))
+             if(sensorid>=0 && sensorid<6)sensors[sensorid]=1;
+     }
+     int nsensors=0;
+     for(int is=0; is<6; is++)nsensors += sensors[is];
+     return nsensors;
+ };
+ /**
+  * \brief Give the maximum energy release
+  */
+ Float_t TrkTrack::GetDEDX_max(int ip, int iv){
+     Float_t max=0;
+     int pfrom = 0;
+     int pto   = 6;
+     int vfrom = 0;
+     int vto   = 2;
+     if(ip>=0&&ip<6){
+         pfrom = ip;
+         pto   = ip+1;
+     }
+     if(iv>=0&&iv<2){
+         vfrom = iv;
+         vto   = iv+1;
+     }
+     for(int i=pfrom; i<pto; i++)
+         for(int j=vfrom; j<vto; j++){
+             if(j==0 && XGood(i) && GetDEDX(i,j)>max)max=GetDEDX(i,j);
+             if(j==1 && YGood(i) && GetDEDX(i,j)>max)max=GetDEDX(i,j);
+         }
+     return max;
+ };
+ /**
+  * \brief Give the minimum energy release
+  */
+ Float_t TrkTrack::GetDEDX_min(int ip, int iv){
+     Float_t min=100000000;
+     int pfrom = 0;
+     int pto   = 6;
+     int vfrom = 0;
+     int vto   = 2;
+     if(ip>=0&&ip<6){
+         pfrom = ip;
+         pto   = ip+1;
+     }
+     if(iv>=0&&iv<2){
+         vfrom = iv;
+         vto   = iv+1;
+     }
+     for(int i=pfrom; i<pto; i++)
+         for(int j=vfrom; j<vto; j++){
+             if(j==0 && XGood(i) && GetDEDX(i,j)<min)min=GetDEDX(i,j);
+             if(j==1 && YGood(i) && GetDEDX(i,j)<min)min=GetDEDX(i,j);
+         }
+     return min;
+ };
+ /**
+  * \brief Give the maximum spatial residual
+  */
+ Float_t TrkTrack::GetResidual_max(int ip, int iv){
+     Float_t max=0;
+     int pfrom = 0;
+     int pto   = 6;
+     int vfrom = 0;
+     int vto   = 2;
+     if(ip>=0&&ip<6){
+         pfrom = ip;
+         pto   = ip+1;
+     }
+     if(iv>=0&&iv<2){
+         vfrom = iv;
+         vto   = iv+1;
+     }
+     for(int i=pfrom; i<pto; i++){
+         for(int j=vfrom; j<vto; j++){
+             if(j==0 && XGood(i) && fabs(xm[i]-xv[i])>fabs(max))max=xm[i]-xv[i];
+             if(j==1 && YGood(i) && fabs(ym[i]-yv[i])>fabs(max))max=ym[i]-yv[i];
+         }
+     }
+     return max;
+ };
+ /**
+  * \brief Give the anerage spatial residual
+  */
+ Float_t TrkTrack::GetResidual_av(int ip, int iv){
+     //
+ //Sum$((xm>-50)*(xm-xv)/resx)/sqrt(TrkTrack.GetNX()*TrkTrack.GetChi2X())<0.3
+     Float_t av  = 0.;
+     int     nav = 0;
+     //
+     int pfrom = 0;
+     int pto   = 6;
+     int vfrom = 0;
+     int vto   = 2;
+     if(ip>=0&&ip<6){
+         pfrom = ip;
+         pto   = ip+1;
+     }
+     if(iv>=0&&iv<2){
+         vfrom = iv;
+         vto   = iv+1;
+     }
+     for(int i=pfrom; i<pto; i++){
+         for(int j=vfrom; j<vto; j++){
+             nav++;
+             if(j==0 && XGood(i)) av += (xm[i]-xv[i])/resx[i];
+             if(j==1 && YGood(i)) av += (ym[i]-yv[i])/resy[i];
+         }
+     }
+     if(nav==0)return -100.;
+     return av/nav;
+ };
+ /**
+  * \brief Give the maximum multiplicity on the x view
+  */
+ Int_t TrkTrack::GetClusterX_Multiplicity_max(){
+     int max=0;
+     for(int ip=0; ip<6; ip++)
+         if(GetClusterX_Multiplicity(ip)>max)max=GetClusterX_Multiplicity(ip);
+     return max;
+ };
+ /**
+  * \brief Give the minimum multiplicity on the x view
+  */
+ Int_t TrkTrack::GetClusterX_Multiplicity_min(){
+     int min=50;
+     for(int ip=0; ip<6; ip++)
+         if(GetClusterX_Multiplicity(ip)<min)min=GetClusterX_Multiplicity(ip);
+     return min;
+ };
+ /**
+  * \brief Give the maximum multiplicity on the x view
+  */
+ Int_t TrkTrack::GetClusterY_Multiplicity_max(){
+     int max=0;
+     for(int ip=0; ip<6; ip++)
+         if(GetClusterY_Multiplicity(ip)>max)max=GetClusterY_Multiplicity(ip);
+     return max;
+ };
+ /**
+  * \brief Give the minimum multiplicity on the x view
+  */
+ Int_t TrkTrack::GetClusterY_Multiplicity_min(){
+     int min=50;
+     for(int ip=0; ip<6; ip++)
+         if(GetClusterY_Multiplicity(ip)<min)min=GetClusterY_Multiplicity(ip);
+     return min;
+ };
+ /**
+  * \brief Give the minimum seed on the x view
+  */
+ Float_t TrkTrack::GetClusterX_Seed_min(){
+     Float_t min=100000;
+     for(int ip=0; ip<6; ip++)
+         if(XGood(ip) && GetClusterX_Seed(ip)<min)min=GetClusterX_Seed(ip);
+     return min;
+ };
+ /**
+  * \brief Give the minimum seed on the x view
+  */
+ Float_t TrkTrack::GetClusterY_Seed_min(){
+     Float_t min=100000;
+     for(int ip=0; ip<6; ip++)
+         if(YGood(ip) && GetClusterY_Seed(ip)<min)min=GetClusterY_Seed(ip);
+     return min;
  };
-Line 505 
 void TrkTrack::Clear(){
+Line 1464 
 void TrkTrack::Clear(){
          zm[ip]     = 0;
          resx[ip]   = 0;
          resy[ip]   = 0;
+         tailx[ip]  = 0;
+         taily[ip]  = 0;
          xv[ip]     = 0;
          yv[ip]     = 0;
          zv[ip]     = 0;
-Line 514 
 void TrkTrack::Clear(){
+Line 1475 
 void TrkTrack::Clear(){
          dedx_y[ip] = 0;
      };
-     if(clx)clx->Clear();
+     int ngf = TrkParams::nGF;
-     if(cly)cly->Clear();
+     for(int i=0; i<ngf; i++){
+         xGF[i] = 0.;
+         yGF[i] = 0.;
+     }
+ //     if(clx)clx->Clear();
+ //     if(cly)cly->Clear();
+ //    clx.Clear();
+ //    cly.Clear();
  };
  //--------------------------------------
  //
-Line 523 
 void TrkTrack::Clear(){
+Line 1491 
 void TrkTrack::Clear(){
  //--------------------------------------
  void TrkTrack::Delete(){
  //    cout << "TrkTrack::Delete()"<<endl;
- //    Clear();
+     Clear();
-     if(clx)delete clx;
+ //    if(clx)delete clx;
-     if(cly)delete cly;
+ //    if(cly)delete cly;
  };
  //--------------------------------------
  //
-Line 538 
 void TrkTrack::Delete(){
+Line 1506 
 void TrkTrack::Delete(){
  //--------------------------------------
  TrkSinglet::TrkSinglet(){
  //    cout << "TrkSinglet::TrkSinglet() " << GetUniqueID()<<endl;
-     plane    = 0;
+ //     plane    = 0;
-     coord[0] = 0;
+ //     coord[0] = 0;
-     coord[1] = 0;
+ //     coord[1] = 0;
-     sgnl     = 0;
+ //     sgnl     = 0;
+ //     multmax  = 0;
  //    cls      = 0;
+     Clear();
  };
  //--------------------------------------
  //
-Line 554 
 TrkSinglet::TrkSinglet(const TrkSinglet&
+Line 1524 
 TrkSinglet::TrkSinglet(const TrkSinglet&
      coord[0] = s.coord[0];
      coord[1] = s.coord[1];
      sgnl     = s.sgnl;
+     multmax  = s.multmax;
  //      cls      = 0;//<<<<pointer
-     cls      = TRef(s.cls);
+ //    cls      = TRef(s.cls);
  };
  //--------------------------------------
  //
-Line 564 
 TrkSinglet::TrkSinglet(const TrkSinglet&
+Line 1535 
 TrkSinglet::TrkSinglet(const TrkSinglet&
  void TrkSinglet::Dump(){
      int i=0;
      cout << endl << "========== Singlet " ;
-     cout << endl << "plane    : " << plane;
+     cout << endl << "plane        : " << plane;
-     cout << endl << "coord[2] : "; while( i<2 && cout << coord[i] << " ") i++;
+     cout << endl << "coord[2]     : "; while( i<2 && cout << coord[i] << " ") i++;
-     cout << endl << "sgnl     : " << sgnl;
+     cout << endl << "sgnl         : " << sgnl;
+     cout << endl << "max.strip    : ";
+     cout << endl << "multiplicity : ";
  }
  //--------------------------------------
  //
-Line 579 
 void TrkSinglet::Clear(){
+Line 1552 
 void TrkSinglet::Clear(){
      coord[0]=-999;
      coord[1]=-999;
      sgnl=0;
+     multmax  = 0;
  }
  //--------------------------------------
-Line 588 
 void TrkSinglet::Clear(){
+Line 1562 
 void TrkSinglet::Clear(){
  TrkLevel2::TrkLevel2(){
    //    cout <<"TrkLevel2::TrkLevel2()"<<endl;
      for(Int_t i=0; i<12 ; i++){
-                 good[i] = -1;
+         good[i] = -1;
-         };
+         VKmask[i] = 0;
- // okkio!! memory-leak
+         VKflag[i] = 0;
- //     Track    = new TClonesArray("TrkTrack");
+     };
- //     SingletX = new TClonesArray("TrkSinglet");
- //     SingletY = new TClonesArray("TrkSinglet");
      Track    = 0;
      SingletX = 0;
      SingletY = 0;
-Line 616 
 void TrkLevel2::Dump(){
+Line 1588 
 void TrkLevel2::Dump(){
          //
      cout << endl << endl << "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-";
-     cout << endl << "good     : "; for(int i=0; i<12; i++) cout << good[i]<<" ";
+     cout << endl << "good     : "; for(int i=0; i<12; i++) cout << hex <<" 0x"<< good[i]<<dec;
-     cout << endl << "ntrk()   : " << this->ntrk() ;
+     cout << endl << "ntrk()   : " << ntrk() ;
-     cout << endl << "nclsx()  : " << this->nclsx();
+     cout << endl << "nclsx()  : " << nclsx();
-     cout << endl << "nclsy()  : " << this->nclsy();
+     cout << endl << "nclsy()  : " << nclsy();
- //     TClonesArray &t  = *Track;
- //     TClonesArray &sx = *SingletX;
- //     TClonesArray &sy = *SingletY;
- //     for(int i=0; i<ntrk(); i++)     ((TrkTrack *)t[i])->Dump();
- //     for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
- //     for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
      if(Track){
          TClonesArray &t  = *Track;
          for(int i=0; i<ntrk(); i++)     ((TrkTrack *)t[i])->Dump();
      }
-     if(SingletX){
+ //     if(SingletX){
-         TClonesArray &sx = *SingletX;
+ //      TClonesArray &sx = *SingletX;
-         for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
+ //      for(int i=0; i<nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
-     }
+ //     }
-     if(SingletY){
+ //     if(SingletY){
-         TClonesArray &sy = *SingletY;
+ //      TClonesArray &sy = *SingletY;
-         for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
+ //      for(int i=0; i<nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
-     }
+ //     }
+     cout << endl;
  }
+ /**
+  * \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);
+ };
  //--------------------------------------
  //
  //
  //--------------------------------------
  /**
-  * Fills a TrkLevel2 object with values from a struct cTrkLevel2 (to get data from F77 common).
+  * The method returns false if the viking-chip was masked
-  */
+  * either apriori ,on the basis of the mask read from the DB,
- // void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2){
+  * or run-by-run, on the basis of the calibration parameters)
+  * @param iv Tracker view (0-11)
- //      //  temporary objects:
+  * @param ivk Viking-chip number (0-23)
- //     TrkSinglet* t_singlet = new TrkSinglet();
+  */
- //     TrkTrack*   t_track   = new TrkTrack();
+ Bool_t TrkLevel2::GetVKMask(int iv, int ivk){
+     Int_t whichbit = (Int_t)pow(2,ivk);
- //      //  **** general variables ****
+     return (whichbit&VKmask[iv])!=0;
- // //    good2 = l2->good2;
+ }
- //     for(Int_t i=0; i<12 ; i++){
+ /**
- // //           crc[i] = l2->crc[i];
+  * The method returns false if the viking-chip was masked
- //              good[i] = l2->good[i];
+  * for this event due to common-noise computation failure.
- //      };
+  * @param iv Tracker view (0-11)
- //      //  *** TRACKS ***
+  * @param ivk Viking-chip number (0-23)
- //     if(!Track) Track = new TClonesArray("TrkTrack");
+  */
- //     TClonesArray &t = *Track;
+ Bool_t TrkLevel2::GetVKFlag(int iv, int ivk){
- //     for(int i=0; i<l2->ntrk; i++){
+     Int_t whichbit = (Int_t)pow(2,ivk);
- //      t_track->seqno = i;// NBNBNBNB deve sempre essere = i
+     return (whichbit&VKflag[iv])!=0;
- //      t_track->image = l2->image[i]-1;
+ }
- //      //      cout << "track "<<i<<t_track->seqno << t_track->image<<endl;
+ /**
- //      t_track->chi2  = l2->chi2_nt[i];
+  * The method returns true if the viking-chip was masked, either
- //      t_track->nstep = l2->nstep_nt[i];
+  * forced (see TrkLevel2::GetVKMask(int,int)) or
- //      for(int it1=0;it1<5;it1++){
+  * for this event only (TrkLevel2::GetVKFlag(int,int)).
- //          t_track->al[it1] = l2->al_nt[i][it1];
+  * @param iv Tracker view (0-11)
- //          for(int it2=0;it2<5;it2++)
+  * @param ivk Viking-chip number (0-23)
- //              t_track->coval[it1][it2] = l2->coval[i][it2][it1];
+  */
- //      };
+ Bool_t TrkLevel2::IsMaskedVK(int iv, int ivk){
- //      for(int ip=0;ip<6;ip++){
+     return !(GetVKMask(iv,ivk)&&GetVKFlag(iv,ivk) );
- //          t_track->xgood[ip]  = l2->xgood_nt[i][ip];
+ };
- //          t_track->ygood[ip]  = l2->ygood_nt[i][ip];
- //          t_track->xm[ip]     = l2->xm_nt[i][ip];
- //          t_track->ym[ip]     = l2->ym_nt[i][ip];
- //          t_track->zm[ip]     = l2->zm_nt[i][ip];
- //          t_track->resx[ip]   = l2->resx_nt[i][ip];
- //          t_track->resy[ip]   = l2->resy_nt[i][ip];
- //          t_track->xv[ip]     = l2->xv_nt[i][ip];
- //          t_track->yv[ip]     = l2->yv_nt[i][ip];
- //          t_track->zv[ip]     = l2->zv_nt[i][ip];
- //          t_track->axv[ip]    = l2->axv_nt[i][ip];
- //          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->clx[ip] = 0;
- // //                   t_track->cly[ip] = 0;
- //      };
- //      new(t[i]) TrkTrack(*t_track);
- //      t_track->Clear();
- //     };
- // //  *** SINGLETS ***
- //     if(!SingletX)SingletX = new TClonesArray("TrkSinglet");
- //     TClonesArray &sx = *SingletX;
- //     for(int i=0; i<l2->nclsx; i++){
- //      t_singlet->plane    = l2->planex[i];
- //      t_singlet->coord[0] = l2->xs[i][0];
- //      t_singlet->coord[1] = l2->xs[i][1];
- //      t_singlet->sgnl     = l2->signlxs[i];
- // //           t_singlet->cls      = 0;
- //      new(sx[i]) TrkSinglet(*t_singlet);
- //      t_singlet->Clear();
- //     }
- //     if(!SingletY)SingletY = new TClonesArray("TrkSinglet");
- //     TClonesArray &sy = *SingletY;
- //     for(int i=0; i<l2->nclsy; i++){
- //      t_singlet->plane    = l2->planey[i];
- //      t_singlet->coord[0] = l2->ys[i][0];
- //      t_singlet->coord[1] = l2->ys[i][1];
- //      t_singlet->sgnl     = l2->signlys[i];
- // //           t_singlet->cls      = 0;
- //      new(sy[i]) TrkSinglet(*t_singlet);
- //      t_singlet->Clear();
- //     };
- //     delete t_track;
- //     delete t_singlet;
- // }
  //--------------------------------------
  //
  //
-Line 733 
 void TrkLevel2::SetFromLevel2Struct(cTrk
+Line 1682 
 void TrkLevel2::SetFromLevel2Struct(cTrk
  //    cout << "void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2, TrkLevel1 *l1)"<<endl;
      Clear();
  //  temporary objects:
      TrkSinglet* t_singlet = new TrkSinglet();
      TrkTrack*   t_track   = new TrkTrack();
-Line 742 
 void TrkLevel2::SetFromLevel2Struct(cTrk
+Line 1692 
 void TrkLevel2::SetFromLevel2Struct(cTrk
  //  -----------------
      for(Int_t i=0; i<12 ; i++){
          good[i] = l2->good[i];
+         VKmask[i]=0;
+         VKflag[i]=0;
+         for(Int_t ii=0; ii<24 ; ii++){
+             Int_t setbit = (Int_t)pow(2,ii);
+             if( l2->vkflag[ii][i]!=-1 )VKmask[i]=VKmask[i]|setbit;
+             if( l2->vkflag[ii][i]!=0  )VKflag[i]=VKflag[i]|setbit;
+         };
      };
  //  --------------
  //  *** TRACKS ***
  //  --------------
      if(!Track) Track = new TClonesArray("TrkTrack");
      TClonesArray &t = *Track;
-     //-----------------------------------------------------
-     if( l1 && !t_track->clx )t_track->clx = new TRefArray(6,0);
-     if( l1 && !t_track->cly )t_track->cly = new TRefArray(6,0);
-     //-----------------------------------------------------
      for(int i=0; i<l2->ntrk; i++){
- //      cout <<" TRACK "<<i<<" ------------------ "<<endl;
          t_track->seqno = i;// NBNBNBNB deve sempre essere = i
          t_track->image = l2->image[i]-1;
          t_track->chi2  = l2->chi2_nt[i];
-Line 764 
 void TrkLevel2::SetFromLevel2Struct(cTrk
+Line 1717 
 void TrkLevel2::SetFromLevel2Struct(cTrk
                  t_track->coval[it1][it2] = l2->coval[i][it2][it1];
          };
          for(int ip=0;ip<6;ip++){
-             t_track->xgood[ip]  = l2->cltrx[i][ip];//l2->xgood_nt[i][ip];
+             // ---------------------------------
-             t_track->ygood[ip]  = l2->cltry[i][ip];//l2->ygood_nt[i][ip];
+             // new implementation of xgood/ygood
+             // ---------------------------------
+             t_track->xgood[ip]  = l2->cltrx[i][ip]; //cluster ID
+             t_track->ygood[ip]  = l2->cltry[i][ip]; //cluster ID
+             t_track->xgood[ip] += 10000000*l2->ls[i][ip]; // ladder+sensor
+             t_track->ygood[ip] += 10000000*l2->ls[i][ip]; // ladder+sensor
+             if(l2->xbad[i][ip]>0)t_track->xgood[ip]=-t_track->xgood[ip];
+             if(l2->ybad[i][ip]>0)t_track->ygood[ip]=-t_track->ygood[ip];
+ //          if(l2->xbad[i][ip]>0 || l2->ybad[i][ip]>0){
+ //          if(l2->dedx_x[i][ip]<0 || l2->dedx_y[i][ip]<0){
+ //              cout << ip << " - "<< l2->cltrx[i][ip] << " "<<l2->cltry[i][ip]<<" "<<l2->ls[i][ip]<<endl;
+ //              cout << ip << " - "<<t_track->xgood[ip]<<" "<<t_track->ygood[ip]<<endl;
+ //              cout << ip << " - "<<t_track->GetClusterX_ID(ip)<<" "<<t_track->GetClusterY_ID(ip)<<" "<<t_track->GetLadder(ip)<<" "<<t_track->GetSensor(ip)<<endl;
+ //              cout << ip << " - "<<t_track->BadClusterX(ip)<<" "<<t_track->BadClusterY(ip)<<endl;
+ //              cout << ip << " - "<<t_track->SaturatedClusterX(ip)<<" "<<t_track->SaturatedClusterY(ip)<<endl;
+ //          }
              t_track->xm[ip]     = l2->xm_nt[i][ip];
              t_track->ym[ip]     = l2->ym_nt[i][ip];
              t_track->zm[ip]     = l2->zm_nt[i][ip];
              t_track->resx[ip]   = l2->resx_nt[i][ip];
              t_track->resy[ip]   = l2->resy_nt[i][ip];
+             t_track->tailx[ip]  = l2->tailx[i][ip];
+             t_track->taily[ip]  = l2->taily[i][ip];
              t_track->xv[ip]     = l2->xv_nt[i][ip];
              t_track->yv[ip]     = l2->yv_nt[i][ip];
              t_track->zv[ip]     = l2->zv_nt[i][ip];
-Line 778 
 void TrkLevel2::SetFromLevel2Struct(cTrk
+Line 1748 
 void TrkLevel2::SetFromLevel2Struct(cTrk
              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];
- //          cout << " ip "<<ip<<" l2->cltrx[i][ip] "<< l2->cltrx[i][ip]<<endl;
+             t_track->multmaxx[ip] = l2->multmaxx[i][ip];
- //          cout << " ip "<<ip<<" l2->cltry[i][ip] "<< l2->cltry[i][ip]<<endl;
+             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];
              //-----------------------------------------------------
              //-----------------------------------------------------
- //          if(l1 && t_track->xgood[ip])t_track->clx->AddAt(l1->GetCluster(l2->cltrx[i][ip]-1),ip);
- //          if(l1 && t_track->ygood[ip])t_track->cly->AddAt(l1->GetCluster(l2->cltry[i][ip]-1),ip);
-             if(l2->xgood_nt[i][ip]){
- //                  cout << " ip "<<ip<<" l2->cltrx[i][ip] "<< l2->cltrx[i][ip]<<endl;
- //                  cout << " ip "<<ip<<" l2->cltrx[i][ip] "<< l2->cltrx[i][ip]<<" ";
- //                  if( l1->GetCluster(l2->cltrx[i][ip]-1)->TestBit(l1->GetCluster(l2->cltrx[i][ip]-1)->kIsReferenced) )cout << ">> is referenced ";
-                 if(l1)t_track->clx->AddAt(l1->GetCluster(l2->cltrx[i][ip]-1),ip);
- //                  cout << " --- "<<l1->GetCluster(l2->cltrx[i][ip]-1)->GetUniqueID()<<endl;
- //              t_track->xgood[ip] = l2->cltrx[i][ip]; // WORK-AROUND *****
-             }else{
-                 if(l1)t_track->clx->RemoveAt(ip);
-             }
-             if(l2->ygood_nt[i][ip]){
- //                  cout << " ip "<<ip<<" l2->cltry[i][ip] "<< l2->cltry[i][ip]<<endl;
- //                  cout << " ip "<<ip<<" l2->cltry[i][ip] "<< l2->cltry[i][ip]<<" ";
- //                  if( l1->GetCluster(l2->cltry[i][ip]-1)->TestBit(l1->GetCluster(l2->cltry[i][ip]-1)->kIsReferenced) )cout << ">> is referenced ";
-                 if(l1)t_track->cly->AddAt(l1->GetCluster(l2->cltry[i][ip]-1),ip);
- //                  cout << " --- "<<l1->GetCluster(l2->cltry[i][ip]-1)->GetUniqueID()<<endl;
- //              t_track->ygood[ip] = l2->cltry[i][ip]; // WORK-AROUND *****
-             }else{
-                 if(l1)t_track->cly->RemoveAt(ip);
-             }
              //-----------------------------------------------------
              //-----------------------------------------------------
          };
+         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         // evaluated coordinates (to define GF)
+         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         int    ngf = TrkParams::nGF;
+         float *zgf = TrkParams::zGF;
+         Trajectory tgf = Trajectory(ngf,zgf);
+         tgf.DoTrack(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 ***
  //  ----------------
-Line 820 
 void TrkLevel2::SetFromLevel2Struct(cTrk
+Line 1786 
 void TrkLevel2::SetFromLevel2Struct(cTrk
          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);
+ //      if(l1) t_singlet->cls      = l1->GetCluster(l2->clsx[i]-1);
          //-----------------------------------------------------
          new(sx[i]) TrkSinglet(*t_singlet);
          t_singlet->Clear();
-Line 833 
 void TrkLevel2::SetFromLevel2Struct(cTrk
+Line 1801 
 void TrkLevel2::SetFromLevel2Struct(cTrk
          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);
+ //      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;
-Line 876 
 void TrkLevel2::GetLevel2Struct(cTrkLeve
+Line 1848 
 void TrkLevel2::GetLevel2Struct(cTrkLeve
                  l2->zm_nt[i][ip]    = ((TrkTrack *)Track->At(i))->zm[ip];
                  l2->resx_nt[i][ip]  = ((TrkTrack *)Track->At(i))->resx[ip];
                  l2->resy_nt[i][ip]  = ((TrkTrack *)Track->At(i))->resy[ip];
+                 l2->tailx[i][ip]  = ((TrkTrack *)Track->At(i))->tailx[ip];
+                 l2->taily[i][ip]  = ((TrkTrack *)Track->At(i))->taily[ip];
                  l2->xv_nt[i][ip]    = ((TrkTrack *)Track->At(i))->xv[ip];
                  l2->yv_nt[i][ip]    = ((TrkTrack *)Track->At(i))->yv[ip];
                  l2->zv_nt[i][ip]    = ((TrkTrack *)Track->At(i))->zv[ip];
-Line 914 
 void TrkLevel2::GetLevel2Struct(cTrkLeve
+Line 1888 
 void TrkLevel2::GetLevel2Struct(cTrkLeve
  void TrkLevel2::Clear(){
      for(Int_t i=0; i<12 ; i++){
          good[i] = -1;
+         VKflag[i] = 0;
+         VKmask[i] = 0;
      };
  //    if(Track)Track->Clear("C");
  //    if(SingletX)SingletX->Clear("C");
-Line 947 
 TRefArray *TrkLevel2::GetTracks_NFitSort
+Line 1923 
 TRefArray *TrkLevel2::GetTracks_NFitSort
      if(!Track)return 0;
-     TRefArray *sorted = new TRefArray();
+     //    TRefArray *sorted = new TRefArray();
+     TRefArray *sorted = NULL;
      TClonesArray &t  = *Track;
  //    TClonesArray &ts = *PhysicalTrack;
-Line 985 
 TRefArray *TrkLevel2::GetTracks_NFitSort
+Line 1962 
 TRefArray *TrkLevel2::GetTracks_NFitSort
  //          cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
          };
+         if(!sorted)sorted = new TRefArray( TProcessID::GetProcessWithUID(t[indi]));
          sorted->Add( (TrkTrack*)t[indi] );
          m[indi] = 0;
-Line 1010 
 TRefArray *TrkLevel2::GetTracks_NFitSort
+Line 1988 
 TRefArray *TrkLevel2::GetTracks_NFitSort
  TrkTrack *TrkLevel2::GetStoredTrack(int is){
      if(is >= this->ntrk()){
-         cout << "** TrkLevel2 ** Track "<< is << "doen not exits! " << endl;
+         cout << "TrkTrack *TrkLevel2::GetStoredTrack(int) >> Track "<< is << "doen not exits! " << endl;
-         cout << "                Stored tracks ntrk() = "<< this->ntrk() << endl;
+         cout << "Stored tracks ntrk() = "<< this->ntrk() << endl;
          return 0;
      }
      if(!Track){
-Line 1032 
 TrkTrack *TrkLevel2::GetStoredTrack(int
+Line 2010 
 TrkTrack *TrkLevel2::GetStoredTrack(int
  TrkSinglet *TrkLevel2::GetSingletX(int is){
          if(is >= this->nclsx()){
-                 cout << "** TrkLevel2 ** Singlet "<< is << "doen not exits! " << endl;
+                 cout << "TrkSinglet *TrkLevel2::GetSingletX(int) >> Singlet "<< is << "doen not exits! " << endl;
-                 cout << "                Stored x-singlets nclsx() = "<< this->nclsx() << endl;
+                 cout << "Stored x-singlets nclsx() = "<< this->nclsx() << endl;
                  return 0;
          }
          if(!SingletX)return 0;
-Line 1052 
 TrkSinglet *TrkLevel2::GetSingletX(int i
+Line 2030 
 TrkSinglet *TrkLevel2::GetSingletX(int i
  TrkSinglet *TrkLevel2::GetSingletY(int is){
          if(is >= this->nclsy()){
-                 cout << "** TrkLevel2 ** Singlet "<< is << "doen not exits! " << endl;
+                 cout << "TrkSinglet *TrkLevel2::GetSingletY(int) >> Singlet "<< is << "doen not exits! " << endl;
-                 cout << "                Stored y-singlets nclsy() = "<< this->nclsx() << endl;
+                 cout << "Stored y-singlets nclsx() = "<< this->nclsx() << endl;
                  return 0;
          }
          if(!SingletY)return 0;
-Line 1073 
 TrkSinglet *TrkLevel2::GetSingletY(int i
+Line 2051 
 TrkSinglet *TrkLevel2::GetSingletY(int i
  TrkTrack *TrkLevel2::GetTrack(int it){
          if(it >= this->GetNTracks()){
-                 cout << "** TrkLevel2 ** Track "<< it << "does not exits! " << endl;
+                 cout << "TrkTrack *TrkLevel2::GetTrack(int) >> Track "<< it << "does not exits! " << endl;
-                 cout << "                Physical tracks GetNTracks() = "<< this->ntrk() << endl;
+                 cout << "Physical tracks GetNTracks() = "<< this->ntrk() << endl;
                  return 0;
          }
-Line 1111 
 Int_t TrkLevel2::GetNTracks(){
+Line 2089 
 Int_t TrkLevel2::GetNTracks(){
  TrkTrack *TrkLevel2::GetTrackImage(int it){
      if(it >= this->GetNTracks()){
-         cout << "** TrkLevel2 ** Track "<< it << "does not exits! " << endl;
+         cout << "TrkTrack *TrkLevel2::GetTrackImage(int) >> Track "<< it << "does not exits! " << endl;
-         cout << "                Physical tracks GetNTracks() = "<< this->ntrk() << endl;
+         cout << "Physical tracks GetNTracks() = "<< this->ntrk() << endl;
          return 0;
      }
-Line 1121 
 TrkTrack *TrkLevel2::GetTrackImage(int i
+Line 2099 
 TrkTrack *TrkLevel2::GetTrackImage(int i
      TrkTrack *track = (TrkTrack*)sorted->At(it);
      if(!track->HasImage()){
-         cout << "** TrkLevel2 ** Track "<< it << "does not have image! " << endl;
+         cout << "TrkTrack *TrkLevel2::GetTrackImage(int) >> Track "<< it << "does not have image! " << endl;
          return 0;
      }
      if(!Track)return 0;
-Line 1148 
 void TrkLevel2::LoadField(TString path){
+Line 2126 
 void TrkLevel2::LoadField(TString path){
  //     path_.error   = 0;
  //     readb_();
+ //     TrkParams::SetTrackingMode();
+ //     TrkParams::SetPrecisionFactor();
+ //     TrkParams::SetStepMin();
+     TrkParams::SetMiniDefault();
      TrkParams::Set(path,1);
      TrkParams::Load(1);
+     if( !TrkParams::IsLoaded(1) ){
+         cout << "void TrkLevel2::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+     }
  //
  };
- /**
+ // /**
-  * Get BY (kGauss)
+ //  * Get BY (kGauss)
-  * @param v (x,y,z) coordinates in cm
+ //  * @param v (x,y,z) coordinates in cm
-  */
+ //  */
- float TrkLevel2::GetBX(float* v){
+ // float TrkLevel2::GetBX(float* v){
-     float b[3];
+ //     float b[3];
-     gufld_(v,b);
+ //     gufld_(v,b);
-     return b[0]/10.;
+ //     return b[0]/10.;
- }
+ // }
- /**
+ // /**
-  * Get BY (kGauss)
+ //  * Get BY (kGauss)
-  * @param v (x,y,z) coordinates in cm
+ //  * @param v (x,y,z) coordinates in cm
-  */
+ //  */
- float TrkLevel2::GetBY(float* v){
+ // float TrkLevel2::GetBY(float* v){
-     float b[3];
+ //     float b[3];
-     gufld_(v,b);
+ //     gufld_(v,b);
-     return b[1]/10.;
+ //     return b[1]/10.;
- }
+ // }
- /**
+ // /**
-  * Get BY (kGauss)
+ //  * Get BY (kGauss)
-  * @param v (x,y,z) coordinates in cm
+ //  * @param v (x,y,z) coordinates in cm
-  */
+ //  */
- float TrkLevel2::GetBZ(float* v){
+ // float TrkLevel2::GetBZ(float* v){
-     float b[3];
+ //     float b[3];
-     gufld_(v,b);
+ //     gufld_(v,b);
-     return b[2]/10.;
+ //     return b[2]/10.;
- }
+ // }
  //--------------------------------------
  //
  //
-Line 1208 
 Float_t TrkLevel2::GetZTrk(Int_t plane_i
+Line 2194 
 Float_t TrkLevel2::GetZTrk(Int_t plane_i
   * (By default is created with z-coordinates inside the tracking volume)
    */
  Trajectory::Trajectory(){
-     npoint = 10;
+     npoint = 6;
      x = new float[npoint];
      y = new float[npoint];
      z = new float[npoint];
-Line 1275 
 Trajectory::Trajectory(int n, float* zin
+Line 2261 
 Trajectory::Trajectory(int n, float* zin
      thy = new float[npoint];
      tl = new float[npoint];
      int i=0;
      do{
-         x[i] = 0;
+         x[i] = 0.;
-         y[i] = 0;
+         y[i] = 0.;
          z[i] = zin[i];
-         thx[i] = 0;
+         thx[i] = 0.;
-         thy[i] = 0;
+         thy[i] = 0.;
-         tl[i] = 0;
+         tl[i] = 0.;
          i++;
      }while(zin[i-1] > zin[i] && i < npoint);
      npoint=i;
-     if(npoint != n)cout << "NB! Trajectory created with "<<npoint<<" points"<<endl;
+     if(npoint != n)cout << "NB! Trajectory created with "<<npoint<<" points instean of "<<n<<endl;
+     //    Dump();
  }
  void Trajectory::Delete(){
-Line 1337 
 float Trajectory::GetLength(int ifirst,
+Line 2324 
 float Trajectory::GetLength(int ifirst,
  /**
   * Evaluates the trajectory in the apparatus associated to the track.
-  * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.
+  * It integrates the equations of motion in the magnetic field.
-  * @param t pointer to an object of the class Trajectory,
+  * @param al Track state-vector (X0,Y0,sin(theta),phi,deflection).
-  * which z coordinates should be previously initialized by calling the proper constructor ( Trajectory::Trajectory(int n, float* zin) ).
+  * @param zini z-coordinate of the reference plane (Z0).
   * @return error flag.
-  */
+  *
- int Trajectory::DoTrack2(float* al){
+  * This method is needed when you want to integrate the particle trajectory
+  * starting from a track state-vector relative to an arbitrary reference plane.
-     double *dxout   = new double[npoint];
+  * The default reference plane, used by the tracker routines, is at zini=23.5.
-     double *dyout   = new double[npoint];
+  * If you give as input the track state-vector from a TrkTrack object,
-     double *dthxout = new double[npoint];
+  * you can use Trajectory::DoTrack(float* al) instead.
-     double *dthyout = new double[npoint];
+  */
-     double *dtlout  = new double[npoint];
+ int Trajectory::DoTrack(float* al, float zini){
-     double *dzin    = new double[npoint];
+ //      double *dxout   = new double[npoint];
+ //      double *dyout   = new double[npoint];
+ //      double *dthxout = new double[npoint];
+ //      double *dthyout = new double[npoint];
+ //      double *dtlout  = new double[npoint];
+ //      double *dzin    = new double[npoint];
+     double *dxout;
+     double *dyout;
+     double *dthxout;
+     double *dthyout;
+     double *dtlout;
+     double *dzin;
+     dxout   = (double*) malloc(npoint*sizeof(double));
+     dyout   = (double*) malloc(npoint*sizeof(double));
+     dthxout = (double*) malloc(npoint*sizeof(double));
+     dthyout = (double*) malloc(npoint*sizeof(double));
+     dtlout  = (double*) malloc(npoint*sizeof(double));
+     dzin    = (double*) malloc(npoint*sizeof(double));
      double dal[5];
-     int ifail = 0;
+     double dzini = (double)zini;
+     int ifail = 0;
      for (int i=0; i<5; i++)      dal[i]  = (double)al[i];
      for (int i=0; i<npoint; i++) dzin[i] = (double)z[i];
      TrkParams::Load(1);
      if( !TrkParams::IsLoaded(1) ){
-         cout << "int Trajectory::DoTrack2(float* al) --- ERROR --- m.field not loaded"<<endl;
+         cout << "int Trajectory::DoTrack(float* al) --- ERROR --- m.field not loaded"<<endl;
          return 0;
      }
-     dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
+ //    dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
+     dotrack3_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&dzini,&ifail);
      for (int i=0; i<npoint; i++){
-         x[i]   = (float)*dxout++;
+         x[i]   = (float)*(dxout+i);
-         y[i]   = (float)*dyout++;
+         y[i]   = (float)*(dyout+i);
-         thx[i] = (float)*dthxout++;
+         thx[i] = (float)*(dthxout+i);
-         thy[i] = (float)*dthyout++;
+         thy[i] = (float)*(dthyout+i);
-         tl[i]  = (float)*dtlout++;
+         tl[i]  = (float)*(dtlout+i);
      }
+     if(dxout)  free( dxout );
+     if(dyout)  free( dyout );
+     if(dthxout)free( dthxout );
+     if(dthyout)free( dthyout );
+     if(dtlout) free( dtlout );
+     if(dzin)   free( dzin );
+ //      delete [] dxout;
+ //      delete [] dyout;
+ //      delete [] dthxout;
+ //      delete [] dthyout;
+ //      delete [] dtlout;
+ //      delete [] dzin;
      return ifail;
  };
+ /**
+  *
+  * >>> OBSOLETE !!! use Trajectory::DoTrack(float* al, float zini) instead
+  *
+  */
+ int Trajectory::DoTrack2(float* al, float zini){
+     cout << endl;
+     cout << " int Trajectory::DoTrack2(float* al, float zini) --->> NB NB !! this method is going to be eliminated !!! "<<endl;
+     cout << " >>>> replace it with TrkTrack::DoTrack(Trajectory* t) <<<<"<<endl;
+     cout << " (Sorry Wolfgang!! Don't be totally confused!! By Elena)"<<endl;
+     cout << endl;
+     return DoTrack(al,zini);
+ };
  ClassImp(TrkLevel2);
  ClassImp(TrkSinglet);
  ClassImp(TrkTrack);

 Legend:



Removed from v.1.30
 


changed lines


 
Added in v.1.58
 Legend:



Removed from v.1.30
 


changed lines


 
Added in v.1.58
-Removed from v.1.30
+Added in v.1.58

	ViewVC Help
Powered by ViewVC 1.1.23