From 3ff116f26d51bd953051f0e91787412af28635ce Mon Sep 17 00:00:00 2001 From: enrico Date: Mon, 19 Apr 2004 16:29:32 +0000 Subject: [PATCH] to comply with coding conventions --- ZDC/AliZDC.cxx | 20 +++++++++---------- ZDC/AliZDCHit.cxx | 3 ++- ZDC/AliZDCHit.h | 44 ++++++++++++++++++++++------------------- ZDC/AliZDCMergedHit.cxx | 3 ++- ZDC/AliZDCMergedHit.h | 40 ++++++++++++++++++------------------- 5 files changed, 58 insertions(+), 52 deletions(-) diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx index 25e0e055c71..d66c737674c 100644 --- a/ZDC/AliZDC.cxx +++ b/ZDC/AliZDC.cxx @@ -138,21 +138,21 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits) // First hit -> setting flag for primary or secondary particle Int_t primary = gAlice->GetMCApp()->GetPrimary(track); if(track != primary){ - newquad->fSFlag = 1; // SECONDARY particle entering the ZDC + newquad->SetSFlag(1); // SECONDARY particle entering the ZDC } else if(track == primary){ - newquad->fSFlag = 0; // PRIMARY particle entering the ZDC + newquad->SetSFlag(0); // PRIMARY particle entering the ZDC } - sFlag = newquad->fSFlag; - primKinEn = newquad->fPrimKinEn; - xImpact = newquad->fXImpact; - yImpact = newquad->fYImpact; + sFlag = newquad->GetSFlag(); + primKinEn = newquad->GetPrimKinEn(); + xImpact = newquad->GetXImpact(); + yImpact = newquad->GetYImpact(); } else{ - newquad->fPrimKinEn = primKinEn; - newquad->fXImpact = xImpact; - newquad->fYImpact = yImpact; - newquad->fSFlag = sFlag; + newquad->SetPrimKinEn(primKinEn); + newquad->SetXImpact(xImpact); + newquad->SetYImpact(yImpact); + newquad->SetSFlag(sFlag); } Int_t j; diff --git a/ZDC/AliZDCHit.cxx b/ZDC/AliZDCHit.cxx index 25a73505336..fc16462be23 100644 --- a/ZDC/AliZDCHit.cxx +++ b/ZDC/AliZDCHit.cxx @@ -15,10 +15,11 @@ /* $Id$ */ +// //////////////////////////////////////////////// // Hits classes for set ZDC // //////////////////////////////////////////////// - +// #include "AliZDCHit.h" diff --git a/ZDC/AliZDCHit.h b/ZDC/AliZDCHit.h index 6bf6675eaf7..07b4e39dc92 100644 --- a/ZDC/AliZDCHit.h +++ b/ZDC/AliZDCHit.h @@ -18,30 +18,22 @@ public: virtual ~AliZDCHit() {} // Getters - virtual Int_t GetVolume(Int_t i) {return fVolume[i];} - virtual Float_t GetPrimKinEn() {return fPrimKinEn;} - virtual Float_t GetXImpact() {return fXImpact;} - virtual Float_t GetYImpact() {return fYImpact;} - virtual Float_t GetSFlag() {return fSFlag;} - virtual Float_t GetLightPMQ() {return fLightPMQ;} - virtual Float_t GetLightPMC() {return fLightPMC;} - virtual Float_t GetEnergy() {return fEnergy;} + virtual Int_t GetVolume(Int_t i) const {return fVolume[i];} + virtual Float_t GetPrimKinEn() const {return fPrimKinEn;} + virtual Float_t GetXImpact() const {return fXImpact;} + virtual Float_t GetYImpact() const {return fYImpact;} + virtual Float_t GetSFlag() const {return fSFlag;} + virtual Float_t GetLightPMQ() const {return fLightPMQ;} + virtual Float_t GetLightPMC() const {return fLightPMC;} + virtual Float_t GetEnergy() const {return fEnergy;} // Setters virtual void SetLightPMQ(Float_t value) {fLightPMQ=value;} virtual void SetLightPMC(Float_t value) {fLightPMC=value;} - - - // Data members - Int_t fVolume[2]; //Array of volumes - Float_t fPrimKinEn; //Primary particle energy - Float_t fXImpact; //x-coord. of the impact point over the ZDC - Float_t fYImpact; //y-coord. of the impact point over the ZDC - Float_t fSFlag; //Secondary flag - Float_t fLightPMQ; //Cerenkov light produced in each quadrant - Float_t fLightPMC; //Cerenkov light seen by the common PM - Float_t fEnergy; //Total energy deposited in eV - + virtual void SetSFlag(Float_t value) {fSFlag=value;} + virtual void SetPrimKinEn(Float_t value){fPrimKinEn=value;} + virtual void SetXImpact(Float_t value) {fXImpact=value;} + virtual void SetYImpact(Float_t value) {fYImpact=value;} // Operators Int_t operator == (AliZDCHit &quad) { @@ -67,6 +59,18 @@ public: fSFlag,fLightPMQ,fLightPMC,fEnergy); } +protected: + // Data members + Int_t fVolume[2]; //Array of volumes + Float_t fPrimKinEn; //Primary particle energy + Float_t fXImpact; //x-coord. of the impact point over the ZDC + Float_t fYImpact; //y-coord. of the impact point over the ZDC + Float_t fSFlag; //Secondary flag + Float_t fLightPMQ; //Cerenkov light produced in each quadrant + Float_t fLightPMC; //Cerenkov light seen by the common PM + Float_t fEnergy; //Total energy deposited in eV + + ClassDef(AliZDCHit,1) // Hits for the Zero Degree Calorimeters }; diff --git a/ZDC/AliZDCMergedHit.cxx b/ZDC/AliZDCMergedHit.cxx index c269c3ab7a3..46f75147074 100644 --- a/ZDC/AliZDCMergedHit.cxx +++ b/ZDC/AliZDCMergedHit.cxx @@ -15,10 +15,11 @@ /* $Id$ */ +// //////////////////////////////////////////////// // MergedHits classes for set ZDC // //////////////////////////////////////////////// - +// #include "AliZDCMergedHit.h" #include "AliRun.h" diff --git a/ZDC/AliZDCMergedHit.h b/ZDC/AliZDCMergedHit.h index 28a491a2479..6311a775818 100644 --- a/ZDC/AliZDCMergedHit.h +++ b/ZDC/AliZDCMergedHit.h @@ -18,26 +18,14 @@ public: virtual ~AliZDCMergedHit() {} // Getters - virtual Int_t GetSector(Int_t i) {return fSector[i];} - virtual Float_t GetPrimKinEn() {return fPrimKinEn;} - virtual Float_t GetXImpact() {return fXImpact;} - virtual Float_t GetYImpact() {return fYImpact;} - virtual Float_t GetSFlag() {return fSFlag;} - virtual Float_t GetLightPMQ() {return fLightPMQ;} - virtual Float_t GetLightPMC() {return fLightPMC;} - virtual Float_t GetEnergy() {return fEnergy;} - - - // Data members - Int_t fSector[2]; //Array of volumes - Float_t fPrimKinEn; //Primary particle energy - Float_t fXImpact; //x-coord. of the impact point over the ZDC - Float_t fYImpact; //y-coord. of the impact point over the ZDC - Float_t fSFlag; //Secondary flag - Float_t fLightPMQ; //Cerenkov light produced in each quadrant - Float_t fLightPMC; //Cerenkov light seen by the common PM - Float_t fEnergy; //Total energy deposited in eV - + virtual Int_t GetSector(Int_t i) const {return fSector[i];} + virtual Float_t GetPrimKinEn() const {return fPrimKinEn;} + virtual Float_t GetXImpact() const {return fXImpact;} + virtual Float_t GetYImpact() const {return fYImpact;} + virtual Float_t GetSFlag() const {return fSFlag;} + virtual Float_t GetLightPMQ() const {return fLightPMQ;} + virtual Float_t GetLightPMC() const {return fLightPMC;} + virtual Float_t GetEnergy() const {return fEnergy;} // Operators Int_t operator == (AliZDCMergedHit &quad) { @@ -60,6 +48,18 @@ public: fSector[0],fSector[1],fLightPMQ,fLightPMC,fEnergy); } +private: + // Data members + Int_t fSector[2]; //Array of volumes + Float_t fPrimKinEn; //Primary particle energy + Float_t fXImpact; //x-coord. of the impact point over the ZDC + Float_t fYImpact; //y-coord. of the impact point over the ZDC + Float_t fSFlag; //Secondary flag + Float_t fLightPMQ; //Cerenkov light produced in each quadrant + Float_t fLightPMC; //Cerenkov light seen by the common PM + Float_t fEnergy; //Total energy deposited in eV + + ClassDef(AliZDCMergedHit,1) // MergedHits for the Zero Degree Calorimeters }; -- 2.39.3