--- eventviewer/ground/macros/EventViewer.c 2005/12/06 10:12:56 1.1.1.1 +++ eventviewer/ground/macros/EventViewer.c 2006/01/13 10:07:39 1.2 @@ -1,6 +1,6 @@ //------------------------------------------------------------------------------------------------------------------------------------------------------- // -// EventViewer.c version 8.00 (2005-11-24) +// EventViewer.c version 8.01 (2006-01-10) // // Shows PAMELA events - Emiliano Mocchiutti // @@ -25,6 +25,8 @@ // // Changelog: // +// 8.00 - 8.01 (2006-01-10): Added tracker measured positions used to determine the track. +// // 7.03 - 8.00 (2005-11-24): many changes to compile the macro. The code is still very redundant and heavy but some bugs were fixed and now it should be more stable. // Do not require anymore the AcFunctions.h header, a clone has been written (aclev1class.h). // @@ -3152,7 +3154,7 @@ linea = new TLine(-7.05,10.,7.05,10.); linea1y = new TLine(0.,10.,0.,30.); }; - linea->SetLineWidth(4); + linea->SetLineWidth(2); linea->SetLineColor(linecol); linea->Draw(); if ( l%2 ) { @@ -4806,12 +4808,35 @@ trackp1->SetLineColor(trcol); trackp1->SetLineWidth(1); trackp1->Draw(); - //printf("sto stapando trk ntrk %i image %i trcol %i \n",trk.ntrk,trk.image[l],trcol); TPolyLine *trackp2 = new TPolyLine(50,ptx2,pty2); trackp2->SetLineColor(trcol); trackp2->SetLineWidth(1); trackp2->SetLineStyle(3); trackp2->Draw(); + // + // Dots on measured points + // + TEllipse *elli; + Float_t x; + Float_t y; + Float_t z1; + Float_t z2; + for (Int_t g = 0; g<6; g++){ + x = trk.xm[l][g]*var.sfx/100. + var.xxvc; + y = trk.ym[l][g]*var.sfx/100. + var.xyvc; + z1 = (trk.zm[l][g]+11.2)*var.sfy/100. + var.yxvc; + z2 = (trk.zm[l][g]+11.2)*var.sfy/100. + var.yyvc; + elli = new TEllipse(x,z1,0.004,0.004,0.,-180.); + elli->SetFillStyle(1001); + elli->SetFillColor(2); + elli->Draw(); + elli = new TEllipse(y,z2,0.004,0.004,0.,-180.); + elli->SetFillStyle(1001); + elli->SetFillColor(2); + elli->Draw(); + }; + // + // } else { printf(" WARNING: failed in determining the track! \n"); };