--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2006/11/08 16:42:28	1.16
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/02/19 16:28:39	1.27
@@ -13,15 +13,18 @@
     void dotrack_(int*, double*, double*, double*, double*, int*);
     void dotrack2_(int*, double*, double*, double*, double*,double*, double*, double*,int*);
 //    int  readb_(const char*);
-    int  readb_();
-    void mini2_(int*,int*,int*); 
-    void guess_();
+//    int  readb_();
+     void mini2_(int*,int*,int*); 
+     void guess_();
+     void gufld_(float*, float*);
 }
+
 //--------------------------------------
 //
 //
 //--------------------------------------
 TrkTrack::TrkTrack(){
+//    cout << "TrkTrack::TrkTrack()" << endl;
     seqno = -1; 
     image = -1; 
     chi2  = 0;
@@ -31,25 +34,25 @@
 	for(int it2=0;it2<5;it2++)coval[it1][it2] = 0;
     };
     for(int ip=0;ip<6;ip++){
-		xgood[ip]  = 0;
-		ygood[ip]  = 0;
-		xm[ip]     = 0;
-		ym[ip]     = 0;
-		zm[ip]     = 0;
-		resx[ip]   = 0;
-		resy[ip]   = 0;
-		xv[ip]     = 0;
-		yv[ip]     = 0;
-		zv[ip]     = 0;
-		axv[ip]    = 0;
-		ayv[ip]    = 0;
-		dedx_x[ip] = 0;
-		dedx_y[ip] = 0;
-//		clx[ip]    = 0;
-//		cly[ip]    = 0;
-	};
-	clx = new TRefArray(6,0);
-	cly = new TRefArray(6,0);
+	xgood[ip]  = 0;
+	ygood[ip]  = 0;
+	xm[ip]     = 0;
+	ym[ip]     = 0;
+	zm[ip]     = 0;
+	resx[ip]   = 0;
+	resy[ip]   = 0;
+	xv[ip]     = 0;
+	yv[ip]     = 0;
+	zv[ip]     = 0;
+	axv[ip]    = 0;
+	ayv[ip]    = 0;
+	dedx_x[ip] = 0;
+	dedx_y[ip] = 0;
+    };
+    clx = 0;
+    cly = 0;
+//    clx = new TRefArray(6,0);
+//    cly = new TRefArray(6,0);
 };
 //--------------------------------------
 //
@@ -65,31 +68,64 @@
 	for(int it2=0;it2<5;it2++)coval[it1][it2] = t.coval[it1][it2];
     };
     for(int ip=0;ip<6;ip++){
-		xgood[ip]  = t.xgood[ip];
-		ygood[ip]  = t.ygood[ip];
-		xm[ip]     = t.xm[ip];
-		ym[ip]     = t.ym[ip];
-		zm[ip]     = t.zm[ip];
-		resx[ip]   = t.resx[ip];
-		resy[ip]   = t.resy[ip];
-		xv[ip]     = t.xv[ip];
-		yv[ip]     = t.yv[ip];
-		zv[ip]     = t.zv[ip];
-		axv[ip]    = t.axv[ip];
-		ayv[ip]    = t.ayv[ip];
-		dedx_x[ip] = t.dedx_x[ip];
-		dedx_y[ip] = t.dedx_y[ip];
-	//	clx[ip]    = 0;//<<<<pointer
-	//	cly[ip]    = 0;//<<<<pointer
-	};
-	clx = new TRefArray(*(t.clx));
-	cly = new TRefArray(*(t.cly));
+	xgood[ip]  = t.xgood[ip];
+	ygood[ip]  = t.ygood[ip];
+	xm[ip]     = t.xm[ip];
+	ym[ip]     = t.ym[ip];
+	zm[ip]     = t.zm[ip];
+	resx[ip]   = t.resx[ip];
+	resy[ip]   = t.resy[ip];
+	xv[ip]     = t.xv[ip];
+	yv[ip]     = t.yv[ip];
+	zv[ip]     = t.zv[ip];
+	axv[ip]    = t.axv[ip];
+	ayv[ip]    = t.ayv[ip];
+	dedx_x[ip] = t.dedx_x[ip];
+	dedx_y[ip] = t.dedx_y[ip];
+    };
+    clx = 0;
+    cly = 0;
+    if(t.clx)clx = new TRefArray(*(t.clx));
+    if(t.cly)cly = new TRefArray(*(t.cly));
 	
 };
 //--------------------------------------
 //
 //
 //--------------------------------------
+void TrkTrack::Copy(TrkTrack& t){
+
+    t.seqno = seqno; 
+    t.image = image; 
+    t.chi2  = chi2;
+    t.nstep = nstep;
+    for(int it1=0;it1<5;it1++){
+	t.al[it1] = al[it1];
+	for(int it2=0;it2<5;it2++)t.coval[it1][it2] = coval[it1][it2];
+    };
+    for(int ip=0;ip<6;ip++){
+	t.xgood[ip]  = xgood[ip];
+	t.ygood[ip]  = ygood[ip];
+	t.xm[ip]     = xm[ip];
+	t.ym[ip]     = ym[ip];
+	t.zm[ip]     = zm[ip];
+	t.resx[ip]   = resx[ip];
+	t.resy[ip]   = resy[ip];
+	t.xv[ip]     = xv[ip];
+	t.yv[ip]     = yv[ip];
+	t.zv[ip]     = zv[ip];
+	t.axv[ip]    = axv[ip];
+	t.ayv[ip]    = ayv[ip];
+	t.dedx_x[ip] = dedx_x[ip];
+	t.dedx_y[ip] = dedx_y[ip];
+	    
+    };
+    
+};
+//--------------------------------------
+//
+//
+//--------------------------------------
 /**
  * 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.  
@@ -109,6 +145,11 @@
     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);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "int TrkTrack::DoTrack(Trajectory* t) --- ERROR --- m.field not loaded"<<endl;
+	return 0;
+    }
     dotrack_(&(t->npoint),dzin,dxout,dyout,dal,&ifail);
     
     for (int i=0; i<t->npoint; i++){
@@ -148,6 +189,11 @@
     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);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "int TrkTrack::DoTrack2(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++){
@@ -252,12 +298,78 @@
  */
 void TrkTrack::LoadField(TString path){
     
-    strcpy(path_.path,path.Data());
-    path_.pathlen = path.Length();
-    path_.error   = 0;
-    readb_();
+//     strcpy(path_.path,path.Data());
+//     path_.pathlen = path.Length();
+//     path_.error   = 0;
+//     readb_();
+
+    TrkParams::Set(path,1);
 
 };
+
+
+/**
+ * Method to fill minimization-routine common
+ */
+void TrkTrack::FillMiniStruct(cMini2track& track){
+
+    for(int i=0; i<6; i++){ 
+
+	track.xgood[i]=xgood[i];
+	track.ygood[i]=ygood[i];
+	
+	track.xm[i]=xm[i];
+	track.ym[i]=ym[i];
+	track.zm[i]=zm[i];
+	
+//      --- temporaneo ----------------------------
+//      andrebbe inserita la dimensione del sensore
+	float segment = 100.;
+	track.xm_a[i]=xm[i];
+	track.xm_b[i]=xm[i];
+	track.ym_a[i]=ym[i];
+	track.ym_b[i]=ym[i];
+	if(       xgood[i] && !ygood[i] ){
+	    track.ym_a[i] = track.ym_a[i]+segment;
+	    track.ym_b[i] = track.ym_b[i]-segment;
+	}else if( !xgood[i] && ygood[i]){
+	    track.xm_a[i] = track.xm_a[i]+segment;
+	    track.xm_b[i] = track.xm_b[i]-segment;
+	}
+//      --- temporaneo ----------------------------
+	
+	track.resx[i]=resx[i];
+	track.resy[i]=resy[i];
+    }
+
+    for(int i=0; i<5; i++) track.al[i]=al[i]; 
+    track.zini = 23.5; 
+// ZINI = 23.5 !!! it should be the same parameter in all codes
+    
+}
+/**
+ * Method to set values from  minimization-routine common
+ */
+void TrkTrack::SetFromMiniStruct(cMini2track *track){
+
+    for(int i=0; i<5; i++) {
+	al[i]=track->al[i];
+	for(int j=0; j<5; j++) coval[i][j]=track->cov[i][j];
+    }
+    chi2  = track->chi2;
+    nstep = track->nstep;
+    for(int i=0; i<6; i++){ 
+	xv[i]  = track->xv[i];
+	yv[i]  = track->yv[i];
+	zv[i]  = track->zv[i];
+	xm[i]  = track->xm[i];
+	ym[i]  = track->ym[i];
+	zm[i]  = track->zm[i];
+	axv[i] = track->axv[i];
+	ayv[i] = track->ayv[i];	
+    }
+    
+}
 /**
  * Tracking method. It calls F77 mini routine.
  */
@@ -267,94 +379,58 @@
 
     extern cMini2track track_;
     fail = 0;
+    FillMiniStruct(track_);
 
-    for(int i=0; i<6; i++) track_.xm[i]=xm[i];
-    for(int i=0; i<6; i++) track_.ym[i]=ym[i];
-    for(int i=0; i<6; i++) track_.zm[i]=zm[i];
-    for(int i=0; i<6; i++) track_.resx[i]=resx[i];
-    for(int i=0; i<6; i++) track_.resy[i]=resy[i];
-    for(int i=0; i<6; i++) track_.xgood[i]=xgood[i];
-    for(int i=0; i<6; i++) track_.ygood[i]=ygood[i];
-
-// initial guess of "al" with linear fit
-//     if(al[0]==-9999.&&al[1]==-9999.&&al[2]==-9999.&&al[3]==-9999.&&al[4]==-9999.){
-// 	cout << "initial guess "<<endl;
-// 	double szz=0., szx=0., szy=0., ssx=0., ssy=0., sz=0., s1=0.;
-// 	double det, ax, ay, bx, by;
-// 	for(int i=0; i<NPLANE; i++) {
-// 	    szz=szz+zm[i]*zm[i];
-// 	    szx=szx+zm[i]*xm[i];
-// 	    szy=szy+zm[i]*ym[i];
-// 	    ssx=ssx+xm[i];
-// 	    ssy=ssy+ym[i];
-// 	    sz=sz+zm[i];
-// 	    s1=s1+1.;
-// 	}
-// 	det=szz*s1-sz*sz;
-// 	ax=(szx*s1-sz*ssx)/det;
-// 	bx=(szz*ssx-szx*sz)/det;
-// 	ay=(szy*s1-sz*ssy)/det;
-// 	by=(szz*ssy-szy*sz)/det;
-// 	al[0]=ax*23.5+bx; // ZINI = 23.5 !!! it should be the same parameter in all codes
-// 	al[1]=ay*23.5+by; //  "   
-// 	al[2]= sqrt(pow(ax,2)+pow(ay,2))/ sqrt(pow(ax,2)+pow(ay,2)+1.);
-// 	al[3]=0.;
-// 	if( (ax!=0.)||(ay!=0.) ) {
-// 	    al[3]= asin(ay/ sqrt(pow(ax,2)+pow(ay,2)));
-// 	    if(ax<0.) al[3]=acos(-1.)-al[3];
-// 	}
-// 	al[4]=0.;
-//     }
-// end guess
-
-    for(int i=0; i<5; i++) track_.al[i]=al[i]; 
-    track_.zini = 23.5; 
-// ZINI = 23.5 !!! it should be the same parameter in all codes
-
+    // 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_();
 
     // --------------------- free momentum 
     if(pfixed==0.) {
-//	al[4]=0.;         // free momentum 
-	track_.pfixed=0.; //         "
+	track_.pfixed=0.; 
     }
     // --------------------- fixed momentum 
     if(pfixed!=0.) {
-	al[4]=1./pfixed;      // to fix the momentum
-	track_.pfixed=pfixed; //         "
+	al[4]=1./pfixed;     
+	track_.pfixed=pfixed;
     }
 
-//  store temporarily the initial guess
+    //  store temporarily the initial guess
     for(int i=0; i<5; i++) al_ini[i]=track_.al[i]; 
 
-
+    //  ------------------------------------------
+    //  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);
     if(ifail!=0) {
-	if(iprint==1)cout << "ERROR: ifail= " << ifail << endl;
+	if(iprint)cout << "ERROR: ifail= " << ifail << endl;
 	fail = 1;
-//	return;
     }
+    //  ------------------------------------------
     
-
+    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];
-    }
+//     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){
-	cout << " >>>> fit failed >>>> drawing initial par"<<endl;
-	for(int i=0; i<5; i++) al[i]=al_ini[i]; 
+ 	if(iprint)cout << " >>>> fit failed >>>> drawing initial par"<<endl;
+ 	for(int i=0; i<5; i++) al[i]=al_ini[i]; 
     }
 
 };
@@ -374,51 +450,56 @@
 	for(int j=0; j<5; j++) coval[i][j]=0.;
     }
 }
+void TrkTrack::SetTrackingMode(int trackmode){
+    extern cMini2track track_;
+    track_.trackmode = trackmode;
+}
 
 //--------------------------------------
 //
 //
 //--------------------------------------
 void TrkTrack::Clear(){
-	seqno = -1; 
-	image = -1; 
-	chi2  = 0;
-	nstep = 0;
-	for(int it1=0;it1<5;it1++){
-		al[it1] = 0;
-		for(int it2=0;it2<5;it2++)coval[it1][it2] = 0;
-	};
-	for(int ip=0;ip<6;ip++){
-		xgood[ip]  = 0;
-		ygood[ip]  = 0;
-		xm[ip]     = 0;
-		ym[ip]     = 0;
-		zm[ip]     = 0;
-		resx[ip]   = 0;
-		resy[ip]   = 0;
-		xv[ip]     = 0;
-		yv[ip]     = 0;
-		zv[ip]     = 0;
-		axv[ip]    = 0;
-		ayv[ip]    = 0;
-		dedx_x[ip] = 0;
-		dedx_y[ip] = 0;
-//		clx[ip]    = 0;
-//		cly[ip]    = 0;
-	};
-	clx->Clear();
-	cly->Clear();
+//    cout << "TrkTrack::Clear()"<<endl;
+    seqno = -1; 
+    image = -1; 
+    chi2  = 0;
+    nstep = 0;
+    for(int it1=0;it1<5;it1++){
+	al[it1] = 0;
+	for(int it2=0;it2<5;it2++)coval[it1][it2] = 0;
+    };
+    for(int ip=0;ip<6;ip++){
+	xgood[ip]  = 0;
+	ygood[ip]  = 0;
+	xm[ip]     = 0;
+	ym[ip]     = 0;
+	zm[ip]     = 0;
+	resx[ip]   = 0;
+	resy[ip]   = 0;
+	xv[ip]     = 0;
+	yv[ip]     = 0;
+	zv[ip]     = 0;
+	axv[ip]    = 0;
+	ayv[ip]    = 0;
+	dedx_x[ip] = 0;
+	dedx_y[ip] = 0;
+
+    };
+    if(clx)clx->Clear();
+    if(cly)cly->Clear();
 };
 //--------------------------------------
 //
 //
 //--------------------------------------
 void TrkTrack::Delete(){
-	Clear();
-	clx->Delete();
-	cly->Delete();
+//    cout << "TrkTrack::Delete()"<<endl;
+//    Clear();
+    if(clx)delete clx;
+    if(cly)delete cly;
 };
-	//--------------------------------------
+//--------------------------------------
 //
 //
 //--------------------------------------
@@ -428,23 +509,25 @@
 //
 //--------------------------------------
 TrkSinglet::TrkSinglet(){
+//    cout << "TrkSinglet::TrkSinglet() " << GetUniqueID()<<endl;
     plane    = 0;
     coord[0] = 0; 
     coord[1] = 0;
     sgnl     = 0;
-	cls      = 0;
+//    cls      = 0;
 };
 //--------------------------------------
 //
 //
 //--------------------------------------
 TrkSinglet::TrkSinglet(const TrkSinglet& s){
+//    cout << "TrkSinglet::TrkSinglet(const TrkSinglet& s) " << GetUniqueID()<<endl;
     plane    = s.plane;
     coord[0] = s.coord[0]; 
     coord[1] = s.coord[1];
     sgnl     = s.sgnl;
 //	cls      = 0;//<<<<pointer
-	cls      = TRef(s.cls);
+    cls      = TRef(s.cls);
 };
 //--------------------------------------
 //
@@ -461,18 +544,41 @@
 //
 //
 //--------------------------------------
+void TrkSinglet::Clear(){
+//    cout << "TrkSinglet::Clear() " << GetUniqueID()<<endl;
+//    cls=0;
+    plane=-1;
+    coord[0]=-999;
+    coord[1]=-999;
+    sgnl=0;
+    
+}
+//--------------------------------------
+//
+//
+//--------------------------------------
 TrkLevel2::TrkLevel2(){
-//    good2    = -1;
+  //    cout <<"TrkLevel2::TrkLevel2()"<<endl;
     for(Int_t i=0; i<12 ; i++){
-//	crc[i] = -1;
 		good[i] = -1;
 	};
-    Track    = new TClonesArray("TrkTrack");
-    SingletX = new TClonesArray("TrkSinglet");
-    SingletY = new TClonesArray("TrkSinglet");
+// okkio!! memory-leak
+//     Track    = new TClonesArray("TrkTrack");
+//     SingletX = new TClonesArray("TrkSinglet");
+//     SingletY = new TClonesArray("TrkSinglet");
+    Track    = 0;
+    SingletX = 0;
+    SingletY = 0;
 
-//	PhysicalTrack = new TClonesArray("TrkTrack");
-	//sostituire con TRefArray... appena ho capito come si usa
+}
+//--------------------------------------
+//
+//
+//--------------------------------------
+void TrkLevel2::Set(){
+    if(!Track)Track    = new TClonesArray("TrkTrack");
+    if(!SingletX)SingletX = new TClonesArray("TrkSinglet");
+    if(!SingletY)SingletY = new TClonesArray("TrkSinglet");
 }
 //--------------------------------------
 //
@@ -480,18 +586,30 @@
 //--------------------------------------
 void TrkLevel2::Dump(){
 	
-    TClonesArray &t  = *Track;
-    TClonesArray &sx = *SingletX;
-    TClonesArray &sy = *SingletY;
 	//
     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();
-    for(int i=0; i<this->ntrk(); i++)     ((TrkTrack *)t[i])->Dump();
-    for(int i=0; i<this->nclsx(); i++) ((TrkSinglet *)sx[i])->Dump();
-    for(int i=0; i<this->nclsy(); i++) ((TrkSinglet *)sy[i])->Dump();
+//     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){
+	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();
+    }
 }
 //--------------------------------------
 //
@@ -500,77 +618,80 @@
 /**
  * Fills a TrkLevel2 object with values from a struct cTrkLevel2 (to get data from F77 common).
  */
-void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2){
-
-	//  temporary objects:
-    TrkSinglet* t_singlet = new TrkSinglet();
-    TrkTrack*   t_track   = new TrkTrack();
+// void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2){
 
-	//  **** general variables ****
-//    good2 = l2->good2;
-    for(Int_t i=0; i<12 ; i++){
-//		crc[i] = l2->crc[i];
-		good[i] = l2->good[i];
-	};
-	//  *** TRACKS ***
-    TClonesArray &t = *Track;
-    for(int i=0; i<l2->ntrk; i++){
-		t_track->seqno = i;// NBNBNBNB deve sempre essere = i
-		t_track->image = l2->image[i]-1;
-	//	cout << "track "<<i<<t_track->seqno << t_track->image<<endl;
-		t_track->chi2  = l2->chi2_nt[i];
-		t_track->nstep = l2->nstep_nt[i];
-		for(int it1=0;it1<5;it1++){
-			t_track->al[it1] = l2->al_nt[i][it1];
-			for(int it2=0;it2<5;it2++)
-			t_track->coval[it1][it2] = l2->coval[i][it2][it1];
-		};
-		for(int ip=0;ip<6;ip++){
-			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 ***
-    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();
-    }
-    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();
-	};
+// 	//  temporary objects:
+//     TrkSinglet* t_singlet = new TrkSinglet();
+//     TrkTrack*   t_track   = new TrkTrack();
+
+// 	//  **** general variables ****
+// //    good2 = l2->good2;
+//     for(Int_t i=0; i<12 ; i++){
+// //		crc[i] = l2->crc[i];
+// 		good[i] = l2->good[i];
+// 	};
+// 	//  *** TRACKS ***
+//     if(!Track) Track = new TClonesArray("TrkTrack");
+//     TClonesArray &t = *Track;
+//     for(int i=0; i<l2->ntrk; i++){
+// 	t_track->seqno = i;// NBNBNBNB deve sempre essere = i
+// 	t_track->image = l2->image[i]-1;
+// 	//	cout << "track "<<i<<t_track->seqno << t_track->image<<endl;
+// 	t_track->chi2  = l2->chi2_nt[i];
+// 	t_track->nstep = l2->nstep_nt[i];
+// 	for(int it1=0;it1<5;it1++){
+// 	    t_track->al[it1] = l2->al_nt[i][it1];
+// 	    for(int it2=0;it2<5;it2++)
+// 		t_track->coval[it1][it2] = l2->coval[i][it2][it1];
+// 	};
+// 	for(int ip=0;ip<6;ip++){
+// 	    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;
-}
+//     delete t_track;
+//     delete t_singlet;
+// }
 //--------------------------------------
 //
 //
@@ -591,7 +712,12 @@
 		good[i] = l2->good[i];
 	};
 // *** 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++){
 		t_track->seqno = i;// NBNBNBNB deve sempre essere = i
 		t_track->image = l2->image[i]-1;
@@ -618,20 +744,18 @@
 			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 << "traccia "<<i<<"  --  "<< ip << " "<< l2->cltrx[i][ip] <<" "<< l2->cltry[i][ip] <<" "<< t_track->xgood[ip] << t_track->ygood[ip]<<endl;
 			//-----------------------------------------------------
-//			t_track->clx[ip] = l1->GetCluster(l2->cltrx[i][ip]-1);
-//			t_track->cly[ip] = l1->GetCluster(l2->cltry[i][ip]-1);
-			if(t_track->xgood[ip])t_track->clx->AddAt(l1->GetCluster(l2->cltrx[i][ip]-1),ip);
-			if(t_track->ygood[ip])t_track->cly->AddAt(l1->GetCluster(l2->cltry[i][ip]-1),ip);
-//			if(t_track->ygood[ip])cout<<" i "<<i<<" ip "<<ip<<" l2->cltry[i][ip] "<<l2->cltry[i][ip]<< " l1->GetCluster(l2->cltry[i][ip]-1) "<<l1->GetCluster(l2->cltry[i][ip]-1)<<endl;
-//			if(t_track->xgood[ip])cout<<" i "<<i<<" ip "<<ip<<" l2->cltrx[i][ip] "<<l2->cltrx[i][ip]<< " l1->GetCluster(l2->cltrx[i][ip]-1) "<<l1->GetCluster(l2->cltrx[i][ip]-1)<<endl;
+			//-----------------------------------------------------
+			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);
+			//-----------------------------------------------------
 			//-----------------------------------------------------
 		};
 		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];
@@ -639,13 +763,12 @@
 		t_singlet->coord[1] = l2->xs[i][1];
 		t_singlet->sgnl     = l2->signlxs[i];
 		//-----------------------------------------------------
-//		cout << "singolo x "<<i<<"  --  "<<  l2->clsx[i] <<endl;
-		t_singlet->cls      = l1->GetCluster(l2->clsx[i]-1);
-//		cout<<" i "<<i<<" l2->clsx[i] "<<l2->clsx[i]<< " l1->GetCluster(l2->clsx[i]-1) "<<l1->GetCluster(l2->clsx[i]-1)<<endl;		
+		if(l1) t_singlet->cls      = l1->GetCluster(l2->clsx[i]-1);
 		//-----------------------------------------------------
 		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];
@@ -653,9 +776,7 @@
 		t_singlet->coord[1] = l2->ys[i][1];
 		t_singlet->sgnl     = l2->signlys[i];
 		//-----------------------------------------------------
-//		cout << "singolo y "<<i<<"  --  "<<  l2->clsy[i] <<endl;
-		t_singlet->cls      = l1->GetCluster(l2->clsy[i]-1);
-//		cout<<" i "<<i<<" l2->clsy[i] "<<l2->clsy[i]<< " l1->GetCluster(l2->clsy[i]-1) "<<l1->GetCluster(l2->clsy[i]-1)<<endl;		
+		if(l1) t_singlet->cls      = l1->GetCluster(l2->clsy[i]-1);
 		//-----------------------------------------------------
 		new(sy[i]) TrkSinglet(*t_singlet);
 		t_singlet->Clear();
@@ -678,48 +799,54 @@
     };
 //  *** TRACKS ***
 
-    l2->ntrk              =  Track->GetEntries();    
-    for(Int_t i=0;i<l2->ntrk;i++){
-      l2->image[i] = 1 + ((TrkTrack *)Track->At(i))->image;
-      l2->chi2_nt[i] =  ((TrkTrack *)Track->At(i))->chi2;
-	  l2->nstep_nt[i] =  ((TrkTrack *)Track->At(i))->nstep;
-	  for(int it1=0;it1<5;it1++){
-	l2->al_nt[i][it1] = ((TrkTrack *)Track->At(i))->al[it1];
-	for(int it2=0;it2<5;it2++)
-	  l2->coval[i][it2][it1] = ((TrkTrack *)Track->At(i))->coval[it1][it2];
-      };
-      for(int ip=0;ip<6;ip++){
-	l2->xgood_nt[i][ip] = ((TrkTrack *)Track->At(i))->xgood[ip];
-	l2->ygood_nt[i][ip] = ((TrkTrack *)Track->At(i))->ygood[ip];
-	l2->xm_nt[i][ip]    = ((TrkTrack *)Track->At(i))->xm[ip];
-	l2->ym_nt[i][ip]    = ((TrkTrack *)Track->At(i))->ym[ip];
-	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->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];
-	l2->axv_nt[i][ip]   = ((TrkTrack *)Track->At(i))->axv[ip];
-	l2->ayv_nt[i][ip]   = ((TrkTrack *)Track->At(i))->ayv[ip];
-	l2->dedx_x[i][ip]   = ((TrkTrack *)Track->At(i))->dedx_x[ip];
-	l2->dedx_y[i][ip]   = ((TrkTrack *)Track->At(i))->dedx_y[ip];
-      };
+    if(Track){
+	l2->ntrk              =  Track->GetEntries();    
+	for(Int_t i=0;i<l2->ntrk;i++){
+	    l2->image[i] = 1 + ((TrkTrack *)Track->At(i))->image;
+	    l2->chi2_nt[i] =  ((TrkTrack *)Track->At(i))->chi2;
+	    l2->nstep_nt[i] =  ((TrkTrack *)Track->At(i))->nstep;
+	    for(int it1=0;it1<5;it1++){
+		l2->al_nt[i][it1] = ((TrkTrack *)Track->At(i))->al[it1];
+		for(int it2=0;it2<5;it2++)
+		    l2->coval[i][it2][it1] = ((TrkTrack *)Track->At(i))->coval[it1][it2];
+	    };
+	    for(int ip=0;ip<6;ip++){
+		l2->xgood_nt[i][ip] = ((TrkTrack *)Track->At(i))->xgood[ip];
+		l2->ygood_nt[i][ip] = ((TrkTrack *)Track->At(i))->ygood[ip];
+		l2->xm_nt[i][ip]    = ((TrkTrack *)Track->At(i))->xm[ip];
+		l2->ym_nt[i][ip]    = ((TrkTrack *)Track->At(i))->ym[ip];
+		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->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];
+		l2->axv_nt[i][ip]   = ((TrkTrack *)Track->At(i))->axv[ip];
+		l2->ayv_nt[i][ip]   = ((TrkTrack *)Track->At(i))->ayv[ip];
+		l2->dedx_x[i][ip]   = ((TrkTrack *)Track->At(i))->dedx_x[ip];
+		l2->dedx_y[i][ip]   = ((TrkTrack *)Track->At(i))->dedx_y[ip];
+	    };
+	}
     }
-
 //  *** SINGLETS ***    
-    l2->nclsx              = SingletX->GetEntries();
-    for(Int_t i=0;i<l2->nclsx;i++){
-      l2->planex[i]  = ((TrkSinglet *)SingletX->At(i))->plane;
-      l2->xs[i][0]   = ((TrkSinglet *)SingletX->At(i))->coord[0];
-      l2->xs[i][1]   = ((TrkSinglet *)SingletX->At(i))->coord[1];
-      l2->signlxs[i] = ((TrkSinglet *)SingletX->At(i))->sgnl;
-    }
-    l2->nclsy              = SingletY->GetEntries();
-    for(Int_t i=0;i<l2->nclsy;i++){
-      l2->planey[i]  = ((TrkSinglet *)SingletY->At(i))->plane;
-      l2->ys[i][0]   = ((TrkSinglet *)SingletY->At(i))->coord[0];
-      l2->ys[i][1]   = ((TrkSinglet *)SingletY->At(i))->coord[1];
-      l2->signlys[i] = ((TrkSinglet *)SingletY->At(i))->sgnl;
+    if(SingletX){
+	l2->nclsx              = SingletX->GetEntries();
+	for(Int_t i=0;i<l2->nclsx;i++){
+	    l2->planex[i]  = ((TrkSinglet *)SingletX->At(i))->plane;
+	    l2->xs[i][0]   = ((TrkSinglet *)SingletX->At(i))->coord[0];
+	    l2->xs[i][1]   = ((TrkSinglet *)SingletX->At(i))->coord[1];
+	    l2->signlxs[i] = ((TrkSinglet *)SingletX->At(i))->sgnl;
+	}
+    }
+
+    if(SingletY){
+	l2->nclsy              = SingletY->GetEntries();
+	for(Int_t i=0;i<l2->nclsy;i++){
+	    l2->planey[i]  = ((TrkSinglet *)SingletY->At(i))->plane;
+	    l2->ys[i][0]   = ((TrkSinglet *)SingletY->At(i))->coord[0];
+	    l2->ys[i][1]   = ((TrkSinglet *)SingletY->At(i))->coord[1];
+	    l2->signlys[i] = ((TrkSinglet *)SingletY->At(i))->sgnl;
+	}
     }
 }
 //--------------------------------------
@@ -727,29 +854,28 @@
 //
 //--------------------------------------
 void TrkLevel2::Clear(){
-//    good2    = -1;
     for(Int_t i=0; i<12 ; i++){
-//	crc[i] = -1;
-		good[i] = -1;
-	};
-/*    Track->RemoveAll();
-    SingletX->RemoveAll();
-    SingletY->RemoveAll();*/
-	// modify to avoid memory leakage
-	Track->Clear();
-	SingletX->Clear();
-	SingletY->Clear();
-}
-//--------------------------------------
-//
-//
-//--------------------------------------
+	good[i] = -1;
+    };
+//    if(Track)Track->Clear("C");
+//    if(SingletX)SingletX->Clear("C");
+//    if(SingletY)SingletY->Clear("C");
+    if(Track)Track->Delete();
+    if(SingletX)SingletX->Delete();
+    if(SingletY)SingletY->Delete();
+}
+// //--------------------------------------
+// //
+// //
+// //--------------------------------------
 void TrkLevel2::Delete(){
 	
-	Clear();
-	Track->Delete();
-	SingletX->Delete();
-	SingletY->Delete();
+//    cout << "void TrkLevel2::Delete()"<<endl;
+    Clear();
+    if(Track)delete Track;
+    if(SingletX)delete SingletX;
+    if(SingletY)delete SingletY;
+
 }
 //--------------------------------------
 //
@@ -761,54 +887,57 @@
  */
 TRefArray *TrkLevel2::GetTracks_NFitSorted(){
 
-	TRefArray *sorted = new TRefArray();
+    if(!Track)return 0;
+
+    TRefArray *sorted = new TRefArray();
 	
-	TClonesArray &t  = *Track;
+    TClonesArray &t  = *Track;
 //    TClonesArray &ts = *PhysicalTrack;
-	int N = ntrk();
-	vector<int> m(N); for(int i=0; i<N; i++)m[i]=1;
+    int N = ntrk();
+    vector<int> m(N); for(int i=0; i<N; i++)m[i]=1;
 //	int m[50]; for(int i=0; i<N; i++)m[i]=1;
 	
-	int indo=0;
-	int indi=0;
-	while(N != 0){
-		int nfit =0;
-		float chi2ref = numeric_limits<float>::max();
+    int indo=0;
+    int indi=0;
+    while(N > 0){
+//    while(N != 0){
+	int nfit =0;
+	float chi2ref = numeric_limits<float>::max();
 		
-		// first loop to search maximum num. of fit points
-		for(int i=0; i < ntrk(); i++){
-			if( ((TrkTrack *)t[i])->GetNtot() >= nfit && m[i]==1){
-				nfit =    ((TrkTrack *)t[i])->GetNtot();
-			}
-		}
-		//second loop to search minimum chi2 among selected
-		for(int i=0; i<this->ntrk(); i++){
-			Float_t chi2 = ((TrkTrack *)t[i])->chi2; 
-			if(chi2 < 0) chi2 = chi2*1000;
-			if(    chi2 < chi2ref
-				&& ((TrkTrack *)t[i])->GetNtot() == nfit 
-				&& m[i]==1){
-				chi2ref = ((TrkTrack *)t[i])->chi2;
-				indi = i;
-			};
-		};
-		if( ((TrkTrack *)t[indi])->HasImage() ){
-			m[((TrkTrack *)t[indi])->image] = 0;
-			N--;
+	// first loop to search maximum num. of fit points
+	for(int i=0; i < ntrk(); i++){
+	    if( ((TrkTrack *)t[i])->GetNtot() >= nfit && m[i]==1){
+		nfit =    ((TrkTrack *)t[i])->GetNtot();
+	    }
+	}
+	//second loop to search minimum chi2 among selected
+	for(int i=0; i<ntrk(); i++){
+	    Float_t chi2 = ((TrkTrack *)t[i])->chi2; 
+	    if(chi2 < 0) chi2 = -chi2*1000;
+	    if(    chi2 < chi2ref
+		   && ((TrkTrack *)t[i])->GetNtot() == nfit 
+		   && m[i]==1){
+		chi2ref = ((TrkTrack *)t[i])->chi2;
+		indi = i;
+	    };
+	};
+	if( ((TrkTrack *)t[indi])->HasImage() ){
+	    m[((TrkTrack *)t[indi])->image] = 0;
+	    N--;
 	
-	//	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
-		};
-		sorted->Add( (TrkTrack*)t[indi] );	
+//	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
+	};
+	sorted->Add( (TrkTrack*)t[indi] );	
 		
-		m[indi] = 0;
-//		cout << "SORTED "<< indo << " "<< indi << " "<< N << endl; 
-		N--;	
-		indo++;	
-	}
-	m.clear();
-//	cout << "GetTracks_NFitSorted(it): Done"<< endl;
+	m[indi] = 0;
+//	cout << "SORTED "<< indo << " "<< indi << " "<< N << " "<<((TrkTrack *)t[indi])->image<<" "<<chi2ref<<endl; 
+	N--;	
+	indo++;	
+    }
+    m.clear();
+//    cout << "GetTracks_NFitSorted(it): Done"<< endl;
 
-	return sorted;
+    return sorted;
 //    return PhysicalTrack;
 }
 //--------------------------------------
@@ -827,6 +956,9 @@
 	cout << "                Stored tracks ntrk() = "<< this->ntrk() << endl;
 	return 0;
     }
+    if(!Track){
+	cout << "TrkTrack *TrkLevel2::GetStoredTrack(int is) >> (TClonesArray*) Track ==0 "<<endl;
+    };
     TClonesArray &t = *(Track);
     TrkTrack *track = (TrkTrack*)t[is];
     return track;
@@ -846,6 +978,7 @@
 		cout << "                Stored x-singlets nclsx() = "<< this->nclsx() << endl;
 		return 0;
 	}
+	if(!SingletX)return 0;
 	TClonesArray &t = *(SingletX);
 	TrkSinglet *singlet = (TrkSinglet*)t[is];
 	return singlet;
@@ -865,6 +998,7 @@
 		cout << "                Stored y-singlets nclsy() = "<< this->nclsx() << endl;
 		return 0;
 	}
+	if(!SingletY)return 0;
 	TClonesArray &t = *(SingletY);
 	TrkSinglet *singlet = (TrkSinglet*)t[is];
 	return singlet;
@@ -887,8 +1021,10 @@
 	}
 	
 	TRefArray *sorted = GetTracks();  //TEMPORANEO	
+	if(!sorted)return 0;
 	TrkTrack *track = (TrkTrack*)sorted->At(it); 
-	sorted->Delete();
+	sorted->Clear();
+	delete sorted;
 	return track;
 }
 /**
@@ -897,6 +1033,7 @@
 Int_t TrkLevel2::GetNTracks(){
 		
 	Float_t ntot=0;
+	if(!Track)return 0;
 	TClonesArray &t = *Track;
 	for(int i=0; i<ntrk(); i++) {	  
 		if( ((TrkTrack *)t[i])->GetImageSeqNo() == -1 ) ntot+=1.;
@@ -915,24 +1052,27 @@
  */
 TrkTrack *TrkLevel2::GetTrackImage(int it){
 
-	if(it >= this->GetNTracks()){
-		cout << "** TrkLevel2 ** Track "<< it << "does not exits! " << endl; 
-		cout << "                Physical tracks GetNTracks() = "<< this->ntrk() << endl;
-		return 0;
-	}
+    if(it >= this->GetNTracks()){
+	cout << "** TrkLevel2 ** Track "<< it << "does not exits! " << endl; 
+	cout << "                Physical tracks GetNTracks() = "<< this->ntrk() << endl;
+	return 0;
+    }
 	
-	TRefArray* sorted = GetTracks(); //TEMPORANEO
-	TrkTrack *track = (TrkTrack*)sorted->At(it);
+    TRefArray* sorted = GetTracks(); //TEMPORANEO
+    if(!sorted)return 0;
+    TrkTrack *track = (TrkTrack*)sorted->At(it);
 	
-	if(!track->HasImage()){
-		cout << "** TrkLevel2 ** Track "<< it << "does not have image! " << endl; 
-		return 0;
-	}
-	TrkTrack *image = (TrkTrack*)(*Track)[track->image];
+    if(!track->HasImage()){
+	cout << "** TrkLevel2 ** Track "<< it << "does not have image! " << endl; 
+	return 0;
+    }
+    if(!Track)return 0;
+    TrkTrack *image = (TrkTrack*)(*Track)[track->image];
 
-	sorted->Delete(); 
-	
-	return image;
+    sorted->Delete(); 
+    delete sorted;
+
+    return image;
     
 }
 //--------------------------------------
@@ -945,12 +1085,42 @@
  */
 void TrkLevel2::LoadField(TString path){
 //
-    strcpy(path_.path,path.Data());
-    path_.pathlen = path.Length();
-    path_.error   = 0;
-    readb_();
+//     strcpy(path_.path,path.Data());
+//     path_.pathlen = path.Length();
+//     path_.error   = 0;
+//     readb_();
+
+    TrkParams::Set(path,1);
+
 //
 };
+/**
+ * Get BY (kGauss)
+ * @param v (x,y,z) coordinates in cm
+ */
+float TrkLevel2::GetBX(float* v){
+    float b[3];
+    gufld_(v,b);
+    return b[0]/10.;
+}
+/**
+ * Get BY (kGauss)
+ * @param v (x,y,z) coordinates in cm
+ */
+float TrkLevel2::GetBY(float* v){
+    float b[3];
+    gufld_(v,b);
+    return b[1]/10.;
+}
+/**
+ * Get BY (kGauss)
+ * @param v (x,y,z) coordinates in cm
+ */
+float TrkLevel2::GetBZ(float* v){
+    float b[3];
+    gufld_(v,b);
+    return b[2]/10.;
+}
 //--------------------------------------
 //
 //
@@ -1047,17 +1217,27 @@
     tl = new float[npoint];
     int i=0;
     do{
-		x[i] = 0;
-		y[i] = 0;
-		z[i] = zin[i];
-		thx[i] = 0;
-		thy[i] = 0;
-		tl[i] = 0;
-		i++;		
+	x[i] = 0;
+	y[i] = 0;
+	z[i] = zin[i];
+	thx[i] = 0;
+	thy[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;
 }
+void Trajectory::Delete(){
+    
+    if(x) delete [] x;
+    if(y) delete [] y;
+    if(z) delete [] z;
+    if(thx) delete [] thx;
+    if(thy) delete [] thy;
+    if(tl) delete [] tl;
+
+}
 //--------------------------------------
 //
 //
@@ -1096,6 +1276,45 @@
 
 }
 
+/**
+ * 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.  
+ * @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 Trajectory::DoTrack2(float* al){
+
+    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 dal[5];
+
+    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;
+	return 0;
+    }
+    dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
+    
+    for (int i=0; i<npoint; i++){
+	x[i]   = (float)*dxout++;
+	y[i]   = (float)*dyout++;
+	thx[i] = (float)*dthxout++;
+	thy[i] = (float)*dthyout++;
+	tl[i]  = (float)*dtlout++;
+    }
+
+    return ifail;
+};
 
 ClassImp(TrkLevel2);
 ClassImp(TrkSinglet);