--- PamelaLevel2/doc/examples/My-Histos-0.cpp	2007/01/03 13:28:49	1.1
+++ PamelaLevel2/doc/examples/My-Histos-0.cpp	2007/02/16 18:38:13	1.3
@@ -43,7 +43,7 @@
 //===============================================================
 // Create histograms
 //===============================================================
-void CreateHistos( TFile* outf ){
+void CreateHistos( PamLevel2* event, TFile* outf ){
 
     gROOT->cd();//create histos in memory
 
@@ -63,21 +63,6 @@
 //     hresangx = dynamic_cast<TH1F*>(gDirectory->FindObject("hresangx"));
 //     hresangy = dynamic_cast<TH1F*>(gDirectory->FindObject("hresangy"));
 
-//  ----------------------------------
-//  calo variables
-//  ----------------------------------
-//     CaloAxis *x_axis = new CaloAxis();
-//     CaloAxis *y_axis = new CaloAxis();
-
-//     float rcil = 1.;// tolerance (cm)
-//     x_axis->FitAxis(event->GetCaloLevel1(),0,rcil);
-//     y_axis->FitAxis(event->GetCaloLevel1(),1,rcil);
-
-//     float qtrack = x_axis->GetQaxis()+y_axis->GetQaxis();
-//     int   ntrack = x_axis->GetN()+y_axis->GetN();    
-    
-//     float caloangx = (float)atan((double)x_axis->par[1])*180./3.1415026;
-//     float caloangy = (float)atan((double)y_axis->par[1])*180./3.1415026;
 
      float caloangx = 0;
      float caloangy = 0;
@@ -86,15 +71,7 @@
      top.Set(0,0,48);
      float zcalotop = top.GetZ();
 
-//  ----------------------------------
-//  tof variables
-//  ----------------------------------
-//  get track stored by the tof    
-//     ToFTrkVar *tof = event->GetToFStoredTrack(-1);
-//     if(!tof){
-// 	cout << " no ToF-track stored "<<endl;
-// 	return;
-//     }
+
 
 //  ----------------------------------
 //  tracker variables
@@ -102,35 +79,34 @@
 
     float resangx = -999;
     float resangy = -999;
-    if( event->GetNTracks()==1 ){
+    if( event->GetTrkLevel2()->GetNTracks()==1 ){
 	
 	PamTrack *track = event->GetTrack(0);
-	if( track->chi2 >0  ){
+	if( track->GetTrkTrack()->chi2 >0  ){
 
 	    Float_t ztraj[13];
 	    
 	    Int_t i=0;
-	    ztraj[i++] = event->GetZTOF(11);
-	    ztraj[i++] = event->GetZTOF(12);
-	    ztraj[i++] = event->GetZTOF(21);
-	    ztraj[i++] = event->GetZTOF(22);
-	    ztraj[i++] = event->GetZTrk(1);
-	    ztraj[i++] = event->GetZTrk(2);
-	    ztraj[i++] = event->GetZTrk(3);
-	    ztraj[i++] = event->GetZTrk(4);
-	    ztraj[i++] = event->GetZTrk(5);
-	    ztraj[i++] = event->GetZTrk(6);
-	    ztraj[i++] = event->GetZTOF(31);
-	    ztraj[i++] = event->GetZTOF(32);
+	    ztraj[i++] = event->GetToFLevel2()->GetZTOF(11);
+	    ztraj[i++] = event->GetToFLevel2()->GetZTOF(12);
+	    ztraj[i++] = event->GetToFLevel2()->GetZTOF(21);
+	    ztraj[i++] = event->GetToFLevel2()->GetZTOF(22);
+	    ztraj[i++] = event->GetTrkLevel2()->GetZTrk(1);
+	    ztraj[i++] = event->GetTrkLevel2()->GetZTrk(2);
+	    ztraj[i++] = event->GetTrkLevel2()->GetZTrk(3);
+	    ztraj[i++] = event->GetTrkLevel2()->GetZTrk(4);
+	    ztraj[i++] = event->GetTrkLevel2()->GetZTrk(5);
+	    ztraj[i++] = event->GetTrkLevel2()->GetZTrk(6);
+	    ztraj[i++] = event->GetToFLevel2()->GetZTOF(31);
+	    ztraj[i++] = event->GetToFLevel2()->GetZTOF(32);
 	    ztraj[i++] = zcalotop;
 	    Trajectory traj = Trajectory(13,ztraj);
-	    traj.DoTrack2( track->al );
+	    traj.DoTrack2( track->GetTrkTrack()->al );
 	    
 	    resangx = caloangx - traj.thx[12];
 	    resangy = caloangy - traj.thy[12];
 
 	}
-	if(track) delete track;
     }
     
 //  ----------------------------------