--- DarthVader/TrackerLevel2/inc/TrkLevel2.h 2014/02/27 11:24:42 1.45 +++ DarthVader/TrackerLevel2/inc/TrkLevel2.h 2014/06/04 07:57:02 1.46 @@ -17,12 +17,12 @@ // z-coordinate of track state-vector reference-plane #define ZINI 23.5 ///< z-coordinate of track state-vector reference-plane. // (mechanical) z-coordinate of the tracker planes -#define ZTRK6 -22.22 -#define ZTRK5 -13.31 -#define ZTRK4 -4.41 -#define ZTRK3 4.49 -#define ZTRK2 13.39 -#define ZTRK1 22.29 +#define ZTRK6 -22.23 //-22.22 //Aprile 2014... trovata differenza con mech_pos.dat +#define ZTRK5 -13.32 //-13.31 // ...speriamo bene... no comment +#define ZTRK4 -4.42//-4.41 +#define ZTRK3 4.48//4.49 +#define ZTRK2 13.38//13.39 +#define ZTRK1 22.28//22.29 // magnet cavity dimensions #define ZMAGNHIGH 21.83 #define ZMAGNLOW -21.83 @@ -172,6 +172,7 @@ Int_t GetNY(){Int_t n=0; for(Int_t i=0; i<6; i++)n+=(Int_t)YGood(i); return n;} Int_t GetNXY(){Int_t n=0; for(Int_t i=0; i<6; i++)n+=(Int_t)YGood(i)*XGood(i); return n;} Int_t GetNtot(){return GetNX()+GetNY();} + Int_t GetNhit() ; Float_t GetRigidity(); Float_t GetDeflection(); Bool_t IsSaturated(int,int); @@ -441,9 +442,9 @@ TrkTrack* GetTrack(int i); TrkTrack* GetTrackImage(int i); - TrkLevel2* GetTrkLevel2(){return this;} - TClonesArray* GetTrackArray(){return Track;}///< returns pointer to the track array - + TrkLevel2* GetTrkLevel2(){return this;} + TClonesArray* GetTrackArray(){return Track;}///< returns pointer to the track array + TClonesArray** GetPointerToTrackArray(){return &Track;}///< returns pointer to pointer to the track array void StatusDump(int view); Bool_t StatusCheck(int view, int flagmask);