From 3f7dbdb7c4c8384d26a76f68dc71382659c1410d Mon Sep 17 00:00:00 2001 From: kharlov Date: Thu, 7 Sep 2006 18:31:08 +0000 Subject: [PATCH] Effective c++ corrections (T.Pocheptsov) --- PHOS/AliPHOSCalibData.cxx | 47 +++++++----- PHOS/AliPHOSCalibData.h | 3 + PHOS/AliPHOSCalibrManager.cxx | 29 ++++++-- PHOS/AliPHOSCalibrManager.h | 6 +- PHOS/AliPHOSCalibrationDB.cxx | 2 +- PHOS/AliPHOSCalibrator.cxx | 103 +++++++++++++++++--------- PHOS/AliPHOSCalibrator.h | 9 +-- PHOS/AliPHOSEvalRecPoint.cxx | 18 +++-- PHOS/AliPHOSFastRecParticle.cxx | 23 ++++-- PHOS/AliPHOSJet.cxx | 56 +++++++++----- PHOS/AliPHOSJet.h | 6 +- PHOS/AliPHOSJetFinder.cxx | 54 ++++++++++---- PHOS/AliPHOSJetFinder.h | 8 +- PHOS/AliPHOSLoader.cxx | 5 ++ PHOS/AliPHOSPIDv0.cxx | 103 ++++++++++++++++++-------- PHOS/AliPHOSPIDv0.h | 9 ++- PHOS/AliPHOSPIDv1.cxx | 91 ++++++++++++++++++++++- PHOS/AliPHOSRaw2Digits.cxx | 125 +++++++++++++++++--------------- PHOS/AliPHOSRawStream2004.cxx | 35 +++++++-- PHOS/AliPHOSRawStream2004.h | 6 ++ PHOS/AliPHOSRecCpvManager.cxx | 35 ++++----- PHOS/AliPHOSRecEmcManager.cxx | 35 ++++----- 22 files changed, 544 insertions(+), 264 deletions(-) diff --git a/PHOS/AliPHOSCalibData.cxx b/PHOS/AliPHOSCalibData.cxx index 8b7ba83b06a..275fdbbdf66 100644 --- a/PHOS/AliPHOSCalibData.cxx +++ b/PHOS/AliPHOSCalibData.cxx @@ -35,13 +35,14 @@ ClassImp(AliPHOSCalibData) //________________________________________________________________ AliPHOSCalibData::AliPHOSCalibData(): - TNamed(), fCalibDataEmc(0x0), fCalibDataCpv(0x0) + TNamed(), + fCalibDataEmc(0x0), + fCalibDataCpv(0x0), + fEmcDataPath("PHOS/Calib/EmcGainPedestals"), + fCpvDataPath("PHOS/Calib/CpvGainPedestals") { - // Default constructor - - fEmcDataPath="PHOS/Calib/EmcGainPedestals"; - fCpvDataPath="PHOS/Calib/CpvGainPedestals"; - + // Default constructor + AliCDBEntry* entryEmc = AliCDBManager::Instance()->Get(fEmcDataPath.Data()); if(entryEmc) fCalibDataEmc = (AliPHOSEmcCalibData*)entryEmc->GetObject(); @@ -55,13 +56,11 @@ ClassImp(AliPHOSCalibData) //________________________________________________________________ AliPHOSCalibData::AliPHOSCalibData(Int_t runNumber) : TNamed("phosCalib","PHOS Calibration Data Manager"), - fCalibDataEmc(0x0), fCalibDataCpv(0x0) + fCalibDataEmc(0x0), fCalibDataCpv(0x0), + fEmcDataPath("PHOS/Calib/EmcGainPedestals"), + fCpvDataPath("PHOS/Calib/CpvGainPedestals") { // Constructor - - fEmcDataPath="PHOS/Calib/EmcGainPedestals"; - fCpvDataPath="PHOS/Calib/CpvGainPedestals"; - AliCDBEntry* entryEmc = AliCDBManager::Instance()->Get(fEmcDataPath.Data(),runNumber); if(entryEmc) fCalibDataEmc = (AliPHOSEmcCalibData*)entryEmc->GetObject(); @@ -74,15 +73,13 @@ AliPHOSCalibData::AliPHOSCalibData(Int_t runNumber) : //________________________________________________________________ AliPHOSCalibData::AliPHOSCalibData(AliPHOSCalibData & phosCDB) : - TNamed(phosCDB) + TNamed(phosCDB), + fCalibDataEmc(phosCDB.fCalibDataEmc), + fCalibDataCpv(phosCDB.fCalibDataCpv), + fEmcDataPath(phosCDB.fEmcDataPath), + fCpvDataPath(phosCDB.fCpvDataPath) { // Copy constructor - - fCalibDataEmc = phosCDB.fCalibDataEmc; - fCalibDataCpv = phosCDB.fCalibDataCpv; - - fEmcDataPath = phosCDB.fEmcDataPath; - fCpvDataPath = phosCDB.fCpvDataPath; } //________________________________________________________________ AliPHOSCalibData::~AliPHOSCalibData() @@ -91,6 +88,20 @@ AliPHOSCalibData::~AliPHOSCalibData() } +AliPHOSCalibData & AliPHOSCalibData::operator = (const AliPHOSCalibData & rhs) +{ + //Copy-assignment. Does not delete anything (see destructor) + //compiler generated is ok, but ... because -Weffc++ and pointer + //members we have to define it explicitly. + TNamed::operator=(rhs); + fCalibDataEmc = rhs.fCalibDataEmc; + fCalibDataCpv = rhs.fCalibDataCpv; + fEmcDataPath = rhs.fEmcDataPath; + fCpvDataPath = rhs.fCpvDataPath; + + return *this; +} + //________________________________________________________________ void AliPHOSCalibData::Reset() { diff --git a/PHOS/AliPHOSCalibData.h b/PHOS/AliPHOSCalibData.h index bf7173edc19..a4118da3d29 100644 --- a/PHOS/AliPHOSCalibData.h +++ b/PHOS/AliPHOSCalibData.h @@ -24,6 +24,9 @@ class AliPHOSCalibData: public TNamed { AliPHOSCalibData(Int_t runNumber); AliPHOSCalibData(AliPHOSCalibData & phosCDB); virtual ~AliPHOSCalibData(); + + AliPHOSCalibData & operator = (const AliPHOSCalibData & rhs); + void Reset(); virtual void Print(Option_t *option = "") const; diff --git a/PHOS/AliPHOSCalibrManager.cxx b/PHOS/AliPHOSCalibrManager.cxx index a9be865e3b7..26eb3340398 100644 --- a/PHOS/AliPHOSCalibrManager.cxx +++ b/PHOS/AliPHOSCalibrManager.cxx @@ -54,26 +54,41 @@ ClassImp(AliPHOSCalibrManager) AliPHOSCalibrManager * AliPHOSCalibrManager::fgCaMa = 0 ; //____________________________________________________________________________ -AliPHOSCalibrManager::AliPHOSCalibrManager():TNamed() +AliPHOSCalibrManager::AliPHOSCalibrManager() : + fFileName(""), + fInputKind(0), + fctdb(0) { // default ctor: not to be used - fInputKind = 0 ; - fFileName= "" ; - fctdb = 0 ; AliFatal(Form("Should not be used")) ; } //____________________________________________________________________________ AliPHOSCalibrManager::AliPHOSCalibrManager(const char* filename,const char * kind ): - TNamed("AliPHOSCalibrManager",filename){ + TNamed("AliPHOSCalibrManager",filename), + fFileName(filename), + fInputKind(0), + fctdb(0) +{ if(strcmp(kind,"root")==0){ fInputKind = 0 ; } else{ fInputKind = 1 ; } - fFileName = filename; - fctdb = 0 ; } + +//____________________________________________________________________________ +AliPHOSCalibrManager::AliPHOSCalibrManager(const AliPHOSCalibrManager & manager) : + TNamed(manager), + fFileName(""), + fInputKind(0), + fctdb(0) +{ + // cpy ctor: no need + // requested by the Coding Convention + Fatal("cpy ctor", "not implemented") ; +} + //____________________________________________________________________________ AliPHOSCalibrManager::~AliPHOSCalibrManager() { diff --git a/PHOS/AliPHOSCalibrManager.h b/PHOS/AliPHOSCalibrManager.h index 51d207cba4a..ba5066095e5 100644 --- a/PHOS/AliPHOSCalibrManager.h +++ b/PHOS/AliPHOSCalibrManager.h @@ -24,11 +24,7 @@ class AliPHOSCalibrManager:public TNamed { public: AliPHOSCalibrManager() ; // ctor - AliPHOSCalibrManager(const AliPHOSCalibrManager & manager) : TNamed(manager) { - // cpy ctor: no need - // requested by the Coding Convention - Fatal("cpy ctor", "not implemented") ; - } + AliPHOSCalibrManager(const AliPHOSCalibrManager & manager); virtual ~AliPHOSCalibrManager() ; // dtor static AliPHOSCalibrManager * GetInstance() ; diff --git a/PHOS/AliPHOSCalibrationDB.cxx b/PHOS/AliPHOSCalibrationDB.cxx index 0557fcd126c..780db78022e 100644 --- a/PHOS/AliPHOSCalibrationDB.cxx +++ b/PHOS/AliPHOSCalibrationDB.cxx @@ -33,7 +33,7 @@ ClassImp(AliPHOSCalibrationDB) //____________________________________________________________________________ - AliPHOSCalibrationDB::AliPHOSCalibrationDB():TNamed() + AliPHOSCalibrationDB::AliPHOSCalibrationDB():fPedestals(), fGains() { } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSCalibrator.cxx b/PHOS/AliPHOSCalibrator.cxx index f6ad49fe9dd..950dc9a113d 100644 --- a/PHOS/AliPHOSCalibrator.cxx +++ b/PHOS/AliPHOSCalibrator.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.11 2006/01/13 16:59:39 kharlov + * Rename classes to read raw data 2004 + * * Revision 1.10 2005/05/28 14:19:04 schutz * Compilation warnings fixed by T.P. * @@ -82,48 +85,82 @@ ClassImp(AliPHOSCalibrator) //____________________________________________________________________________ - AliPHOSCalibrator::AliPHOSCalibrator():TTask("AliPHOSCalibrator","Default") +AliPHOSCalibrator::AliPHOSCalibrator() : + TTask("AliPHOSCalibrator","Default"), + fRunList(0), + fPedHistos(0), + fGainHistos(0), + fhPedestals(0), + fhPedestalsWid(0), + fhGains(0), + fhGainsWid(0), + fctdb(0), + fConTableDB("Beamtest2002"), + fConTableDBFile("ConTableDB.root"), + fBeamEnergy(0), + fGainAcceptCorr(0), + fAcceptCorr(0), + fGainMax(0), + fNGainBins(0), + fNch(0), + fNChan(0) { //Default constuctor for root. Normally should not be used - fRunList=0 ; - fBeamEnergy = 0. ; - fNch = 0 ; - fPedHistos = 0 ; - fGainHistos = 0 ; - fhPedestals = 0 ; - fhPedestalsWid = 0 ; - fctdb = 0 ; - fConTableDB = "Beamtest2002" ; - fConTableDBFile = "ConTableDB.root" ; } + //____________________________________________________________________________ AliPHOSCalibrator::AliPHOSCalibrator(const char* file, const char* title): - TTask("AliPHOSCalibrator",title) + TTask("AliPHOSCalibrator",title), + fRunList(new TList), + fPedHistos(0), + fGainHistos(0), + fhPedestals(0), + fhPedestalsWid(0), + fhGains(0), + fhGainsWid(0), + fctdb(0), + fConTableDB("Beamtest2002"), + fConTableDBFile("ConTableDB.root"), + fBeamEnergy(10.), + fGainAcceptCorr(5), + fAcceptCorr(10), + fGainMax(0.1), + fNGainBins(100), + fNch(0), + fNChan(100) + { //Constructor which should normally be used. //file: path/galice.root - header file //title: branch name of PHOS reconstruction (e.g. "Default") - - - fRunList = new TList() ; - fRunList->SetOwner() ; - fRunList->Add(new TObjString(file)) ; - fNch = 0 ; - fBeamEnergy = 10. ; - - fNChan = 100 ; - fGainMax = 0.1 ; - fNGainBins= 100 ; - fAcceptCorr = 10 ; //Maximal deviation from mean, considered as normal - - fGainAcceptCorr = 5 ; //Factor for gain deviation - fPedHistos = 0 ; - fGainHistos = 0 ; - fhPedestals = 0 ; - fhPedestalsWid = 0 ; - fctdb = 0 ; - fConTableDB = "Beamtest2002" ; - fConTableDBFile = "ConTableDB.root" ; + fRunList->SetOwner(); + fRunList->Add(new TObjString(file)); +} + +//____________________________________________________________________________ +AliPHOSCalibrator::AliPHOSCalibrator(const AliPHOSCalibrator & ctor) : + TTask(ctor), + fRunList(0), + fPedHistos(0), + fGainHistos(0), + fhPedestals(0), + fhPedestalsWid(0), + fhGains(0), + fhGainsWid(0), + fctdb(0), + fConTableDB("Beamtest2002"), + fConTableDBFile("ConTableDB.root"), + fBeamEnergy(0), + fGainAcceptCorr(0), + fAcceptCorr(0), + fGainMax(0), + fNGainBins(0), + fNch(0), + fNChan(0) +{ + // cpy ctor: no implementation yet + // requested by the Coding Convention + Fatal("cpy ctor", "not implemented") ; } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSCalibrator.h b/PHOS/AliPHOSCalibrator.h index dcc47c17e4c..26a9d31ddc5 100644 --- a/PHOS/AliPHOSCalibrator.h +++ b/PHOS/AliPHOSCalibrator.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.10 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * */ @@ -33,11 +36,7 @@ class AliPHOSCalibrator: public TTask{ public: AliPHOSCalibrator() ; // ctor AliPHOSCalibrator(const char* run, const char * title = "Default") ; - AliPHOSCalibrator(const AliPHOSCalibrator & ctor) : TTask(ctor) { - // cpy ctor: no implementation yet - // requested by the Coding Convention - Fatal("cpy ctor", "not implemented") ; - } + AliPHOSCalibrator(const AliPHOSCalibrator & ctor); virtual ~AliPHOSCalibrator() ; // dtor diff --git a/PHOS/AliPHOSEvalRecPoint.cxx b/PHOS/AliPHOSEvalRecPoint.cxx index 82ee8180f47..4477d8cc78c 100644 --- a/PHOS/AliPHOSEvalRecPoint.cxx +++ b/PHOS/AliPHOSEvalRecPoint.cxx @@ -47,16 +47,22 @@ ClassImp(AliPHOSEvalRecPoint) - AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(): fEventFolderName(AliConfig::GetDefaultEventFolderName()) +AliPHOSEvalRecPoint::AliPHOSEvalRecPoint() : + fIsEmc(kFALSE), + fIsCpv(kTRUE), + fParent(-333), + fChi2Dof(-111), + fEventFolderName(AliConfig::GetDefaultEventFolderName()) { // default ctor - fParent=-333; - fChi2Dof=-111; - fIsCpv = kTRUE; - fIsEmc = kFALSE; } -AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(Bool_t cpv, AliPHOSEvalRecPoint* parent) : AliPHOSCpvRecPoint() +AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(Bool_t cpv, AliPHOSEvalRecPoint* parent) : + fIsEmc(kFALSE), + fIsCpv(kFALSE), + fParent(-333), + fChi2Dof(-111), + fEventFolderName("") { // ctor fParent=-333; diff --git a/PHOS/AliPHOSFastRecParticle.cxx b/PHOS/AliPHOSFastRecParticle.cxx index 0c5c366bf0c..6c39d45aff8 100644 --- a/PHOS/AliPHOSFastRecParticle.cxx +++ b/PHOS/AliPHOSFastRecParticle.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.39 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -42,19 +45,22 @@ ClassImp(AliPHOSFastRecParticle) //____________________________________________________________________________ -AliPHOSFastRecParticle::AliPHOSFastRecParticle() : TParticle() +AliPHOSFastRecParticle::AliPHOSFastRecParticle() : + fIndexInList(0), + fTof(0.f), + fType(0) { // ctor - fType = 0 ; } //____________________________________________________________________________ AliPHOSFastRecParticle::AliPHOSFastRecParticle(const AliPHOSFastRecParticle & rp) - : TParticle(rp) + : TParticle(rp), + fIndexInList(rp.fIndexInList),//? + fTof(rp.fTof),//? + fType(rp.fType) { // copy ctor - - fType = rp.fType ; fPdgCode = rp.fPdgCode; fStatusCode = rp.fStatusCode; fMother[0] = rp.fMother[0]; @@ -77,13 +83,14 @@ AliPHOSFastRecParticle::AliPHOSFastRecParticle() : TParticle() } //____________________________________________________________________________ - AliPHOSFastRecParticle::AliPHOSFastRecParticle(const TParticle & pp) + AliPHOSFastRecParticle::AliPHOSFastRecParticle(const TParticle & pp) : + fIndexInList(0), + fTof(0.f), + fType(0) { // ctor from a TParticle (crummy?!) - TParticle & pnoconst = (TParticle &)(pp) ; AliPHOSFastRecParticle & p = (AliPHOSFastRecParticle &)(pnoconst) ; - fType = 0 ; fPdgCode = p.fPdgCode; fStatusCode = p.fStatusCode; fMother[0] = p.fMother[0]; diff --git a/PHOS/AliPHOSJet.cxx b/PHOS/AliPHOSJet.cxx index b5880776e8d..99c8cab882d 100644 --- a/PHOS/AliPHOSJet.cxx +++ b/PHOS/AliPHOSJet.cxx @@ -36,26 +36,48 @@ ClassImp(AliPHOSJet) //____________________________________________________________________________ -AliPHOSJet::AliPHOSJet():TObject() { +AliPHOSJet::AliPHOSJet(): + fNpart(0), + fList(0), + fConeRad(0), + fMaxConeMove(0), + fMinConeMove(0), + fSumEnergy(0), + fSumEta(0), + fSumPhi(0), + fEnergy(0), + fEta(0), + fPhi(0), + fLEnergy(0), + fLEta(0), + fLPhi(0) +{ //Initialize members - fNpart = 0 ; - fList = 0 ; - // fMode = 0 ; - fConeRad = 0 ; - fMaxConeMove = 0 ; - fMinConeMove = 0 ; - - fSumEnergy = 0 ; - fSumEta = 0 ; - fSumPhi = 0 ; - fEnergy = 0 ; - fEta = 0 ; - fPhi = 0 ; - fLEnergy = 0 ; - fLEta = 0 ; - fLPhi = 0 ; } +//____________________________________________________________________________ +AliPHOSJet::AliPHOSJet(const AliPHOSJet & jet) : + TObject(jet), + fNpart(0), + fList(0), + fConeRad(0), + fMaxConeMove(0), + fMinConeMove(0), + fSumEnergy(0), + fSumEta(0), + fSumPhi(0), + fEnergy(0), + fEta(0), + fPhi(0), + fLEnergy(0), + fLEta(0), + fLPhi(0) +{ + // copy ctor: no implementation yet + Fatal("cpy ctor", "not implemented") ; +} + + //____________________________________________________________________________ AliPHOSJet::~AliPHOSJet(){ //dtor diff --git a/PHOS/AliPHOSJet.h b/PHOS/AliPHOSJet.h index 42246dfa35d..dd178a30af6 100644 --- a/PHOS/AliPHOSJet.h +++ b/PHOS/AliPHOSJet.h @@ -24,10 +24,8 @@ class AliPHOSJet : public TObject { public: AliPHOSJet() ; // ctor - AliPHOSJet(const AliPHOSJet & jet) : TObject(jet){ - // copy ctor: no implementation yet - Fatal("cpy ctor", "not implemented") ; - } + AliPHOSJet(const AliPHOSJet & jet); + virtual ~AliPHOSJet() ; void AddDigit(Double_t e, Double_t eta, Double_t phi, Int_t index) ; diff --git a/PHOS/AliPHOSJetFinder.cxx b/PHOS/AliPHOSJetFinder.cxx index dd14f16514b..0297f6c643b 100644 --- a/PHOS/AliPHOSJetFinder.cxx +++ b/PHOS/AliPHOSJetFinder.cxx @@ -26,6 +26,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.8 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * */ // --- ROOT system --- @@ -48,25 +51,44 @@ ClassImp(AliPHOSJetFinder) //____________________________________________________________________________ - AliPHOSJetFinder::AliPHOSJetFinder():TNamed("AliPHOSJetFinder","") +AliPHOSJetFinder::AliPHOSJetFinder(): + TNamed("AliPHOSJetFinder",""), + fNJets(0), + fStatusCode(-999), + fMode(0), + fConeRad(1.), + fMaxConeMove(0.15), + fMinConeMove(0.05), + fEtSeed(4.), + fEtMin(5.), + fPrecBg(0.00035), + fSimGain(0.), + fSimPedestal(0.), + fParticles(0), + fJets(0) { //Initialize jet parameters - fNJets = 0 ; - fMode = 0 ; //No iterations - fStatusCode = -999 ; //no selection - - fConeRad = 1.; //Radius of jet value????????? - fMaxConeMove = 0.15 ; //value??????? - fMinConeMove = 0.05 ; //value??????? - fEtSeed = 4. ; //Energy of seed particle value?????????? - fEtMin = 5.; //minimal energy of jet value?????????? - fPrecBg = 0.00035 ; //value???????? - fSimGain = 0.; - fSimPedestal = 0.; +} - fParticles = 0; - fJets = 0 ; - +//____________________________________________________________________________ +AliPHOSJetFinder::AliPHOSJetFinder(const AliPHOSJetFinder & jet) : + TNamed(jet), + fNJets(0), + fStatusCode(-999), + fMode(0), + fConeRad(1.), + fMaxConeMove(0.15), + fMinConeMove(0.05), + fEtSeed(4.), + fEtMin(5.), + fPrecBg(0.00035), + fSimGain(0.), + fSimPedestal(0.), + fParticles(0), + fJets(0) +{ + // copy ctor: no implementation yet + Fatal("cpy ctor", "not implemented"); } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSJetFinder.h b/PHOS/AliPHOSJetFinder.h index bab15b18775..4d7e48d03aa 100644 --- a/PHOS/AliPHOSJetFinder.h +++ b/PHOS/AliPHOSJetFinder.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.6 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -29,10 +32,7 @@ class AliPHOSJetFinder : public TNamed { public: AliPHOSJetFinder() ; // ctor - AliPHOSJetFinder(const AliPHOSJetFinder & jet) : TNamed(jet) { - // copy ctor: no implementation yet - Fatal("cpy ctor", "not implemented") ; - } + AliPHOSJetFinder(const AliPHOSJetFinder & jet); virtual ~AliPHOSJetFinder() ; // dtor void FindJetsFromParticles(const TClonesArray * plist,TObjArray * jetslist) ; //Do the job diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx index 690e79b06f7..5e63c93acdb 100644 --- a/PHOS/AliPHOSLoader.cxx +++ b/PHOS/AliPHOSLoader.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.18 2006/08/28 10:01:56 kharlov + * Effective C++ warnings fixed (Timur Pocheptsov) + * * Revision 1.17 2006/08/25 16:00:53 kharlov * Compliance with Effective C++AliPHOSHit.cxx * @@ -650,6 +653,8 @@ Int_t AliPHOSLoader::ReadTracks() } TBranch * branch = treeT->GetBranch(fgkTrackSegmentsBranchName); +// AliInfo(Form("Branch named %s is opened: 0x%z", +// fgkTrackSegmentsBranchName.Data(),branch)); if (branch == 0) {//easy, maybe just a new tree AliError(Form("Cannot find branch named %s", diff --git a/PHOS/AliPHOSPIDv0.cxx b/PHOS/AliPHOSPIDv0.cxx index 2516937dbeb..f7957bfc18c 100644 --- a/PHOS/AliPHOSPIDv0.cxx +++ b/PHOS/AliPHOSPIDv0.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.13 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -84,48 +87,90 @@ ClassImp( AliPHOSPIDv0) //____________________________________________________________________________ -AliPHOSPIDv0::AliPHOSPIDv0():AliPHOSPID() +AliPHOSPIDv0::AliPHOSPIDv0(): + fTrackSegmentsTitle(""), + fRecPointsTitle(""), + fRecParticlesTitle(""), + fIDOptions("dis time"), + fNEvent(0), + fClusterizer(0), + fTSMaker(0), + fFormula(0), + fDispersion(0.f), + fCpvEmcDistance(0.f), + fTimeGate(2.e-9f), + fRecParticlesInRun(0) { // default ctor - fFormula = 0 ; - fDispersion = 0. ; - fCpvEmcDistance = 0 ; - fTimeGate = 2.e-9 ; - fEventFolderName = "" ; - fTrackSegmentsTitle= "" ; - fRecPointsTitle = "" ; - fRecParticlesTitle = "" ; - fIDOptions = "dis time" ; - fRecParticlesInRun = 0 ; - fClusterizer = 0; - fTSMaker = 0; + fEventFolderName = ""; } //____________________________________________________________________________ -AliPHOSPIDv0::AliPHOSPIDv0(const char * evFolderName,const char * name) : AliPHOSPID(evFolderName, name) +AliPHOSPIDv0::AliPHOSPIDv0(const char * evFolderName,const char * name) : + AliPHOSPID(evFolderName, name), + fTrackSegmentsTitle(GetName()), + fRecPointsTitle(GetName()), + fRecParticlesTitle(GetName()), + fIDOptions("dis time"), + fNEvent(0), + fClusterizer(0), + fTSMaker(0), + fFormula(new TFormula("LambdaCuts","(x>1)*(x<2.5)*(y>0)*(y1)*(x<2.5)*(y>0)*(yGetName(), "new" )), + fDigitsFile(new TFile(r2d.fDigitsFile->GetName(), "new" )), + fBeamEnergy(r2d.fBeamEnergy), + fMaxPerFile(r2d.fMaxPerFile), + fEvent(r2d.fEvent), + fStatus(r2d.fStatus), + fInName(r2d.fInName), + fDebug(kFALSE), + fIsInitialized(kFALSE), + fMK1(r2d.fMK1), + fMK2(r2d.fMK2), + fMK3(r2d.fMK3), + fMK4(r2d.fMK4), + fCKW(r2d.fCKW) { - // cpy ctor - fInName=r2d.fInName ; - - fMK1 = r2d.fMK1 ; - fMK2 = r2d.fMK2 ; - fMK3 = r2d.fMK3 ; - fMK4 = r2d.fMK4 ; - fCKW = r2d.fCKW ; - fDebug = kFALSE; // Debug flag - fIsInitialized = kFALSE ; + // cpy ctor. wrong. because dtor can delete fDigits twice (or n times you copy AliPHOSRaw2Digits) + //because fHeaderFile and fDigitsFile will recreate existing files etc. fTarget[0] = r2d.fTarget[0] ; fTarget[1] = r2d.fTarget[1] ; fTarget[2] = r2d.fTarget[2] ; - fDigits = r2d.fDigits ; - fPHOSHeader = r2d.fPHOSHeader ; - fHeaderFile = new TFile( (r2d.fHeaderFile)->GetName(), "new" ) ; - fDigitsFile = new TFile( (r2d.fDigitsFile)->GetName(), "new" ) ; - fMaxPerFile = r2d.fMaxPerFile ; - fEvent = r2d.fEvent ; - fctdb = new AliPHOSConTableDB( *(r2d.fctdb) ) ; } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSRawStream2004.cxx b/PHOS/AliPHOSRawStream2004.cxx index d4b06815d08..e90512ea4cd 100644 --- a/PHOS/AliPHOSRawStream2004.cxx +++ b/PHOS/AliPHOSRawStream2004.cxx @@ -32,8 +32,6 @@ #include "TClonesArray.h" #include "TClass.h" - - #include "AliPHOSRawStream2004.h" #include "AliRawReader.h" #include "AliRawEventHeaderBase.h" @@ -45,11 +43,38 @@ ClassImp(AliPHOSRawStream2004) //_____________________________________________________________________________ -AliPHOSRawStream2004::AliPHOSRawStream2004(AliRawReader* rawReader) : TObject() +AliPHOSRawStream2004::AliPHOSRawStream2004(AliRawReader* rawReader) : + fRawReader(rawReader), + fData(0), + fctdb(0), + fTrig(0) +{ + //Ctor +} + +//_____________________________________________________________________________ +AliPHOSRawStream2004::AliPHOSRawStream2004(const AliPHOSRawStream2004 & rhs) : + TObject(rhs), + fRawReader(rhs.fRawReader), + fData(rhs.fData), + fctdb(rhs.fctdb), + fTrig(rhs.fTrig) { - fRawReader = rawReader ; - fctdb = 0 ; + //Copy ctor } + +//_____________________________________________________________________________ +AliPHOSRawStream2004 & AliPHOSRawStream2004::operator = (const AliPHOSRawStream2004 &rhs) +{ + TObject::operator = (rhs); + fRawReader = rhs.fRawReader; + fData = rhs.fData; + fctdb = rhs.fctdb; + fTrig = rhs.fTrig; + + return *this; +} + //_____________________________________________________________________________ Bool_t AliPHOSRawStream2004::ReadDigits(TClonesArray * digits){ diff --git a/PHOS/AliPHOSRawStream2004.h b/PHOS/AliPHOSRawStream2004.h index 7cfa60ba480..c45c4918a37 100644 --- a/PHOS/AliPHOSRawStream2004.h +++ b/PHOS/AliPHOSRawStream2004.h @@ -26,6 +26,12 @@ public : AliPHOSRawStream2004(AliRawReader* rawReader); + //Class does not own/free any resources, compiler generated version + //are OK, but to supress -Weffc++ we define them explicitly. + AliPHOSRawStream2004(const AliPHOSRawStream2004 & rhs); + AliPHOSRawStream2004 & operator = (const AliPHOSRawStream2004 & rhs); + + Bool_t ReadDigits(TClonesArray * digits) ; diff --git a/PHOS/AliPHOSRecCpvManager.cxx b/PHOS/AliPHOSRecCpvManager.cxx index fba2e8ae3c4..4947b411894 100644 --- a/PHOS/AliPHOSRecCpvManager.cxx +++ b/PHOS/AliPHOSRecCpvManager.cxx @@ -32,30 +32,21 @@ ClassImp(AliPHOSRecCpvManager) //____________________________________________________________________________ - - AliPHOSRecCpvManager::AliPHOSRecCpvManager() +AliPHOSRecCpvManager::AliPHOSRecCpvManager() : + fOneGamChisqCut(3.), + fOneGamInitialStep(0.00005), + fOneGamChisqMin(1.), + fOneGamStepMin(0.0005), + fOneGamNumOfIterations(50), + fTwoGamInitialStep(0.00005), + fTwoGamChisqMin(1.), + fTwoGamEmin(0.1), + fTwoGamStepMin(0.00005), + fTwoGamNumOfIterations(50), + fThr0(0.), + fSqdCut(0.) { // Put a comment here - - fOneGamChisqCut = 3.; // If Chi2/dof > fOneGamChisqCut, split point. - - fOneGamInitialStep = 0.00005; - fOneGamChisqMin = 1.; - fOneGamStepMin = 0.0005; - fOneGamNumOfIterations = 50; - - fTwoGamInitialStep = 0.00005; - fTwoGamChisqMin = 1.; - fTwoGamEmin = 0.1; - fTwoGamStepMin = 0.00005; - fTwoGamNumOfIterations = 50; - -// fThr0 = 0.0285; // Min. energy of rec. point. If E