--- DarthVader/TrackerLevel2/inc/TrkLevel1.h 2010/03/02 17:17:32 1.17 +++ DarthVader/TrackerLevel2/inc/TrkLevel1.h 2011/09/02 14:49:02 1.18 @@ -40,37 +40,37 @@ Bool_t *clbad; //[CLlength] TrkCluster(); - ~TrkCluster(){Clear();}; + ~TrkCluster(){Clear();} TrkCluster(const TrkCluster&); void Dump(); void Clear(); - void Clear(Option_t *option){Clear();}; - void Delete(){Clear();}; + void Clear(Option_t *option){Clear();} + void Delete(){Clear();} Float_t GetSignal(Int_t, Float_t, Bool_t); ///< cluster signal - Float_t GetSignal(Float_t cut) { return GetSignal( 0, cut, false); }; - Float_t GetSignal(Int_t nstrip, Bool_t force) { return GetSignal( nstrip, -1000., force ); }; - Float_t GetSignal(Int_t nstrip) { return GetSignal( nstrip, -1000., false ); }; - Float_t GetSignal() { return GetSignal( 0,(Float_t)INC_CUT, false); }; + Float_t GetSignal(Float_t cut) { return GetSignal( 0, cut, false); } + Float_t GetSignal(Int_t nstrip, Bool_t force) { return GetSignal( nstrip, -1000., force ); } + Float_t GetSignal(Int_t nstrip) { return GetSignal( nstrip, -1000., false ); } + Float_t GetSignal() { return GetSignal( 0,(Float_t)INC_CUT, false); } Float_t GetSignalToNoise(Int_t,Float_t); ///< cluster signal/noise - Float_t GetSignalToNoise(Float_t cut) { return GetSignalToNoise( 0, cut); }; - Float_t GetSignalToNoise(Int_t nstrip) { return GetSignalToNoise( nstrip,-1000. ); }; - Float_t GetSignalToNoise() { return GetSignalToNoise( 0, (Float_t)INC_CUT); }; + Float_t GetSignalToNoise(Float_t cut) { return GetSignalToNoise( 0, cut); } + Float_t GetSignalToNoise(Int_t nstrip) { return GetSignalToNoise( nstrip,-1000. ); } + Float_t GetSignalToNoise() { return GetSignalToNoise( 0, (Float_t)INC_CUT); } Int_t GetMultiplicity(Float_t); ///< cluster multiplicity - Int_t GetMultiplicity() { return GetMultiplicity(INC_CUT); }; + Int_t GetMultiplicity() { return GetMultiplicity(INC_CUT); } void GetLevel1Struct(cTrkLevel1* l1); - void GetLevel1Struct(){GetLevel1Struct(&level1event_);}; + void GetLevel1Struct(){GetLevel1Struct(&level1event_);} Float_t GetCOG(Int_t); Float_t GetCOG(Float_t angle); - Float_t GetCOG(){ return GetCOG(0); }; + Float_t GetCOG(){ return GetCOG(0); } Float_t GetETA(Int_t,float,bool); -// Float_t GetETA(float angle){ return GetETA(0,angle); }; +// Float_t GetETA(float angle){ return GetETA(0,angle); } Float_t GetPositionPU(float); Int_t GetPFAstrips(float angle); @@ -78,12 +78,12 @@ Bool_t IsBad(Int_t); ///< bad-cluster flag Bool_t IsSaturated(Int_t); ///< saturated-cluster flag - Int_t GetPlane() { return (Int_t)((view+1)/2);}; ///< plane number (1-6) - Int_t GetLadder(){ return 1+(Int_t)((maxs-1)/1024); }; ///< ladder number (1-3) - Bool_t IsY(){ return (Bool_t)(view%2); }; - Bool_t IsX(){ return !((Bool_t)(view%2)); }; + Int_t GetPlane() { return (Int_t)((view+1)/2);} ///< plane number (1-6) + Int_t GetLadder(){ return 1+(Int_t)((maxs-1)/1024); } ///< ladder number (1-3) + Bool_t IsY(){ return (Bool_t)(view%2); } + Bool_t IsX(){ return !((Bool_t)(view%2)); } - TrkCluster* GetTrkCluster(){ return this; }; + TrkCluster* GetTrkCluster(){ return this; } friend class TrkLevel1; @@ -113,7 +113,7 @@ TClonesArray *Cluster; ///< clusters TrkLevel1(); - ~TrkLevel1(){Delete();}; + ~TrkLevel1(){Delete();} int nclstr() {return Cluster->GetEntries();} ///< number of stored clusters @@ -122,9 +122,9 @@ // void GetLevel1Struct(cTrkLevel1 *) const; void GetLevel1Struct(cTrkLevel1 *l1); void SetFromLevel1Struct(cTrkLevel1 *l1, Bool_t full); - void GetLevel1Struct(){GetLevel1Struct(&level1event_);}; - void SetFromLevel1Struct(Bool_t full){SetFromLevel1Struct(&level1event_,full);}; - void SetFromLevel1Struct(){SetFromLevel1Struct(true);}; + void GetLevel1Struct(){GetLevel1Struct(&level1event_);} + void SetFromLevel1Struct(Bool_t full){SetFromLevel1Struct(&level1event_,full);} + void SetFromLevel1Struct(){SetFromLevel1Struct(true);} void Clear(); void Delete(); @@ -133,7 +133,7 @@ TrkCluster* GetCluster(int); TrkLevel1* GetTrkLevel1(){return this;} - TClonesArray* GetClusters(){return Cluster;}; ///< returns pointer to the cluster array + TClonesArray* GetClusters(){return Cluster;} ///< returns pointer to the cluster array /* int LoadPfaParam(TString); */ /* int LoadFieldParam(TString); */ @@ -141,22 +141,22 @@ /* int LoadAlignmentParam(TString); */ /* int LoadMipParam(TString); */ /* int LoadVKMaskParam(TString); */ -/* int LoadPfaParam(){return LoadPfaParam("");}; */ -/* int LoadFieldParam(){return LoadFieldParam("");}; */ -/* int LoadChargeParam(){return LoadChargeParam("");}; */ -/* int LoadAlignmentParam(){return LoadAlignmentParam("");}; */ -/* int LoadMipParam(){return LoadMipParam("");}; */ -/* int LoadVKMaskParam(){return LoadVKMaskParam("");}; */ +/* int LoadPfaParam(){return LoadPfaParam("");} */ +/* int LoadFieldParam(){return LoadFieldParam("");} */ +/* int LoadChargeParam(){return LoadChargeParam("");} */ +/* int LoadAlignmentParam(){return LoadAlignmentParam("");} */ +/* int LoadMipParam(){return LoadMipParam("");} */ +/* int LoadVKMaskParam(){return LoadVKMaskParam("");} */ /* int LoadParams(); */ // int ProcessEvent(int); -// int ProcessEvent(){return ProcessEvent();}; +// int ProcessEvent(){return ProcessEvent();} int ProcessEvent(); // spostati in TrkParams /* int GetPfaNbinsAngle(); */ /* int GetPfaNbinsETA(); */ -/* int GetPfaNbinsCharge(){return 0;}; */ +/* int GetPfaNbinsCharge(){return 0;} */ /* float* GetPfaCoord(TString pfa, int nview, int nladder, int nang); */ /* float* GetPfaAbs(TString pfa, int nang); */ @@ -164,8 +164,8 @@ Bool_t StatusCheck(int view, int flagmask); - void SetPFA(int pfaid){ sw_.pfaid = pfaid; }; - int GetPFA(){ return sw_.pfaid; }; + void SetPFA(int pfaid){ sw_.pfaid = pfaid; } + int GetPFA(){ return sw_.pfaid; } ClassDef(TrkLevel1,2);