From 3663622c4d3b0416f42f8e59521f82d09e5662bb Mon Sep 17 00:00:00 2001 From: kharlov Date: Mon, 28 Aug 2006 10:01:56 +0000 Subject: [PATCH] Effective C++ warnings fixed (Timur Pocheptsov) --- PHOS/AliPHOSCPVGeometry.cxx | 20 ++-- PHOS/AliPHOSCpvRecPoint.cxx | 21 ++-- PHOS/AliPHOSCpvRecPoint.h | 12 +- PHOS/AliPHOSDigit.cxx | 35 ++++-- PHOS/AliPHOSDigit.h | 15 ++- PHOS/AliPHOSDigitizer.cxx | 136 ++++++++++++++++------ PHOS/AliPHOSEMCAGeometry.cxx | 51 ++++++++- PHOS/AliPHOSEMCAGeometry.h | 12 +- PHOS/AliPHOSEmcRecPoint.cxx | 43 ++++--- PHOS/AliPHOSGammaJet.cxx | 170 ++++++++++++---------------- PHOS/AliPHOSGammaJet.h | 10 +- PHOS/AliPHOSGeometry.cxx | 47 +++++++- PHOS/AliPHOSGeometry.h | 16 +-- PHOS/AliPHOSGetter.cxx | 63 ++++++++++- PHOS/AliPHOSGetter.h | 16 +-- PHOS/AliPHOSGetterLight.cxx | 59 ++++++---- PHOS/AliPHOSGetterLight.h | 5 +- PHOS/AliPHOSLoader.cxx | 24 ++-- PHOS/AliPHOSRecPoint.cxx | 11 +- PHOS/AliPHOSRecPoint.h | 5 - PHOS/AliPHOSSDigitizer.cxx | 47 ++++---- PHOS/AliPHOSSDigitizer.h | 6 +- PHOS/AliPHOSSupportGeometry.cxx | 14 +-- PHOS/AliPHOSSupportGeometry.h | 4 - PHOS/AliPHOSTrackSegment.cxx | 27 ++++- PHOS/AliPHOSTrackSegment.h | 5 +- PHOS/AliPHOSTrackSegmentMakerv1.cxx | 61 ++++++++-- PHOS/AliPHOSTrackSegmentMakerv1.h | 12 +- PHOS/AliPHOSTrigger.cxx | 62 +++++----- PHOS/AliPHOSTrigger.h | 4 + 30 files changed, 648 insertions(+), 365 deletions(-) diff --git a/PHOS/AliPHOSCPVGeometry.cxx b/PHOS/AliPHOSCPVGeometry.cxx index 730ae1eface..34d326ceafa 100644 --- a/PHOS/AliPHOSCPVGeometry.cxx +++ b/PHOS/AliPHOSCPVGeometry.cxx @@ -34,19 +34,19 @@ ClassImp(AliPHOSCPVGeometry) //____________________________________________________________________________ AliPHOSCPVGeometry::AliPHOSCPVGeometry() + : fNumberOfCPVLayers(1), + fNumberOfCPVPadsPhi(128), + fNumberOfCPVPadsZ(56), + fCPVPadSizePhi(1.13), + fCPVPadSizeZ(2.26), + fNumberOfCPVChipsPhi(8), + fNumberOfCPVChipsZ(8), + fCPVGasThickness(1.3), + fCPVTextoliteThickness(0.1), + fCPVCuNiFoilThickness(56e-04) { // Initializes the CPV parameters - fNumberOfCPVLayers = 1; - fNumberOfCPVPadsPhi = 128; - fNumberOfCPVPadsZ = 56; - fCPVPadSizePhi = 1.13; - fCPVPadSizeZ = 2.26; - fNumberOfCPVChipsPhi = 8; - fNumberOfCPVChipsZ = 8; - fCPVGasThickness = 1.3; - fCPVTextoliteThickness = 0.1; - fCPVCuNiFoilThickness = 56e-04;; fCPVFrameSize[0] = 2.5; fCPVFrameSize[1] = 5.1; fCPVFrameSize[2] = 2.5; diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx index e6b92b7fc81..29b54b4b567 100644 --- a/PHOS/AliPHOSCpvRecPoint.cxx +++ b/PHOS/AliPHOSCpvRecPoint.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.23 2005/12/20 14:28:47 hristov + * Additional protection + * * Revision 1.22 2005/05/28 14:19:04 schutz * Compilation warnings fixed by T.P. * @@ -47,22 +50,22 @@ ClassImp(AliPHOSCpvRecPoint) //____________________________________________________________________________ -AliPHOSCpvRecPoint::AliPHOSCpvRecPoint() : AliPHOSEmcRecPoint() +AliPHOSCpvRecPoint::AliPHOSCpvRecPoint() : + AliPHOSEmcRecPoint(), + fLengX(-1), + fLengZ(-1) { // ctor - - fLengX = -1; - fLengZ = -1; } //____________________________________________________________________________ -AliPHOSCpvRecPoint::AliPHOSCpvRecPoint(const char * opt) : AliPHOSEmcRecPoint(opt) +AliPHOSCpvRecPoint::AliPHOSCpvRecPoint(const char * opt) : + AliPHOSEmcRecPoint(opt), + fLengX(-1), + fLengZ(-1) { // ctor - - fLengX = -1; - fLengZ = -1; - } +} //____________________________________________________________________________ AliPHOSCpvRecPoint::~AliPHOSCpvRecPoint() diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h index dea15b2a3b4..8071ace6470 100644 --- a/PHOS/AliPHOSCpvRecPoint.h +++ b/PHOS/AliPHOSCpvRecPoint.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.18 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -35,10 +38,7 @@ public: AliPHOSCpvRecPoint() ; AliPHOSCpvRecPoint(const char * opt) ; - AliPHOSCpvRecPoint(const AliPHOSCpvRecPoint & rp) : AliPHOSEmcRecPoint(rp) { - Fatal("cpy ctor", "not implemented") ; - } - + virtual ~AliPHOSCpvRecPoint() ; Int_t Compare(const TObject * obj) const; // method for sorting @@ -54,10 +54,6 @@ public: Bool_t IsSortable() const { return kTRUE ; } // tells that this is a sortable object void Print(const Option_t * = "") const ; - AliPHOSCpvRecPoint & operator = (const AliPHOSCpvRecPoint & /*rvalue*/) { - Fatal("operator =", "not implemented") ; return *this ; - } - protected: Bool_t AreNeighbours(AliPHOSDigit * digit1, AliPHOSDigit * digit2 ) const ; diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx index 885ce107e69..193c61e2157 100644 --- a/PHOS/AliPHOSDigit.cxx +++ b/PHOS/AliPHOSDigit.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.39 2006/04/22 15:04:24 hristov + * Effective C++ initialization of data members in the default constructor + * * Revision 1.38 2006/04/22 10:30:17 hristov * Add fEnergy to AliPHOSDigit and operate with EMC amplitude in energy units (Yu.Kharlov) * @@ -64,7 +67,12 @@ AliPHOSDigit::AliPHOSDigit() : } //____________________________________________________________________________ -AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t time, Int_t index) +AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t time, Int_t index) : + fNprimary(0), + fPrimary(0), + fEnergy(0.f), + fTime(0.f), + fTimeR(0.f) { // ctor with all data @@ -86,7 +94,12 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t tim } //____________________________________________________________________________ -AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time, Int_t index) +AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time, Int_t index) : + fNprimary(0), + fPrimary(0), + fEnergy(0.f), + fTime(0.f), + fTimeR(0.f) { // ctor with all data @@ -108,11 +121,16 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time } //____________________________________________________________________________ -AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit) +AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : + AliDigitNew(digit), + fNprimary(digit.fNprimary), + fPrimary(0), + fEnergy(digit.fEnergy), + fTime(digit.fTime), + fTimeR(digit.fTimeR) + { // copy ctor - - fNprimary = digit.fNprimary ; if(fNprimary){ fPrimary = new Int_t[fNprimary] ; for (Int_t i = 0; i < fNprimary ; i++) @@ -121,9 +139,6 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit) else fPrimary = 0 ; fAmp = digit.fAmp ; - fEnergy = digit.fEnergy ; - fTime = digit.fTime ; - fTimeR = digit.fTimeR ; fId = digit.fId; fIndexInList = digit.fIndexInList ; } @@ -200,7 +215,7 @@ Bool_t AliPHOSDigit::operator==(AliPHOSDigit const & digit) const } //____________________________________________________________________________ -AliPHOSDigit& AliPHOSDigit::operator+(AliPHOSDigit const & digit) +AliPHOSDigit& AliPHOSDigit::operator+=(AliPHOSDigit const & digit) { // Adds the amplitude of digits and completes the list of primary particles @@ -231,7 +246,7 @@ AliPHOSDigit& AliPHOSDigit::operator+(AliPHOSDigit const & digit) return *this ; } //____________________________________________________________________________ -AliPHOSDigit& AliPHOSDigit::operator*(Float_t factor) +AliPHOSDigit& AliPHOSDigit::operator *= (Float_t factor) { // Multiplies the amplitude by a factor diff --git a/PHOS/AliPHOSDigit.h b/PHOS/AliPHOSDigit.h index 7e6b133ce39..37c88a2f67f 100644 --- a/PHOS/AliPHOSDigit.h +++ b/PHOS/AliPHOSDigit.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.34 2006/04/22 10:30:17 hristov + * Add fEnergy to AliPHOSDigit and operate with EMC amplitude in energy units (Yu.Kharlov) + * * Revision 1.33 2005/05/28 14:19:04 schutz * Compilation warnings fixed by T.P. * @@ -46,10 +49,14 @@ class AliPHOSDigit : public AliDigitNew { virtual ~AliPHOSDigit() ; Bool_t operator==(const AliPHOSDigit &rValue) const; - AliPHOSDigit& operator+(AliPHOSDigit const &rValue) ; - AliPHOSDigit& operator*(Float_t factor) ; - // AliPHOSDigit& operator=(const AliPHOSDigit) { - // Fatal("operator = ", "not implemented") ; return *this ; } + + AliPHOSDigit& operator += (AliPHOSDigit const &rValue) ; + AliPHOSDigit& operator *= (Float_t factor) ; + +public: + + AliPHOSDigit& operator=(const AliPHOSDigit) { + Fatal("operator = ", "not implemented") ; return *this ; } Int_t Compare(const TObject * obj) const ; Int_t GetNprimary() const { return fNprimary ; } Int_t GetPrimary(Int_t index) const ; diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index d6895cc3667..dc92b439508 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.91 2006/04/29 20:25:30 hristov + * Decalibration is implemented (Yu.Kharlov) + * * Revision 1.90 2006/04/22 10:30:17 hristov * Add fEnergy to AliPHOSDigit and operate with EMC amplitude in energy units (Yu.Kharlov) * @@ -99,24 +102,64 @@ ClassImp(AliPHOSDigitizer) //____________________________________________________________________________ - AliPHOSDigitizer::AliPHOSDigitizer():AliDigitizer("",""), - fInput(0), - fInputFileNames(0x0), - fEventNames(0x0) +AliPHOSDigitizer::AliPHOSDigitizer() : + AliDigitizer("",""), + fDefaultInit(kTRUE), + fDigitsInRun(0), + fInit(kFALSE), + fInput(0), + fInputFileNames(0x0), + fEventNames(0x0), + fEmcCrystals(0), + fPinNoise(0.f), + fEMCDigitThreshold(0.f), + fCPVNoise(0.f), + fCPVDigitThreshold(0.f), + fTimeResolution(0.f), + fTimeThreshold(0.f), + fTimeSignalLength(0.f), + fADCchanelEmc(0.f), + fADCpedestalEmc(0.f), + fNADCemc(0), + fADCchanelCpv(0.f), + fADCpedestalCpv(0.f), + fNADCcpv(0), + fEventFolderName(""), + fFirstEvent(0), + fLastEvent(0) { // ctor InitParameters() ; - fDefaultInit = kTRUE ; fManager = 0 ; // We work in the standalong mode - fEventFolderName = "" ; } //____________________________________________________________________________ AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, TString eventFolderName): - AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(), - alirunFileName), - fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName) + AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(), alirunFileName), + fDefaultInit(kFALSE), + fDigitsInRun(0), + fInit(kFALSE), + fInput(0), + fInputFileNames(0x0), + fEventNames(0x0), + fEmcCrystals(0), + fPinNoise(0.f), + fEMCDigitThreshold(0.f), + fCPVNoise(0.f), + fCPVDigitThreshold(0.f), + fTimeResolution(0.f), + fTimeThreshold(0.f), + fTimeSignalLength(0.f), + fADCchanelEmc(0.f), + fADCpedestalEmc(0.f), + fNADCemc(0), + fADCchanelCpv(0.f), + fADCpedestalCpv(0.f), + fNADCcpv(0), + fEventFolderName(eventFolderName), + fFirstEvent(0), + fLastEvent(0) { // ctor InitParameters() ; @@ -126,37 +169,66 @@ AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, } //____________________________________________________________________________ -AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d) - : AliDigitizer(d) +AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d) : + AliDigitizer(d), + fDefaultInit(d.fDefaultInit), + fDigitsInRun(d.fDigitsInRun), + fInit(d.fInit), + fInput(d.fInput), + fInputFileNames(0x0),//? + fEventNames(0x0),//? + fEmcCrystals(d.fEmcCrystals), + fPinNoise(d.fPinNoise), + fEMCDigitThreshold(d.fEMCDigitThreshold), + fCPVNoise(d.fCPVNoise), + fCPVDigitThreshold(d.fCPVDigitThreshold), + fTimeResolution(d.fTimeResolution), + fTimeThreshold(d.fTimeThreshold), + fTimeSignalLength(d.fTimeSignalLength), + fADCchanelEmc(d.fADCchanelEmc), + fADCpedestalEmc(d.fADCpedestalEmc), + fNADCemc(d.fNADCemc), + fADCchanelCpv(d.fADCchanelCpv), + fADCpedestalCpv(d.fADCpedestalCpv), + fNADCcpv(d.fNADCcpv), + fEventFolderName(d.fEventFolderName), + fFirstEvent(d.fFirstEvent), + fLastEvent(d.fLastEvent) { // copyy ctor - SetName(d.GetName()) ; SetTitle(d.GetTitle()) ; - fPinNoise = d.fPinNoise ; - fEMCDigitThreshold = d.fEMCDigitThreshold ; - fCPVNoise = d.fCPVNoise ; - fCPVDigitThreshold = d.fCPVDigitThreshold ; - fTimeResolution = d.fTimeResolution ; - fTimeThreshold = d.fTimeThreshold ; - fTimeSignalLength = d.fTimeSignalLength ; - fADCchanelEmc = d.fADCchanelEmc ; - fADCpedestalEmc = d.fADCpedestalEmc ; - fNADCemc = d.fNADCemc ; - fADCchanelCpv = d.fADCchanelCpv ; - fADCpedestalCpv = d.fADCpedestalCpv ; - fNADCcpv = d.fNADCcpv ; - fEventFolderName = d.fEventFolderName; } //____________________________________________________________________________ -AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd): - AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()), - fEventFolderName(0) +AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd) : + AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()), + fDefaultInit(kFALSE), + fDigitsInRun(0), + fInit(kFALSE), + fInput(0), + fInputFileNames(0x0), + fEventNames(0x0), + fEmcCrystals(0), + fPinNoise(0.f), + fEMCDigitThreshold(0.f), + fCPVNoise(0.f), + fCPVDigitThreshold(0.f), + fTimeResolution(0.f), + fTimeThreshold(0.f), + fTimeSignalLength(0.f), + fADCchanelEmc(0.f), + fADCpedestalEmc(0.f), + fNADCemc(0), + fADCchanelCpv(0.f), + fADCpedestalCpv(0.f), + fNADCcpv(0), + fEventFolderName(fManager->GetInputFolderName(0)), + fFirstEvent(0), + fLastEvent(0) { // ctor Init() is called by RunDigitizer fManager = rd ; - fEventFolderName = fManager->GetInputFolderName(0) ; SetTitle(dynamic_cast(fManager->GetInputStream(0))->GetFileName(0)); InitParameters() ; fDefaultInit = kFALSE ; @@ -293,7 +365,7 @@ void AliPHOSDigitizer::Digitize(Int_t event) new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime(),0, b); new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b); - *digit = *digit + *curSDigit ; //add energies + *digit += *curSDigit ; //add energies index[i]++ ; if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) @@ -348,7 +420,7 @@ void AliPHOSDigitizer::Digitize(Int_t event) curSDigit->ShiftPrimary(primaryoffset) ; //add energies - *digit = *digit + *curSDigit ; + *digit += *curSDigit ; index[i]++ ; if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) curSDigit = dynamic_cast( dynamic_cast(sdigArray->At(i))->At(index[i]) ) ; diff --git a/PHOS/AliPHOSEMCAGeometry.cxx b/PHOS/AliPHOSEMCAGeometry.cxx index 7d8745e9f9a..15d0714db3b 100644 --- a/PHOS/AliPHOSEMCAGeometry.cxx +++ b/PHOS/AliPHOSEMCAGeometry.cxx @@ -32,7 +32,55 @@ ClassImp(AliPHOSEMCAGeometry) //____________________________________________________________________________ -AliPHOSEMCAGeometry::AliPHOSEMCAGeometry() +AliPHOSEMCAGeometry::AliPHOSEMCAGeometry(): + fAirGapLed(0.f), + fStripWallWidthOut(0.f), + fStripWallWidthIn(0.f), + fTyvecThickness(0.f), + fInnerThermoWidthX(0.f), + fInnerThermoWidthY(0.f), + fInnerThermoWidthZ(0.f), + fAirGapWidthX(0.f), + fAirGapWidthY(0.f), + fAirGapWidthZ(0.f), + fCoolerWidthX(0.f), + fCoolerWidthY(0.f), + fCoolerWidthZ(0.f), + fAlCoverThickness(0.f), + fOuterThermoWidthXUp(0.f), + fOuterThermoWidthXLow(0.f), + fOuterThermoWidthY(0.f), + fOuterThermoWidthZ(0.f), + fAlFrontCoverX(0.f), + fAlFrontCoverZ(0.f), + fFiberGlassSup2X(0.f), + fFiberGlassSup1X(0.f), + fFrameHeight(0.f), + fFrameThickness(0.f), + fAirSpaceFeeX(0.f), + fAirSpaceFeeZ(0.f), + fAirSpaceFeeY(0.f), + fWarmUpperThickness(0.f), + fWarmBottomThickness(0.f), + fWarmAlCoverWidthX(0.f), + fWarmAlCoverWidthY(0.f), + fWarmAlCoverWidthZ(0.f), + fFiberGlassSup1Y(0.f), + fFiberGlassSup2Y(0.f), + fTSupportDist(0.f), + fTSupport1Thickness(0.f), + fTSupport2Thickness(0.f), + fTSupport1Width(0.f), + fTSupport2Width(0.f), + fIPtoOuterCoverDistance(0.f), + fIPtoCrystalSurface(0.f), + fSupportPlateThickness(0.f), + fNCellsInStrip(0), + fNStripX(0), + fNStripZ(0), + fNTSupports(0), + fNPhi(0), + fNZ(0) { @@ -318,4 +366,3 @@ AliPHOSEMCAGeometry::AliPHOSEMCAGeometry() fNZ = fNStripZ ; //number of crystals along beam } -//____________________________________________________________________________ diff --git a/PHOS/AliPHOSEMCAGeometry.h b/PHOS/AliPHOSEMCAGeometry.h index 9ca7dcf8cd4..2fc1f41024a 100644 --- a/PHOS/AliPHOSEMCAGeometry.h +++ b/PHOS/AliPHOSEMCAGeometry.h @@ -24,17 +24,9 @@ class AliPHOSEMCAGeometry : public TObject { public: AliPHOSEMCAGeometry(); - AliPHOSEMCAGeometry(const AliPHOSEMCAGeometry & cpv) : TObject(cpv) { - // cpy ctor requested by Coding Convention but not yet needed - Fatal("Copy ctor","Not implemented yet"); - } - virtual ~AliPHOSEMCAGeometry(void) {} + //Compiler-generated copy ctor and copy-assignment operator _ARE_ OK. - AliPHOSEMCAGeometry & operator = (const AliPHOSEMCAGeometry & /*rvalue*/) { - // assignement operator requested by coding convention but not needed - Fatal("Operator = ","Not implemented yet"); - return *this ; - } + virtual ~AliPHOSEMCAGeometry(void) {} Float_t * GetStripHalfSize() {return fStripHalfSize ;} Float_t GetStripWallWidthOut() const {return fStripWallWidthOut ;} diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx index a168af92d85..935694cc568 100644 --- a/PHOS/AliPHOSEmcRecPoint.cxx +++ b/PHOS/AliPHOSEmcRecPoint.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.53 2005/12/20 14:28:47 hristov + * Additional protection + * * Revision 1.52 2005/05/28 14:19:04 schutz * Compilation warnings fixed by T.P. * @@ -49,58 +52,54 @@ ClassImp(AliPHOSEmcRecPoint) //____________________________________________________________________________ -AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() : AliPHOSRecPoint() +AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() : + AliPHOSRecPoint(), + fCoreEnergy(0.), fDispersion(0.), + fEnergyList(0), fTime(-1.), fNExMax(0), + fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.), + fPhixe(0.), fDebug(0) { // ctor - fMulDigit = 0 ; fAmp = 0. ; - fCoreEnergy = 0 ; - fEnergyList = 0 ; - fNExMax = 0 ; //Not unfolded yet - fTime = -1. ; fLocPos.SetX(1000000.) ; //Local position should be evaluated - fDebug=0; - } //____________________________________________________________________________ -AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) : AliPHOSRecPoint(opt) +AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) : + AliPHOSRecPoint(opt), + fCoreEnergy(0.), fDispersion(0.), + fEnergyList(0), fTime(-1.), fNExMax(0), + fM2x(0.), fM2z(0.), fM3x(0.), fM4z(0.), + fPhixe(0.), fDebug(0) { // ctor - fMulDigit = 0 ; fAmp = 0. ; - fNExMax = 0 ; //Not unfolded yet - fCoreEnergy = 0 ; - fEnergyList = 0 ; - fTime = -1. ; fLocPos.SetX(1000000.) ; //Local position should be evaluated - fDebug=0; - } //____________________________________________________________________________ -AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) : AliPHOSRecPoint(rp) +AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) : + AliPHOSRecPoint(rp), + fCoreEnergy(rp.fCoreEnergy), fDispersion(rp.fDispersion), + fEnergyList(0), fTime(rp.fTime), fNExMax(rp.fNExMax), + fM2x(rp.fM2x), fM2z(rp.fM2z), fM3x(rp.fM3x), fM4z(rp.fM4z), + fPhixe(rp.fPhixe), fDebug(rp.fDebug) { // cpy ctor - fMulDigit = rp.fMulDigit ; fAmp = rp.fAmp ; - fCoreEnergy = rp.fCoreEnergy ; fEnergyList = new Float_t[rp.fMulDigit] ; Int_t index ; for(index = 0 ; index < fMulDigit ; index++) fEnergyList[index] = rp.fEnergyList[index] ; - fNExMax = rp.fNExMax ; - fTime = rp.fTime ; } //____________________________________________________________________________ AliPHOSEmcRecPoint::~AliPHOSEmcRecPoint() { // dtor - if ( fEnergyList ) delete[] fEnergyList ; } diff --git a/PHOS/AliPHOSGammaJet.cxx b/PHOS/AliPHOSGammaJet.cxx index abee14de0db..443edb827fd 100644 --- a/PHOS/AliPHOSGammaJet.cxx +++ b/PHOS/AliPHOSGammaJet.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.13 2006/04/26 07:32:37 hristov + * Coding conventions, clean-up and related changes + * * Revision 1.12 2006/03/10 13:23:36 hristov * Using AliESDCaloCluster instead of AliESDtrack * @@ -72,48 +75,37 @@ ClassImp(AliPHOSGammaJet) //____________________________________________________________________________ -AliPHOSGammaJet::AliPHOSGammaJet() : TTask() +AliPHOSGammaJet::AliPHOSGammaJet() : + TTask(), fAnyConeOrPt(0), fOptionGJ(""), + fOutputFile(new TFile(gDirectory->GetName())), + fOutputFileName(gDirectory->GetName()), + fInputFileName(gDirectory->GetName()), + fHIJINGFileName(gDirectory->GetName()), + fHIJING(0), fESDdata(0), fEtaCut(0.), + fOnlyCharged(0), fPhiMaxCut(0.), + fPhiMinCut(0.), fPtCut(0.), + fNeutralPtCut(0.), fChargedPtCut(0.), + fInvMassMaxCut(0.), fInvMassMinCut(0.), + fMinDistance(0.), fRatioMaxCut(0.), fRatioMinCut(0.), + fTPCCutsLikeEMCAL(0), fDirName(""), fESDTree(""), + fPattern(""), fJetTPCRatioMaxCut(0.), + fJetTPCRatioMinCut(0.), fJetRatioMaxCut(0.), + fJetRatioMinCut(0.), fNEvent(0), fNCone(0), + fNPt(0), fCone(0), fPtThreshold(0), + fPtJetSelectionCut(0.0), + fListHistos(new TObjArray(100)), + fFastRec(0), fOptFast(0), + fRan(0), fResPara1(0.), fResPara2(0.), fResPara3(0.), + fPosParaA(0.), fPosParaB(0.), fAngleMaxParam(), fSelect(0) { // ctor fAngleMaxParam.Set(4) ; fAngleMaxParam.Reset(0.); - fAnyConeOrPt = 0 ; - fEtaCut = 0. ; - fESDdata = 0 ; - fFastRec = 0 ; - fInvMassMaxCut = 0. ; - fInvMassMinCut = 0. ; - fJetRatioMaxCut = 0. ; - fJetRatioMinCut = 0. ; - fJetTPCRatioMaxCut = 0. ; - fJetTPCRatioMinCut = 0. ; - fMinDistance = 0. ; - fNEvent = 0 ; - fNCone = 0 ; - fNPt = 0 ; - fOnlyCharged = 0 ; - fOptFast = 0 ; - fPhiMaxCut = 0. ; - fPhiMinCut = 0. ; - fPtCut = 0. ; - fNeutralPtCut = 0. ; - fChargedPtCut = 0. ; - fRatioMaxCut = 0. ; - fRatioMinCut = 0. ; - fCone = 0 ; - fPtThreshold = 0 ; - fTPCCutsLikeEMCAL = 0 ; - fSelect = 0 ; - - fDirName = "" ; - fESDTree = "" ; - fPattern = "" ; for(Int_t i = 0; i<10; i++){ fCones[i] = 0.0 ; fNameCones[i] = "" ; fPtThres[i] = 0.0 ; - fPtJetSelectionCut = 0.0 ; fNamePtThres[i] = "" ; if( i < 6 ){ fJetXMin1[i] = 0.0 ; @@ -131,21 +123,7 @@ AliPHOSGammaJet::AliPHOSGammaJet() : TTask() } } } - - fOptionGJ = "" ; - fOutputFile = new TFile(gDirectory->GetName()) ; - fInputFileName = gDirectory->GetName() ; - fOutputFileName = gDirectory->GetName() ; - fHIJINGFileName = gDirectory->GetName() ; - fHIJING = 0 ; - fPosParaA = 0. ; - fPosParaB = 0. ; - fRan = 0 ; - fResPara1 = 0. ; - fResPara2 = 0. ; - fResPara3 = 0. ; - fListHistos = new TObjArray(100) ; TList * list = gDirectory->GetListOfKeys() ; TIter next(list) ; TH2F * h = 0 ; @@ -160,7 +138,29 @@ AliPHOSGammaJet::AliPHOSGammaJet() : TTask() //____________________________________________________________________________ AliPHOSGammaJet::AliPHOSGammaJet(const TString inputfilename) : - TTask("GammaJet","Analysis of gamma-jet correlations") + TTask("GammaJet","Analysis of gamma-jet correlations"), + fAnyConeOrPt(0), fOptionGJ(), + fOutputFile(0), + fOutputFileName(), + fInputFileName(), + fHIJINGFileName(), + fHIJING(0), fESDdata(0), fEtaCut(0.), + fOnlyCharged(0), fPhiMaxCut(0.), + fPhiMinCut(0.), fPtCut(0.), + fNeutralPtCut(0.), fChargedPtCut(0.), + fInvMassMaxCut(0.), fInvMassMinCut(0.), + fMinDistance(0.), fRatioMaxCut(0.), fRatioMinCut(0.), + fTPCCutsLikeEMCAL(0), fDirName(), fESDTree(), + fPattern(), fJetTPCRatioMaxCut(0.), + fJetTPCRatioMinCut(0.), fJetRatioMaxCut(0.), + fJetRatioMinCut(0.), fNEvent(0), fNCone(0), + fNPt(0), fCone(0), fPtThreshold(0), + fPtJetSelectionCut(0.0), + fListHistos(0), + fFastRec(0), fOptFast(0), + fRan(0), fResPara1(0.), fResPara2(0.), fResPara3(0.), + fPosParaA(0.), fPosParaB(0.), fAngleMaxParam(), fSelect(0) + { // ctor fInputFileName = inputfilename; @@ -168,58 +168,37 @@ AliPHOSGammaJet::AliPHOSGammaJet(const TString inputfilename) : AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileName) ; fNEvent = gime->MaxEvent(); InitParameters(); - fListHistos = 0 ; } //____________________________________________________________________________ -AliPHOSGammaJet::AliPHOSGammaJet(const AliPHOSGammaJet & gj) : TTask(gj) +AliPHOSGammaJet::AliPHOSGammaJet(const AliPHOSGammaJet & gj) : + TTask(gj), + fAnyConeOrPt(gj.fAnyConeOrPt), fOptionGJ(gj.fOptionGJ), + fOutputFile(gj.fOutputFile), + fOutputFileName(gj.fOutputFileName), + fInputFileName(gj.fInputFileName), + fHIJINGFileName(gj.fHIJINGFileName), + fHIJING(gj.fHIJING), fESDdata(gj.fESDdata), fEtaCut(gj.fEtaCut), + fOnlyCharged(gj.fOnlyCharged), fPhiMaxCut(gj.fPhiMaxCut), + fPhiMinCut(gj.fPhiMinCut), fPtCut(gj.fPtCut), + fNeutralPtCut(gj.fNeutralPtCut), fChargedPtCut(gj.fChargedPtCut), + fInvMassMaxCut(gj.fInvMassMaxCut), fInvMassMinCut(gj.fInvMassMinCut), + fMinDistance(gj.fMinDistance), fRatioMaxCut(gj.fRatioMaxCut), + fRatioMinCut(gj.fRatioMinCut), fTPCCutsLikeEMCAL(gj.fTPCCutsLikeEMCAL), + fDirName(gj.fDirName), fESDTree(gj.fESDTree), + fPattern(gj.fPattern), fJetTPCRatioMaxCut(gj.fJetTPCRatioMaxCut), + fJetTPCRatioMinCut(gj.fJetTPCRatioMinCut), fJetRatioMaxCut(gj.fJetRatioMaxCut), + fJetRatioMinCut(gj.fJetRatioMinCut), fNEvent(gj.fNEvent), fNCone(gj.fNCone), + fNPt(gj.fNPt), fCone(gj.fCone), fPtThreshold(gj.fPtThreshold), + fPtJetSelectionCut(gj.fPtJetSelectionCut), + fListHistos(0),//????? + fFastRec(gj.fFastRec), fOptFast(gj.fOptFast), + fRan(0), //??? + fResPara1(gj.fResPara1), fResPara2(gj.fResPara2), fResPara3(gj.fResPara3), + fPosParaA(gj.fPosParaA), fPosParaB(gj.fPosParaB), + fAngleMaxParam(gj.fAngleMaxParam), fSelect(gj.fSelect) { // cpy ctor - fAngleMaxParam = gj.fAngleMaxParam; - fAnyConeOrPt = gj.fAnyConeOrPt; - fESDdata = gj.fESDdata; - fEtaCut = gj.fEtaCut ; - fInvMassMaxCut = gj.fInvMassMaxCut ; - fInvMassMinCut = gj.fInvMassMinCut ; - fFastRec = gj.fFastRec ; - fOptionGJ = gj.fOptionGJ ; - fMinDistance = gj.fMinDistance ; - fOptFast = gj.fOptFast ; - fOnlyCharged = gj.fOnlyCharged ; - fOutputFile = gj.fOutputFile ; - fInputFileName = gj.fInputFileName ; - fOutputFileName = gj.fOutputFileName ; - fHIJINGFileName = gj.fHIJINGFileName ; - fHIJING = gj.fHIJING ; - fRatioMaxCut = gj.fRatioMaxCut ; - fRatioMinCut = gj.fRatioMinCut ; - fJetRatioMaxCut = gj.fJetRatioMaxCut ; - fJetRatioMinCut = gj.fJetRatioMinCut ; - fJetTPCRatioMaxCut = gj.fJetRatioMaxCut ; - fJetTPCRatioMinCut = gj.fJetRatioMinCut ; - fNEvent = gj.fNEvent ; - fNCone = gj.fNCone ; - fNPt = gj.fNPt ; - fResPara1 = gj.fResPara1 ; - fResPara2 = gj.fResPara2 ; - fResPara3 = gj.fResPara3 ; - fPtCut = gj.fPtCut ; - fNeutralPtCut = gj.fNeutralPtCut ; - fChargedPtCut = gj.fChargedPtCut ; - fPtJetSelectionCut = gj.fPtJetSelectionCut ; - fPhiMaxCut = gj.fPhiMaxCut ; - fPhiMinCut = gj.fPhiMinCut ; - fPosParaA = gj.fPosParaA ; - fPosParaB = gj.fPosParaB ; - fSelect = gj.fSelect ; - fTPCCutsLikeEMCAL = gj.fTPCCutsLikeEMCAL ; - fCone = gj.fCone ; - fPtThreshold = gj.fPtThreshold ; - - fDirName = gj.fDirName ; - fESDTree = gj.fESDTree ; - fPattern = gj.fPattern ; - SetName (gj.GetName()) ; SetTitle(gj.GetTitle()) ; @@ -250,7 +229,6 @@ AliPHOSGammaJet::AliPHOSGammaJet(const AliPHOSGammaJet & gj) : TTask(gj) AliPHOSGammaJet::~AliPHOSGammaJet() { fOutputFile->Close() ; - } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSGammaJet.h b/PHOS/AliPHOSGammaJet.h index 56b419ee449..32ce4cad1f8 100644 --- a/PHOS/AliPHOSGammaJet.h +++ b/PHOS/AliPHOSGammaJet.h @@ -7,6 +7,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.11 2006/01/12 17:01:00 schutz + * Correct few coding violations, missing comments + * * Revision 1.9 2005/12/20 07:31:51 schutz * added data members * @@ -44,8 +47,7 @@ public: AliPHOSGammaJet() ; // default ctor AliPHOSGammaJet(const TString inputfilename) ; //ctor AliPHOSGammaJet(const AliPHOSGammaJet & gj) ; // cpy ctor - AliPHOSGammaJet & operator = (const AliPHOSGammaJet & /*rvalue*/) - { return *this ;} //assignement operator requested by coding convention but not needed + virtual ~AliPHOSGammaJet() ; //virtual dtor virtual void Exec(Option_t *option); void List() const; @@ -139,6 +141,10 @@ public: void SetDirPattern(char * dp) { fPattern = dp ; } private: + AliPHOSGammaJet & operator = (const AliPHOSGammaJet & /*rvalue*/) + { return *this ;} + + // void AddHIJINGToList(TList & particleList, TList & particleListCh, // TList & particleListNe, const Int_t iEvent, // const TLorentzVector gamma, Double_t & rot ); diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx index 3677999be3d..33a8d95f01b 100644 --- a/PHOS/AliPHOSGeometry.cxx +++ b/PHOS/AliPHOSGeometry.cxx @@ -47,17 +47,52 @@ AliPHOSGeometry * AliPHOSGeometry::fgGeom = 0 ; Bool_t AliPHOSGeometry::fgInit = kFALSE ; //____________________________________________________________________________ -AliPHOSGeometry::AliPHOSGeometry() { +AliPHOSGeometry::AliPHOSGeometry() : + fNModules(0), + fAngle(0.f), + fPHOSAngle(0), + fIPtoUpperCPVsurface(0), + fRotMatrixArray(0), + fGeometryEMCA(0), + fGeometryCPV(0), + fGeometrySUPP(0) +{ // default ctor // must be kept public for root persistency purposes, but should never be called by the outside world - fPHOSAngle = 0 ; - fGeometryEMCA = 0 ; - fGeometrySUPP = 0 ; - fGeometryCPV = 0 ; fgGeom = 0 ; - fRotMatrixArray = 0 ; } +//____________________________________________________________________________ +AliPHOSGeometry::AliPHOSGeometry(const AliPHOSGeometry & rhs) + : AliGeometry(rhs), + fNModules(rhs.fNModules), + fAngle(rhs.fAngle), + fPHOSAngle(0), + fIPtoUpperCPVsurface(rhs.fIPtoUpperCPVsurface), + fRotMatrixArray(0), + fGeometryEMCA(0), + fGeometryCPV(0), + fGeometrySUPP(0) +{ + Fatal("cpy ctor", "not implemented") ; +} + +AliPHOSGeometry::AliPHOSGeometry(const Text_t* name, const Text_t* title) + : AliGeometry(name, title), + fNModules(0), + fAngle(0.f), + fPHOSAngle(0), + fIPtoUpperCPVsurface(0), + fRotMatrixArray(0), + fGeometryEMCA(0), + fGeometryCPV(0), + fGeometrySUPP(0) +{ + // ctor only for internal usage (singleton) + Init() ; +} + + //____________________________________________________________________________ AliPHOSGeometry::~AliPHOSGeometry(void) { diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h index fa6e3893af8..c5c3a51da26 100644 --- a/PHOS/AliPHOSGeometry.h +++ b/PHOS/AliPHOSGeometry.h @@ -31,10 +31,7 @@ class AliPHOSGeometry : public AliGeometry { public: AliPHOSGeometry() ; - - AliPHOSGeometry(const AliPHOSGeometry & geom) : AliGeometry(geom) { - Fatal("cpy ctor", "not implemented") ; - } + AliPHOSGeometry(const AliPHOSGeometry & geom) ; virtual ~AliPHOSGeometry(void) ; static AliPHOSGeometry * GetInstance(const Text_t* name, const Text_t* title="") ; @@ -43,8 +40,10 @@ public: virtual void GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) const ; virtual Bool_t Impact(const TParticle * particle) const ; - AliPHOSGeometry & operator = (const AliPHOSGeometry & /*rvalue*/) const { - Fatal("operator =", "nt implemented") ; return *(GetInstance()) ; } + AliPHOSGeometry & operator = (const AliPHOSGeometry & /*rvalue*/) { + Fatal("operator =", "not implemented") ; + return *this ; + } // General @@ -149,10 +148,7 @@ public: protected: - AliPHOSGeometry(const Text_t* name, const Text_t* title="") : AliGeometry(name, title) { - // ctor only for internal usage (singleton) - Init() ; - } + AliPHOSGeometry(const Text_t* name, const Text_t* title="") ; private: Int_t fNModules ; // Number of modules constituing PHOS diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx index f7fa8e080f8..b7cfb343425 100644 --- a/PHOS/AliPHOSGetter.cxx +++ b/PHOS/AliPHOSGetter.cxx @@ -78,8 +78,35 @@ Int_t AliPHOSGetter::fgDebug = 0; // TFile * AliPHOSGetter::fgFile = 0 ; +AliPHOSGetter::AliPHOSGetter() : + fBTE(0), + fLoadingStatus(), + fNPrimaries(0), + fPrimaries(0), + fESDFile(0), + fESDFileName(), + fESD(0), + fESDTree(0), + fRawDigits(kFALSE), + fcdb(0) +{ + // ctor: this is a singleton, the ctor should never be called but cint needs it as public + Fatal("ctor", "AliPHOSGetter is a singleton default ctor not callable") ; +} + + //____________________________________________________________________________ -AliPHOSGetter::AliPHOSGetter(const char* headerFile, const char* version, Option_t * openingOption) +AliPHOSGetter::AliPHOSGetter(const char* headerFile, const char* version, Option_t * openingOption) : + fBTE(0), + fLoadingStatus(), + fNPrimaries(0), + fPrimaries(0), + fESDFile(0), + fESDFileName(), + fESD(0), + fESDTree(0), + fRawDigits(kFALSE), + fcdb(0) { // ctor only called by Instance() @@ -117,6 +144,40 @@ AliPHOSGetter::AliPHOSGetter(const char* headerFile, const char* version, Option } +AliPHOSGetter::AliPHOSGetter(const AliPHOSGetter & obj) : + TObject(obj), + fBTE(0), + fLoadingStatus(), + fNPrimaries(0), + fPrimaries(0), + fESDFile(0), + fESDFileName(), + fESD(0), + fESDTree(0), + fRawDigits(kFALSE), + fcdb(0) +{ + // cpy ctor requested by Coding Convention + Fatal("cpy ctor", "not implemented") ; +} + +//____________________________________________________________________________ +AliPHOSGetter::AliPHOSGetter(Int_t /*i*/) : + fBTE(0), + fLoadingStatus(), + fNPrimaries(0), + fPrimaries(0), + fESDFile(0), + fESDFileName(), + fESD(0), + fESDTree(0), + fRawDigits(kFALSE), + fcdb(0) +{ + // special constructor for onflight +} + + //____________________________________________________________________________ AliPHOSGetter::~AliPHOSGetter() { diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h index 865b2972327..030b7cb79ba 100644 --- a/PHOS/AliPHOSGetter.h +++ b/PHOS/AliPHOSGetter.h @@ -50,16 +50,11 @@ class AliRawReader ; class AliPHOSGetter : public TObject { public: - AliPHOSGetter(){ // ctor: this is a singleton, the ctor should never be called but cint needs it as public - Fatal("ctor", "AliPHOSGetter is a singleton default ctor not callable") ; - } + // ctor: this is a singleton, the ctor should never be called but cint needs it as public + AliPHOSGetter() ; public: - AliPHOSGetter(const AliPHOSGetter & obj) : TObject(obj) { - // cpy ctor requested by Coding Convention - Fatal("cpy ctor", "not implemented") ; - } - + AliPHOSGetter(const AliPHOSGetter & obj) ; AliPHOSGetter & operator = (const AliPHOSGetter & ) { // assignement operator requested by coding convention, but not needed Fatal("operator =", "not implemented") ; @@ -208,9 +203,8 @@ public: virtual AliESD * ESD() const { return fESD ; } protected : - AliPHOSGetter(Int_t /*i*/){ // special constructor for onflight - - } + AliPHOSGetter(Int_t /*i*/) ; + protected: static AliPHOSGetter * fgObjGetter; // pointer to the unique instance of the singleton diff --git a/PHOS/AliPHOSGetterLight.cxx b/PHOS/AliPHOSGetterLight.cxx index a37dd376cd7..e9bf8989d4e 100644 --- a/PHOS/AliPHOSGetterLight.cxx +++ b/PHOS/AliPHOSGetterLight.cxx @@ -37,46 +37,59 @@ ClassImp(AliPHOSGetterLight) //____________________________________________________________________________ - AliPHOSGetterLight::AliPHOSGetterLight():AliPHOSGetter(0) +AliPHOSGetterLight::AliPHOSGetterLight() : + AliPHOSGetter(0), + fDigits(0), + fEmcRecPoints(0), + fCpvRecPoints(0), + fTS(0), + fRP(0), + fClusterizer(0), + fTSM(0), + fPID(0) { // ctor - fDigits = 0 ; - fEmcRecPoints = 0 ; - fCpvRecPoints = 0 ; - fTS = 0; - fRP = 0; - // fcdb = 0 ; - fClusterizer = 0 ; - fTSM = 0 ; - fPID = 0 ; SetRawDigits(kTRUE) ; // fRawDigits =kTRUE; fgObjGetter = this ; } //____________________________________________________________________________ -AliPHOSGetterLight::AliPHOSGetterLight(const char* /*alirunFileName*/, const char* /*version*/, Option_t * /*openingOption*/):AliPHOSGetter(0) +AliPHOSGetterLight::AliPHOSGetterLight(const char* /*alirunFileName*/, const char* /*version*/, Option_t * /*openingOption*/) : + AliPHOSGetter(0), + fDigits(new TClonesArray("AliPHOSDigit",256)), + fEmcRecPoints(new TObjArray(50)), + fCpvRecPoints(new TObjArray(0)), + fTS(new TClonesArray("AliPHOSTrackSegment",50)), + fRP(new TClonesArray("AliPHOSRecParticle",50)), + fClusterizer (0), + fTSM(0), + fPID(0) { //Create containers of reconstructed objects for one event - fDigits = new TClonesArray("AliPHOSDigit",256) ; - fEmcRecPoints = new TObjArray(50) ; fEmcRecPoints->SetOwner(kTRUE) ; - fCpvRecPoints= new TObjArray(0); fCpvRecPoints->SetOwner(kTRUE) ; - fTS = new TClonesArray("AliPHOSTrackSegment",50) ; - fRP = new TClonesArray("AliPHOSRecParticle",50) ; - - //Objects which are not owned by Getter - // fcdb = 0 ; - - fClusterizer = 0; - fTSM = 0 ; - fPID = 0 ; SetRawDigits(kTRUE) ; // fRawDigits = kTRUE ; fgObjGetter = this ; } +//____________________________________________________________________________ +AliPHOSGetterLight::AliPHOSGetterLight(const AliPHOSGetterLight & obj) : + AliPHOSGetter(obj), + fDigits(0), + fEmcRecPoints(0), + fCpvRecPoints(0), + fTS(0), + fRP(0), + fClusterizer(0), + fTSM(0), + fPID(0) +{ + // cpy ctor requested by Coding Convention + Fatal("cpy ctor", "not implemented") ; +} + //____________________________________________________________________________ AliPHOSGetterLight::~AliPHOSGetterLight() { diff --git a/PHOS/AliPHOSGetterLight.h b/PHOS/AliPHOSGetterLight.h index 528be5b8454..dce0b2fede2 100644 --- a/PHOS/AliPHOSGetterLight.h +++ b/PHOS/AliPHOSGetterLight.h @@ -29,10 +29,7 @@ class AliPHOSGetterLight : public AliPHOSGetter { public: AliPHOSGetterLight() ; // ctor - AliPHOSGetterLight(const AliPHOSGetterLight & obj) : AliPHOSGetter(obj) { - // cpy ctor requested by Coding Convention - Fatal("cpy ctor", "not implemented") ; - } + AliPHOSGetterLight(const AliPHOSGetterLight & obj); AliPHOSGetterLight & operator = (const AliPHOSGetterLight & ) { // assignement operator requested by coding convention, but not needed diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx index 1dc5edce934..690e79b06f7 100644 --- a/PHOS/AliPHOSLoader.cxx +++ b/PHOS/AliPHOSLoader.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.17 2006/08/25 16:00:53 kharlov + * Compliance with Effective C++AliPHOSHit.cxx + * * Revision 1.16 2006/08/01 12:15:04 cvetan * Adding a constructor from TFolder. Needed by AliReconstruction plugin scheme * @@ -85,21 +88,24 @@ const TString AliPHOSLoader::fgkCpvRecPointsBranchName("PHOSCpvRP");//Name for b const TString AliPHOSLoader::fgkTrackSegmentsBranchName("PHOSTS");//Name for branch with TrackSegments const TString AliPHOSLoader::fgkRecParticlesBranchName("PHOSRP");//Name for branch with Reconstructed Particles //____________________________________________________________________________ -AliPHOSLoader::AliPHOSLoader() - { - fDebug = 0; - } +AliPHOSLoader::AliPHOSLoader() : fBranchTitle(), fcdb(0), fDebug(0) +{ + //def ctor +} //____________________________________________________________________________ -AliPHOSLoader::AliPHOSLoader(const Char_t *detname,const Char_t *eventfoldername): - AliLoader(detname,eventfoldername) +AliPHOSLoader::AliPHOSLoader(const Char_t *detname,const Char_t *eventfoldername) : + AliLoader(detname, eventfoldername), + fBranchTitle(), fcdb(0), fDebug(0) { - fDebug=0; + //ctor } //____________________________________________________________________________ AliPHOSLoader::AliPHOSLoader(const Char_t *detname,TFolder *topfolder): - AliLoader(detname,topfolder) + AliLoader(detname,topfolder), + fBranchTitle(), fcdb(0), fDebug(0) + { - fDebug=0; + //ctor } //____________________________________________________________________________ AliPHOSLoader::AliPHOSLoader(const AliPHOSLoader & obj): diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx index 30b88aa4a4e..d259034baa4 100644 --- a/PHOS/AliPHOSRecPoint.cxx +++ b/PHOS/AliPHOSRecPoint.cxx @@ -40,23 +40,22 @@ ClassImp(AliPHOSRecPoint) //____________________________________________________________________________ AliPHOSRecPoint::AliPHOSRecPoint() - : AliRecPoint() + : AliRecPoint(), + fPHOSMod(0) { // ctor fMaxTrack = 0 ; - fPHOSMod = 0 ; - } //____________________________________________________________________________ -AliPHOSRecPoint::AliPHOSRecPoint(const char * opt) : AliRecPoint(opt) +AliPHOSRecPoint::AliPHOSRecPoint(const char * opt) + : AliRecPoint(opt), + fPHOSMod(0) { // ctor fMaxTrack = 200 ; - fPHOSMod = 0; - } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h index 765e02e78af..b3951a53bf6 100644 --- a/PHOS/AliPHOSRecPoint.h +++ b/PHOS/AliPHOSRecPoint.h @@ -28,8 +28,6 @@ class AliPHOSRecPoint : public AliRecPoint { AliPHOSRecPoint() ; // ctor AliPHOSRecPoint(const char * opt) ; // ctor - AliPHOSRecPoint(const AliPHOSRecPoint & rp) : AliRecPoint(rp) { - Fatal("Cpy ctor", "not implemented") ; } virtual ~AliPHOSRecPoint(){ // dtor @@ -59,9 +57,6 @@ class AliPHOSRecPoint : public AliRecPoint { // Print prototype } - AliPHOSRecPoint & operator = (const AliPHOSRecPoint & ) { - Fatal("operator = ", "not implemented") ; return *this ; - } protected: Int_t fPHOSMod ; // PHOS Module number in which the RecPoint is found diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx index 2babacf7d0b..bcffe972ec5 100644 --- a/PHOS/AliPHOSSDigitizer.cxx +++ b/PHOS/AliPHOSSDigitizer.cxx @@ -19,6 +19,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.49 2006/05/10 06:42:53 kharlov + * Remove redundant loop over primaries + * * Revision 1.48 2006/04/22 10:30:17 hristov * Add fEnergy to AliPHOSDigit and operate with EMC amplitude in energy units (Yu.Kharlov) * @@ -74,51 +77,45 @@ #include "AliPHOSGetter.h" #include "AliPHOSHit.h" #include "AliPHOSSDigitizer.h" - //#include "AliMemoryWatcher.h" +//#include "AliMemoryWatcher.h" ClassImp(AliPHOSSDigitizer) //____________________________________________________________________________ - AliPHOSSDigitizer::AliPHOSSDigitizer():TTask("","") +AliPHOSSDigitizer::AliPHOSSDigitizer() : + TTask("",""), + fA(0.f), fB(0.f), + fPrimThreshold(0.f), + fDefaultInit(kTRUE), + fEventFolderName(""), + fInit(kFALSE), + fSDigitsInRun(0), + fFirstEvent(0), + fLastEvent(0) { // ctor - fFirstEvent = fLastEvent = 0 ; - fDefaultInit = kTRUE ; } //____________________________________________________________________________ AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, const char * eventFolderName): TTask("PHOS"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName), - fEventFolderName(eventFolderName) + fA(0.f), fB(0.f), + fPrimThreshold(0.f), + fDefaultInit(kFALSE), + fEventFolderName(eventFolderName), + fInit(kFALSE), + fSDigitsInRun(0), + fFirstEvent(0), + fLastEvent(0) { - // ctor - fFirstEvent = fLastEvent = 0 ; // runs one event by defaut InitParameters() ; Init(); fDefaultInit = kFALSE ; } -//____________________________________________________________________________ -AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer & sd) - : TTask(sd) -{ - //cpy ctor - - fFirstEvent = sd.fFirstEvent ; - fLastEvent = sd.fLastEvent ; - fA = sd.fA ; - fB = sd.fB ; - fPrimThreshold = sd.fPrimThreshold ; - fSDigitsInRun = sd.fSDigitsInRun ; - SetName(sd.GetName()) ; - SetTitle(sd.GetTitle()) ; - fEventFolderName = sd.fEventFolderName; -} - - //____________________________________________________________________________ AliPHOSSDigitizer::~AliPHOSSDigitizer() { //dtor diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h index fbc297e7a34..52e748878b6 100644 --- a/PHOS/AliPHOSSDigitizer.h +++ b/PHOS/AliPHOSSDigitizer.h @@ -9,6 +9,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.25 2005/11/30 18:56:26 schutz + * Small corrections to fix compilation errors + * * Revision 1.24 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -37,7 +40,7 @@ class AliPHOSSDigitizer: public TTask { public: AliPHOSSDigitizer() ; // ctor AliPHOSSDigitizer(const char * alirunFileName, const char * eventFolderName = AliConfig::GetDefaultEventFolderName()) ; - AliPHOSSDigitizer(const AliPHOSSDigitizer & sd) ; // cpy ctor + virtual ~AliPHOSSDigitizer(); // dtor Float_t Calibrate(Int_t amp)const {return (amp - fA)/fB ; } @@ -49,7 +52,6 @@ public: void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } Bool_t operator == (const AliPHOSSDigitizer & sd) const ; - AliPHOSSDigitizer & operator = (const AliPHOSSDigitizer & /*sd*/) {return *this ;} private: void Init() ; diff --git a/PHOS/AliPHOSSupportGeometry.cxx b/PHOS/AliPHOSSupportGeometry.cxx index ee6bcaed498..656164e498a 100644 --- a/PHOS/AliPHOSSupportGeometry.cxx +++ b/PHOS/AliPHOSSupportGeometry.cxx @@ -29,12 +29,15 @@ ClassImp(AliPHOSSupportGeometry) //____________________________________________________________________________ -AliPHOSSupportGeometry::AliPHOSSupportGeometry() +AliPHOSSupportGeometry::AliPHOSSupportGeometry() : + fRailLength(1200.0), + fDistanceBetwRails(420.0), + fRailsDistanceFromIP(590.), + fCradleWallThickness(2.0) { // Initializes the PHOS support parameters - fRailLength = 1200.0; fRailPart1[0] = 28.0; fRailPart1[1] = 3.0; @@ -52,15 +55,10 @@ AliPHOSSupportGeometry::AliPHOSSupportGeometry() fRailOuterSize[1] = fRailPart1[1]*2 + fRailPart2[1] + fRailPart3[1]; fRailOuterSize[2] = fRailLength; - fDistanceBetwRails = 420.0; - fRailsDistanceFromIP = 590.; - fRailRoadSize[0] = fDistanceBetwRails + fRailOuterSize[0]; fRailRoadSize[1] = fRailOuterSize[1]; fRailRoadSize[2] = fRailOuterSize[2]; - fCradleWallThickness = 2.0; - fCradleWall[0] = 0.; // Inner radius, to be defined from PHOS parameters fCradleWall[1] = 65.; // Diff. between outer and inner radii fCradleWall[2] = 18.; @@ -70,6 +68,4 @@ AliPHOSSupportGeometry::AliPHOSSupportGeometry() fCradleWheel[0] = 30.0; fCradleWheel[1] = 80.0; fCradleWheel[2] = 30.0; - } -//____________________________________________________________________________ diff --git a/PHOS/AliPHOSSupportGeometry.h b/PHOS/AliPHOSSupportGeometry.h index 714cdd13e30..67e6623e6b1 100644 --- a/PHOS/AliPHOSSupportGeometry.h +++ b/PHOS/AliPHOSSupportGeometry.h @@ -23,12 +23,8 @@ class AliPHOSSupportGeometry : public TObject { public: AliPHOSSupportGeometry(); - AliPHOSSupportGeometry(const AliPHOSSupportGeometry & geom) : TObject(geom) { - Fatal("cpy ctor", "not implemented") ; } virtual ~AliPHOSSupportGeometry(void) {} - AliPHOSSupportGeometry & operator = (const AliPHOSSupportGeometry & /*rvalue*/) { - Fatal("operator =", "not implemented") ; return *this ; } Float_t GetRailOuterSize(Int_t index) const { return fRailOuterSize[index]; } Float_t GetRailPart1 (Int_t index) const { return fRailPart1[index]; } Float_t GetRailPart2 (Int_t index) const { return fRailPart2[index]; } diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx index fa359cd0821..1119288fdce 100644 --- a/PHOS/AliPHOSTrackSegment.cxx +++ b/PHOS/AliPHOSTrackSegment.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.29 2005/05/28 14:19:05 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -39,9 +42,23 @@ ClassImp(AliPHOSTrackSegment) +//____________________________________________________________________________ +AliPHOSTrackSegment::AliPHOSTrackSegment() + : fEmcRecPoint(0), + fIndexInList(0), + fCpvRecPoint(0), + fTrack(0) +{ + //def ctor +} + //____________________________________________________________________________ AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , AliPHOSRecPoint * cpvrp1) + : fEmcRecPoint(0), + fIndexInList(0), + fCpvRecPoint(0), + fTrack(0) { // ctor @@ -64,6 +81,10 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , AliPHOSRecPoint * cpvrp1, Int_t track) + : fEmcRecPoint(0), + fIndexInList(0), + fCpvRecPoint(0), + fTrack(0) { // ctor @@ -84,7 +105,11 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , //____________________________________________________________________________ AliPHOSTrackSegment::AliPHOSTrackSegment( const AliPHOSTrackSegment & ts) - : TObject(ts) + : TObject(ts), + fEmcRecPoint(0), + fIndexInList(0), + fCpvRecPoint(0), + fTrack(0) { // Copy ctor diff --git a/PHOS/AliPHOSTrackSegment.h b/PHOS/AliPHOSTrackSegment.h index f88e0d44f9a..f3ca43e320d 100644 --- a/PHOS/AliPHOSTrackSegment.h +++ b/PHOS/AliPHOSTrackSegment.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.22 2005/05/28 14:19:05 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -34,7 +37,7 @@ class AliPHOSTrackSegment : public TObject { public: - AliPHOSTrackSegment() {} + AliPHOSTrackSegment() ; AliPHOSTrackSegment(AliPHOSEmcRecPoint * EmcRecPoint , AliPHOSRecPoint * Cpv) ; AliPHOSTrackSegment(AliPHOSEmcRecPoint * EmcRecPoint , diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index 44ca8d40c09..203abda60f7 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.79 2006/04/25 12:41:15 hristov + * Moving non-persistent data to AliESDfriend (Yu.Belikov) + * * Revision 1.78 2005/11/18 13:04:51 hristov * Bug fix * @@ -85,26 +88,70 @@ ClassImp( AliPHOSTrackSegmentMakerv1) //____________________________________________________________________________ - AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1() : AliPHOSTrackSegmentMaker() +AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1() : + AliPHOSTrackSegmentMaker(), + fDefaultInit(kTRUE), + fWrite(kFALSE), + fNTrackSegments(0), + fRcpv(0.f), + fRtpc(0.f), + fLinkUpArray(0), + fEmcFirst(0), + fEmcLast(0), + fCpvFirst(0), + fCpvLast(0), + fModule(0), + fTrackSegmentsInRun(0) + { // default ctor (to be used mainly by Streamer) - InitParameters() ; - fDefaultInit = kTRUE ; } //____________________________________________________________________________ - AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1(const TString alirunFileName, const TString eventFolderName) - :AliPHOSTrackSegmentMaker(alirunFileName, eventFolderName) +AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1(const TString & alirunFileName, const TString & eventFolderName) : + AliPHOSTrackSegmentMaker(alirunFileName, eventFolderName), + fDefaultInit(kFALSE), + fWrite(kFALSE), + fNTrackSegments(0), + fRcpv(0.f), + fRtpc(0.f), + fLinkUpArray(0), + fEmcFirst(0), + fEmcLast(0), + fCpvFirst(0), + fCpvLast(0), + fModule(0), + fTrackSegmentsInRun(0) { // ctor - InitParameters() ; Init() ; - fDefaultInit = kFALSE ; fESD = 0; } + +AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) : + AliPHOSTrackSegmentMaker(tsm), + fDefaultInit(kFALSE), + fWrite(kFALSE), + fNTrackSegments(0), + fRcpv(0.f), + fRtpc(0.f), + fLinkUpArray(0), + fEmcFirst(0), + fEmcLast(0), + fCpvFirst(0), + fCpvLast(0), + fModule(0), + fTrackSegmentsInRun(0) +{ + // cpy ctor: no implementation yet + // requested by the Coding Convention + Fatal("cpy ctor", "not implemented") ; +} + + //____________________________________________________________________________ AliPHOSTrackSegmentMakerv1::~AliPHOSTrackSegmentMakerv1() { diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h index 1283c910508..197e6095cdf 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.h +++ b/PHOS/AliPHOSTrackSegmentMakerv1.h @@ -7,6 +7,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.47 2005/11/17 12:35:27 hristov + * Use references instead of objects. Avoid to create objects when they are not really needed + * * Revision 1.46 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -35,12 +38,9 @@ class AliPHOSTrackSegmentMakerv1 : public AliPHOSTrackSegmentMaker { public: AliPHOSTrackSegmentMakerv1() ; - AliPHOSTrackSegmentMakerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()); - AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) : AliPHOSTrackSegmentMaker(tsm) { - // cpy ctor: no implementation yet - // requested by the Coding Convention - Fatal("cpy ctor", "not implemented") ; - } + AliPHOSTrackSegmentMakerv1(const TString & alirunFileNameFile, const TString & eventFolderName = AliConfig::GetDefaultEventFolderName()); + AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm); + virtual ~ AliPHOSTrackSegmentMakerv1() ; // dtor // virtual char* GetRecPointsBranch (void)const{return (char*)fRecPointsBranchTitle.Data() ;} diff --git a/PHOS/AliPHOSTrigger.cxx b/PHOS/AliPHOSTrigger.cxx index 300799032be..435831d43eb 100644 --- a/PHOS/AliPHOSTrigger.cxx +++ b/PHOS/AliPHOSTrigger.cxx @@ -54,57 +54,59 @@ ClassImp(AliPHOSTrigger) //______________________________________________________________________ AliPHOSTrigger::AliPHOSTrigger() : AliTriggerDetector(), - f2x2MaxAmp(-1), f2x2CrystalPhi(-1), f2x2CrystalEta(-1), - f4x4MaxAmp(-1), f4x4CrystalPhi(-1), f4x4CrystalEta(-1), + f2x2MaxAmp(-1), f2x2CrystalPhi(-1), f2x2CrystalEta(-1), f2x2SM(0), + f4x4MaxAmp(-1), f4x4CrystalPhi(-1), f4x4CrystalEta(-1), f4x4SM(0), + fADCValuesHigh4x4(0), fADCValuesLow4x4(0), + fADCValuesHigh2x2(0), fADCValuesLow2x2(0), fDigitsList(0), fL0Threshold(50), fL1JetLowPtThreshold(200), fL1JetHighPtThreshold(500), fNTRU(8), fNTRUZ(2), fNTRUPhi(4), fSimulation(kTRUE) { //ctor - fADCValuesHigh4x4 = 0x0; //new Int_t[fTimeBins]; fADCValuesLow4x4 = 0x0; //new Int_t[fTimeBins]; fADCValuesHigh2x2 = 0x0; //new Int_t[fTimeBins]; fADCValuesLow2x2 = 0x0; //new Int_t[fTimeBins]; - fDigitsList = 0x0 ; - SetName("PHOS"); CreateInputs(); //Print("") ; } - - //____________________________________________________________________________ -AliPHOSTrigger::AliPHOSTrigger(const AliPHOSTrigger & trig) - : AliTriggerDetector(trig) +AliPHOSTrigger::AliPHOSTrigger(const AliPHOSTrigger & trig) : + AliTriggerDetector(trig), + f2x2MaxAmp(trig.f2x2MaxAmp), + f2x2CrystalPhi(trig.f2x2CrystalPhi), + f2x2CrystalEta(trig.f2x2CrystalEta), + f2x2SM(trig.f2x2SM), + f4x4MaxAmp(trig.f4x4MaxAmp), + f4x4CrystalPhi(trig.f4x4CrystalPhi), + f4x4CrystalEta(trig.f4x4CrystalEta), + f4x4SM(trig.f4x4SM), + fADCValuesHigh4x4(trig.fADCValuesHigh4x4), + fADCValuesLow4x4(trig.fADCValuesLow4x4), + fADCValuesHigh2x2(trig.fADCValuesHigh2x2), + fADCValuesLow2x2(trig.fADCValuesLow2x2), + fDigitsList(trig.fDigitsList), + fL0Threshold(trig.fL0Threshold), + fL1JetLowPtThreshold(trig.fL1JetLowPtThreshold), + fL1JetHighPtThreshold(trig.fL1JetHighPtThreshold), + fNTRU(trig.fNTRU), + fNTRUZ(trig.fNTRUZ), + fNTRUPhi(trig.fNTRUPhi), + fSimulation(trig.fSimulation) { - // cpy ctor - - f2x2MaxAmp = trig.f2x2MaxAmp ; - f4x4MaxAmp = trig.f4x4MaxAmp ; - f2x2CrystalPhi = trig.f2x2CrystalPhi ; - f4x4CrystalPhi = trig.f4x4CrystalPhi ; - f2x2CrystalEta = trig.f2x2CrystalEta ; - f4x4CrystalEta = trig.f4x4CrystalEta ; - fADCValuesHigh4x4 = trig.fADCValuesHigh4x4 ; - fADCValuesLow4x4 = trig.fADCValuesLow4x4 ; - fADCValuesHigh2x2 = trig.fADCValuesHigh2x2 ; - fADCValuesLow2x2 = trig.fADCValuesLow2x2 ; - fDigitsList = trig.fDigitsList ; - fL0Threshold = trig.fL0Threshold ; - fL1JetLowPtThreshold = trig.fL1JetLowPtThreshold ; - fL1JetHighPtThreshold = trig.fL1JetHighPtThreshold ; - fNTRU = trig.fNTRU ; - fNTRUZ = trig.fNTRUZ ; - fNTRUPhi = trig.fNTRUPhi ; - fSimulation = trig.fSimulation ; - } //_________________________________________________________________________ +AliPHOSTrigger & AliPHOSTrigger::operator = (const AliPHOSTrigger &) +{ + Fatal("operator =", "no implemented"); + return *this; +} + void AliPHOSTrigger::CreateInputs() { // inputs diff --git a/PHOS/AliPHOSTrigger.h b/PHOS/AliPHOSTrigger.h index a82e9fff66b..5f3a1482c2d 100644 --- a/PHOS/AliPHOSTrigger.h +++ b/PHOS/AliPHOSTrigger.h @@ -43,6 +43,8 @@ class AliPHOSTrigger : public AliTriggerDetector { AliPHOSTrigger() ; // ctor AliPHOSTrigger(const AliPHOSTrigger & trig) ; // cpy ctor virtual ~AliPHOSTrigger() {}; //virtual dtor + + virtual void CreateInputs(); //Define trigger inputs for Central Trigger Processor void Print(const Option_t * opt ="") const ; virtual void Trigger(); //Make PHOS trigger @@ -95,6 +97,8 @@ class AliPHOSTrigger : public AliTriggerDetector { private: + AliPHOSTrigger & operator = (const AliPHOSTrigger & trig) ;//cpy assignment + void FillTRU(const TClonesArray * digits, const AliPHOSGeometry * geom, TClonesArray * amptru, TClonesArray * timeRtru) const ; void MakeSlidingCell(const TClonesArray * amptrus, const TClonesArray * timeRtrus, Int_t mod, TMatrixD *ampmax2, TMatrixD *ampmax4, const AliPHOSGeometry *geom) ; -- 2.39.3