--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2006/09/05 12:52:20	1.9
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2006/09/28 14:04:39	1.10
@@ -21,7 +21,8 @@
     seqno = -1; 
     image = -1; 
     chi2  = 0;
-    for(int it1=0;it1<5;it1++){
+	nstep = 0;
+	for(int it1=0;it1<5;it1++){
 		al[it1] = 0;
 		for(int it2=0;it2<5;it2++)coval[it1][it2] = 0;
     };
@@ -54,7 +55,8 @@
     seqno = t.seqno; 
     image = t.image; 
     chi2  = t.chi2;
-    for(int it1=0;it1<5;it1++){
+	nstep = t.nstep;
+	for(int it1=0;it1<5;it1++){
 		al[it1] = t.al[it1];
 		for(int it2=0;it2<5;it2++)coval[it1][it2] = t.coval[it1][it2];
     };
@@ -194,9 +196,12 @@
 //--------------------------------------
 void TrkTrack::Dump(){
     cout << endl << "========== Track " ;
-    cout << endl << "al       : "; for(int i=0; i<5; i++)cout << al[i] << " ";
+	cout << endl << "seq.  n. : "<< seqno;
+	cout << endl << "image n. : "<< image;
+	cout << endl << "al       : "; for(int i=0; i<5; i++)cout << al[i] << " ";
     cout << endl << "chi^2    : "<< chi2;
-    cout << endl << "xgood    : "; for(int i=0; i<6; i++)cout << xgood[i] ;
+	cout << endl << "n.step   : "<< nstep;
+	cout << endl << "xgood    : "; for(int i=0; i<6; i++)cout << xgood[i] ;
     cout << endl << "ygood    : "; for(int i=0; i<6; i++)cout << ygood[i] ;
     cout << endl << "xm       : "; for(int i=0; i<6; i++)cout << xm[i] << " ";
     cout << endl << "ym       : "; for(int i=0; i<6; i++)cout << ym[i] << " ";
@@ -208,6 +213,45 @@
 //
 //
 //--------------------------------------
+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();
+};
+//--------------------------------------
+//
+//
+//--------------------------------------
+
+//--------------------------------------
+//
+//
+//--------------------------------------
 TrkSinglet::TrkSinglet(){
     plane    = 0;
     coord[0] = 0; 
@@ -243,10 +287,11 @@
 //
 //--------------------------------------
 TrkLevel2::TrkLevel2(){
-    good2    = -1;
+//    good2    = -1;
     for(Int_t i=0; i<12 ; i++){
-	crc[i] = -1;
-    };
+//	crc[i] = -1;
+		good[i] = -1;
+	};
     Track    = new TClonesArray("TrkTrack");
     SingletX = new TClonesArray("TrkSinglet");
     SingletY = new TClonesArray("TrkSinglet");
@@ -259,13 +304,13 @@
 //
 //--------------------------------------
 void TrkLevel2::Dump(){
+	
     TClonesArray &t  = *Track;
     TClonesArray &sx = *SingletX;
     TClonesArray &sy = *SingletY;
-
+	//
     cout << endl << endl << "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-";
-    cout << endl << "good2    : " << good2;
-    cout << endl << "crc      : "; for(int i=0; i<12; i++) cout << crc[i];
+    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();
@@ -281,25 +326,25 @@
  * Fills a TrkLevel2 object with values from a struct cTrkLevel2 (to get data from F77 common).
  */
 void TrkLevel2::SetFromLevel2Struct(cTrkLevel2 *l2){
-    //
-//    Track    = new TClonesArray("TrkTrack");
-//    SingletX = new TClonesArray("TrkSinglet");
-//    SingletY = new TClonesArray("TrkSinglet");
-//  temporary objects:
+
+	//  temporary objects:
     TrkSinglet* t_singlet = new TrkSinglet();
     TrkTrack*   t_track   = new TrkTrack();
-//  general variables
-    good2 = l2->good2;
+
+	//  **** general variables ****
+//    good2 = l2->good2;
     for(Int_t i=0; i<12 ; i++){
-	crc[i] = l2->crc[i];
-    };
-//  *** TRACKS ***
+//		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++)
@@ -365,9 +410,10 @@
 	TrkSinglet* t_singlet = new TrkSinglet();
 	TrkTrack*   t_track   = new TrkTrack();
 // general variables
-	good2 = l2->good2;
+//	good2 = l2->good2;
 	for(Int_t i=0; i<12 ; i++){
-		crc[i] = l2->crc[i];
+//		crc[i] = l2->crc[i];
+		good[i] = l2->good[i];
 	};
 // *** TRACKS ***
 	TClonesArray &t = *Track;
@@ -376,6 +422,7 @@
 		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++)
@@ -402,6 +449,8 @@
 //			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;
 			//-----------------------------------------------------
 		};
 		new(t[i]) TrkTrack(*t_track);
@@ -417,6 +466,7 @@
 		//-----------------------------------------------------
 //		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;		
 		//-----------------------------------------------------
 		new(sx[i]) TrkSinglet(*t_singlet);
 		t_singlet->Clear();
@@ -430,6 +480,7 @@
 		//-----------------------------------------------------
 //		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;		
 		//-----------------------------------------------------
 		new(sy[i]) TrkSinglet(*t_singlet);
 		t_singlet->Clear();
@@ -445,9 +496,10 @@
 void TrkLevel2::GetLevel2Struct(cTrkLevel2 *l2) const {
   
 //  general variables
-    l2->good2 = good2 ;
+//    l2->good2 = good2 ;
     for(Int_t i=0; i<12 ; i++){
-	l2->crc[i] = crc[i];
+//	l2->crc[i] = crc[i];
+		l2->good[i] = good[i];
     };
 //  *** TRACKS ***
 
@@ -455,7 +507,8 @@
     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;
-      for(int it1=0;it1<5;it1++){
+	  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];
@@ -499,10 +552,11 @@
 //
 //--------------------------------------
 void TrkLevel2::Clear(){
-    good2    = -1;
+//    good2    = -1;
     for(Int_t i=0; i<12 ; i++){
-	crc[i] = -1;
-    };
+//	crc[i] = -1;
+		good[i] = -1;
+	};
 /*    Track->RemoveAll();
     SingletX->RemoveAll();
     SingletY->RemoveAll();*/
@@ -519,97 +573,8 @@
  * Sort physical tracks and stores them in a TObjectArray, ordering by increasing chi**2 value (in case of track image, it selects the one with lower chi**2). The total number of physical tracks is given by GetNTracks() and the it-th physical track can be retrieved by means of the method GetTrack(int it).
  * This method is overridden by PamLevel2::GetTracks(), where calorimeter and TOF information is used.
  */
-// TClonesArray *TrkLevel2::GetTracks(){
-// 	TClonesArray *sorted = GetTracks_NFitSorted();
-// 	return sorted;
-// };
-
-/*TClonesArray *TrkLevel2::GetTracks_Chi2Sorted(){
-
-    TClonesArray *sorted = new TClonesArray("TrkTrack");
-    TClonesArray &t = *Track;
-    TClonesArray &ts = *sorted;
-    int N=this->ntrk();
-    vector<int> m(N); for(int i=0; i<N; i++)m[i]=1;
-
-    int indo=0;
-    int indi=0;
-    while(N != 0){
-	float chi2ref=1000000;
-	for(int i=0; i<this->ntrk(); i++){
-	    if(((TrkTrack *)t[i])->chi2 < chi2ref && m[i]==1){
-		chi2ref = ((TrkTrack *)t[i])->chi2;
-		indi = i;
-	    }
-	}
-	if( ((TrkTrack *)t[indi])->image != -1 ){
-	    m[((TrkTrack *)t[indi])->image] = 0;
-	    N--;
-	}
-	new(ts[indo]) TrkTrack(*(TrkTrack*)t[indi]);
-	m[indi] = 0;
-	N--;	
-	indo++;	
-    }
-    return sorted;
-}*/
-/*TClonesArray *TrkLevel2::GetTracks_NFitSorted(){
-
-	TClonesArray *sorted = new TClonesArray("TrkTrack");	
-    TClonesArray &t  = *Track;
-	TClonesArray &ts = *sorted;
-//    TClonesArray &ts = *PhysicalTrack;
-	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();
-		// first loop to search maximum num. of fit points
-		for(int i=0; i < ntrk(); i++){
-//			if(N==ntrk())cout << "** "<<i<< " " << ((TrkTrack *)t[i])->GetImageSeqNo()<< " " <<((TrkTrack *)t[i])->GetNtot() << " " <<((TrkTrack *)t[i])->chi2 << endl;
-			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++){
-			if(    ((TrkTrack *)t[i])->chi2 < chi2ref 
-			&& ((TrkTrack *)t[i])->GetNtot()== nfit 
-			&& m[i]==1){
-			chi2ref = ((TrkTrack *)t[i])->chi2;
-			indi = i;
-	//		cout << "2** "<<i<< " " << nfit <<" "<<chi2ref<<endl;
-			}
-		}
-		if( ((TrkTrack *)t[indi])->HasImage() ){
-			m[((TrkTrack *)t[indi])->image] = 0;
-			N--;
-	
-	//	    Int_t nfiti=((TrkTrack *)t[((TrkTrack *)t[indi])->image  ])->GetNtot();
-	//	    Float_t chi2i=((TrkTrack *)t[((TrkTrack *)t[indi])->image  ])->chi2;
-			
-	//	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
-		}
-		new(ts[indo]) TrkTrack(*(TrkTrack*)t[indi]);
-		m[indi] = 0;
-//		cout << "SORTED "<< indo << " "<< indi << " "<< N << endl; 
-		N--;	
-		indo++;	
-    }
-	m.clear();
-    return sorted;
-//    return PhysicalTrack;
-}*/
-//TClonesArray *TrkLevel2::GetTracks_NFitSorted(){
 TRefArray *TrkLevel2::GetTracks_NFitSorted(){
 
-//	cout << "GetTracks_NFitSorted(it): new TRefArray()"<< endl;
-//	TClonesArray *sorted = new TClonesArray("TrkTrack");
-//	TClonesArray &ts = *sorted;
 	TRefArray *sorted = new TRefArray();
 	
 	TClonesArray &t  = *Track;
@@ -645,13 +610,8 @@
 			m[((TrkTrack *)t[indi])->image] = 0;
 			N--;
 	
-	//	    Int_t nfiti=((TrkTrack *)t[((TrkTrack *)t[indi])->image  ])->GetNtot();
-	//	    Float_t chi2i=((TrkTrack *)t[((TrkTrack *)t[indi])->image  ])->chi2;
-			
 	//	    cout << "i** "<< ((TrkTrack *)t[indi])->image << " " << nfiti <<" "<<chi2i<<endl;
 		};
-//		new(ts[indo]) TrkTrack(*(TrkTrack*)t[indi]);
-//		cout << "GetTracks_NFitSorted(it): Add("<<indo<<")"<< endl;
 		sorted->Add( (TrkTrack*)t[indi] );	
 		
 		m[indi] = 0;
@@ -731,21 +691,7 @@
  * Retrieves the it-th "physical" track, sorted by the method GetNTracks(). 
  * @param it Track number, ranging from 0 to GetNTracks().
  */
-/*TrkTrack *TrkLevel2::GetTrack(int it){
-    
-    if(it >= this->GetNTracks()){
-	cout << "** TrkLevel2 ** Track "<< it << "does not exits! " << endl; 
-	cout << "                Physical tracks GetNTracks() = "<< this->ntrk() << endl;
-	return 0;
-    }
-	TClonesArray* sorted = GetTracks();
-	TClonesArray &ts = *sorted;
-	
-//    TrkTrack *track = (TrkTrack*)ts[it];
-	TrkTrack *track = new TrkTrack( *(TrkTrack*)ts[it] ); //copia
-	sorted->Delete("all");////TEMPORANEO
-	return track;
-}*/
+
 TrkTrack *TrkLevel2::GetTrack(int it){
     
 	if(it >= this->GetNTracks()){
@@ -781,31 +727,6 @@
  * Retrieves (if present) the image of the it-th "physical" track, sorted by the method GetNTracks(). 
  * @param it Track number, ranging from 0 to GetNTracks().
  */
-/*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;
-    }
-	
-	TClonesArray* sorted = GetTracks();
-	TClonesArray &ts = *sorted;
-	TrkTrack *track = (TrkTrack*)ts[it];
-//    TrkTrack *track = (TrkTrack*)(*(this->GetTracks()))[it];
-    
-	if(!track->HasImage()){
-	cout << "** TrkLevel2 ** Track "<< it << "does not have image! " << endl; 
-	return 0;
-    }
-    TrkTrack *image = (TrkTrack*)(*Track)[track->image];
-
-//	GetTracks()->Delete(); ////TEMPORANEO
-	sorted->Delete(); ////TEMPORANEO
-	
-    return image;
-    
-}*/
 TrkTrack *TrkLevel2::GetTrackImage(int it){
 
 	if(it >= this->GetNTracks()){
@@ -984,6 +905,7 @@
 
 }
 
+
 ClassImp(TrkLevel2);
 ClassImp(TrkSinglet);
 ClassImp(TrkTrack);