--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/01/31 16:15:55	1.24
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2007/02/19 16:28:39	1.27
@@ -13,10 +13,12 @@
     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*);
 }
+
 //--------------------------------------
 //
 //
@@ -143,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++){
@@ -182,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++){
@@ -286,13 +298,16 @@
  */
 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
  */
@@ -353,7 +368,6 @@
 	axv[i] = track->axv[i];
 	ayv[i] = track->ayv[i];	
     }
-
     
 }
 /**
@@ -385,6 +399,11 @@
 
     //  ------------------------------------------
     //  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);
@@ -431,6 +450,10 @@
 	for(int j=0; j<5; j++) coval[i][j]=0.;
     }
 }
+void TrkTrack::SetTrackingMode(int trackmode){
+    extern cMini2track track_;
+    track_.trackmode = trackmode;
+}
 
 //--------------------------------------
 //
@@ -595,80 +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 ***
-    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();
-    };
+// 	//  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;
+// }
 //--------------------------------------
 //
 //
@@ -691,8 +714,10 @@
 // *** TRACKS ***
 	if(!Track) Track = new TClonesArray("TrkTrack");
 	TClonesArray &t = *Track;
-	if(!t_track->clx)t_track->clx = new TRefArray(6,0);
-	if(!t_track->cly)t_track->cly = new TRefArray(6,0);
+	//-----------------------------------------------------
+	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;
@@ -719,13 +744,10 @@
 			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;
 			//-----------------------------------------------------
 			//-----------------------------------------------------
-			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);
 			//-----------------------------------------------------
 			//-----------------------------------------------------
 		};
@@ -741,9 +763,7 @@
 		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();
@@ -756,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();
@@ -881,7 +899,8 @@
 	
     int indo=0;
     int indi=0;
-    while(N != 0){
+    while(N > 0){
+//    while(N != 0){
 	int nfit =0;
 	float chi2ref = numeric_limits<float>::max();
 		
@@ -892,9 +911,9 @@
 	    }
 	}
 	//second loop to search minimum chi2 among selected
-	for(int i=0; i<this->ntrk(); i++){
+	for(int i=0; i<ntrk(); i++){
 	    Float_t chi2 = ((TrkTrack *)t[i])->chi2; 
-	    if(chi2 < 0) chi2 = chi2*1000;
+	    if(chi2 < 0) chi2 = -chi2*1000;
 	    if(    chi2 < chi2ref
 		   && ((TrkTrack *)t[i])->GetNtot() == nfit 
 		   && m[i]==1){
@@ -906,17 +925,17 @@
 	    m[((TrkTrack *)t[indi])->image] = 0;
 	    N--;
 	
-	    //	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
+//	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
 	};
 	sorted->Add( (TrkTrack*)t[indi] );	
 		
 	m[indi] = 0;
-//		cout << "SORTED "<< indo << " "<< indi << " "<< N << endl; 
+//	cout << "SORTED "<< indo << " "<< indi << " "<< N << " "<<((TrkTrack *)t[indi])->image<<" "<<chi2ref<<endl; 
 	N--;	
 	indo++;	
     }
     m.clear();
-//	cout << "GetTracks_NFitSorted(it): Done"<< endl;
+//    cout << "GetTracks_NFitSorted(it): Done"<< endl;
 
     return sorted;
 //    return PhysicalTrack;
@@ -1066,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.;
+}
 //--------------------------------------
 //
 //
@@ -1249,6 +1298,11 @@
     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++){