From 9389f9a4e9dab8831aa7f447656724d700262577 Mon Sep 17 00:00:00 2001 From: marian Date: Wed, 19 Mar 2008 15:39:29 +0000 Subject: [PATCH] Removing eff C++ warnings (Marian) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit AliTPCAltroEmulator.h AliTPCAltroEmulator.cxx - ClassDef ClassImp AliTPCCalROC.cxx - Comparison - signed unsigned AliTPCcalibDB - initialization of TObject in cosntructor AliTPCLaserTracks - return statement AliTPCCalibViewerGUI - commented unused parameters in private constructor AliTPCGenDBConf - commented unused parameters in private constructor AliTPCCalibTCF - parentheses around assignment AliTPCTransform - removing unused variable ‘pad’ AliTPCcalibTracksCuts - initialization in the meber list, Print method constant --- TPC/AliTPCAltroEmulator.cxx | 3 ++ TPC/AliTPCAltroEmulator.h | 1 + TPC/AliTPCCalROC.cxx | 2 +- TPC/AliTPCCalibTCF.cxx | 2 +- TPC/AliTPCGenDBConf.cxx | 2 +- TPC/AliTPCLaserTracks.cxx | 3 +- TPC/AliTPCTransform.cxx | 2 +- TPC/AliTPCcalibDB.cxx | 63 +++++++++++++++------------- TPC/AliTPCcalibTracksCuts.cxx | 77 ++++++++++++++++++++--------------- TPC/AliTPCcalibTracksCuts.h | 8 ++-- 10 files changed, 92 insertions(+), 71 deletions(-) diff --git a/TPC/AliTPCAltroEmulator.cxx b/TPC/AliTPCAltroEmulator.cxx index 969b8548581..7b920304bba 100644 --- a/TPC/AliTPCAltroEmulator.cxx +++ b/TPC/AliTPCAltroEmulator.cxx @@ -39,6 +39,9 @@ * @param Channel an short* Pointer to a 1d short Array with the input Data */ + +ClassImp(AliTPCAltroEmulator) + AliTPCAltroEmulator::AliTPCAltroEmulator(int timebins, short* Channel) : TNamed(), ftimebins(timebins), diff --git a/TPC/AliTPCAltroEmulator.h b/TPC/AliTPCAltroEmulator.h index a0d8acbb4e9..08435a9727e 100644 --- a/TPC/AliTPCAltroEmulator.h +++ b/TPC/AliTPCAltroEmulator.h @@ -130,5 +130,6 @@ public: int Multiply36(int P, int N); long long Mask(long long in, int left, int right); long long Maskandshift(long long in, int left, int right); + ClassDef(AliTPCAltroEmulator,0) }; #endif diff --git a/TPC/AliTPCCalROC.cxx b/TPC/AliTPCCalROC.cxx index e7b536737ab..3e53c9563b1 100644 --- a/TPC/AliTPCCalROC.cxx +++ b/TPC/AliTPCCalROC.cxx @@ -681,7 +681,7 @@ void AliTPCCalROC::GetNeighbourhood(TArrayI* &rowArray, TArrayI* &padArray, Int_ pmax = pmax - pmin; pmin = 0; } - if (pmax >= GetNPads(r)) { + if (pmax >= (Int_t)GetNPads(r)) { pmin = pmin - (pmax - GetNPads(r)+1); pmax = GetNPads(r) - 1; if (pmin < 0 ) pmin = 0; // if the window is bigger than the ROC diff --git a/TPC/AliTPCCalibTCF.cxx b/TPC/AliTPCCalibTCF.cxx index c1c07783405..34d18d98c10 100644 --- a/TPC/AliTPCCalibTCF.cxx +++ b/TPC/AliTPCCalibTCF.cxx @@ -358,7 +358,7 @@ void AliTPCCalibTCF::AnalyzeRootFile(const char *nameFileIn, Int_t minNumPulse) Int_t nHist = fileIn.GetNkeys(); Int_t iHist = 0; // counter for print of analysis-status - while (key = (TKey *) next()) { // loop over histograms + while ((key = (TKey *) next())) { // loop over histograms printf("Analyze histogramm %d out of %d\n",++iHist,nHist); hisIn = (TH1F*)fileIn.Get(key->GetName()); // copy object to memory diff --git a/TPC/AliTPCGenDBConf.cxx b/TPC/AliTPCGenDBConf.cxx index 1cd412e8833..31910fb356f 100644 --- a/TPC/AliTPCGenDBConf.cxx +++ b/TPC/AliTPCGenDBConf.cxx @@ -47,7 +47,7 @@ AliTPCGenDBConf::~AliTPCGenDBConf(){ } //______________________________________________________________________________________________ -AliTPCGenDBConf& AliTPCGenDBConf::operator= (const AliTPCGenDBConf& org ) +AliTPCGenDBConf& AliTPCGenDBConf::operator= (const AliTPCGenDBConf& /*org*/ ) { // // assignment operator diff --git a/TPC/AliTPCLaserTracks.cxx b/TPC/AliTPCLaserTracks.cxx index da54ba9688e..244d0ef6f8e 100644 --- a/TPC/AliTPCLaserTracks.cxx +++ b/TPC/AliTPCLaserTracks.cxx @@ -439,9 +439,8 @@ Int_t AliTPCLaserTracks::FindMirror(Char_t *file, Double_t x, Double_t y, Double id = ltp->GetId(); } } - - return id; delete f; + return id; } //_______________________________________________________________________ diff --git a/TPC/AliTPCTransform.cxx b/TPC/AliTPCTransform.cxx index edf0d2b1dc3..53ba15aa4e2 100755 --- a/TPC/AliTPCTransform.cxx +++ b/TPC/AliTPCTransform.cxx @@ -192,7 +192,7 @@ void AliTPCTransform::Local2RotatedGlobal(Int_t sector, Double_t *x) const { AliFatal("Parameters missing"); } Int_t row=TMath::Nint(x[0]); - Int_t pad=TMath::Nint(x[1]); + // Int_t pad=TMath::Nint(x[1]); // const Int_t kNIS=param->GetNInnerSector(), kNOS=param->GetNOuterSector(); Double_t sign = 1.; diff --git a/TPC/AliTPCcalibDB.cxx b/TPC/AliTPCcalibDB.cxx index a51dc6bb052..c89fac78574 100644 --- a/TPC/AliTPCcalibDB.cxx +++ b/TPC/AliTPCcalibDB.cxx @@ -155,6 +155,7 @@ void AliTPCcalibDB::Terminate() //_____________________________________________________________________________ AliTPCcalibDB::AliTPCcalibDB(): + TObject(), fRun(-1), fTransform(0), fExB(0), @@ -175,6 +176,39 @@ AliTPCcalibDB::AliTPCcalibDB(): Update(); // temporary } +AliTPCcalibDB::AliTPCcalibDB(const AliTPCcalibDB& ): + TObject(), + fRun(-1), + fTransform(0), + fExB(0), + fPadGainFactor(0), + fPadTime0(0), + fPadNoise(0), + fPedestals(0), + fTemperature(0), + fMapping(0), + fRecoParamArray(0), + fParam(0), + fClusterParam(0) + +{ + // + // Copy constructor invalid -- singleton implementation + // + Error("copy constructor","invalid -- singleton implementation"); +} + +AliTPCcalibDB& AliTPCcalibDB::operator= (const AliTPCcalibDB& ) +{ +// +// Singleton implementation - no assignment operator +// + Error("operator =", "assignment operator not implemented"); + return *this; +} + + + //_____________________________________________________________________________ AliTPCcalibDB::~AliTPCcalibDB() { @@ -317,35 +351,6 @@ void AliTPCcalibDB::Update(){ AliCDBManager::Instance()->SetCacheFlag(cdbCache); // reset original CDB cache } -AliTPCcalibDB::AliTPCcalibDB(const AliTPCcalibDB& ): - fRun(-1), - fTransform(0), - fExB(0), - fPadGainFactor(0), - fPadTime0(0), - fPadNoise(0), - fPedestals(0), - fTemperature(0), - fMapping(0), - fRecoParamArray(0), - fParam(0), - fClusterParam(0) - -{ - // - // Copy constructor invalid -- singleton implementation - // - Error("copy constructor","invalid -- singleton implementation"); -} - -AliTPCcalibDB& AliTPCcalibDB::operator= (const AliTPCcalibDB& ) -{ -// -// Singleton implementation - no assignment operator -// - Error("operator =", "assignment operator not implemented"); - return *this; -} diff --git a/TPC/AliTPCcalibTracksCuts.cxx b/TPC/AliTPCcalibTracksCuts.cxx index a126ce8642f..d83d3bd1899 100644 --- a/TPC/AliTPCcalibTracksCuts.cxx +++ b/TPC/AliTPCcalibTracksCuts.cxx @@ -29,22 +29,57 @@ ClassImp(AliTPCcalibTracksCuts) + +AliTPCcalibTracksCuts::AliTPCcalibTracksCuts(): + TNamed("calibTracksCuts", "calibTracksCuts"), + fMinClusters(0), // number of clusters + fMinRatio(0), // kMinRratio = 0.4 + fMax1pt(0), // kMax1pt = 0.5 + fEdgeYXCutNoise(0), // kEdgeYXCutNoise = 0.13 + fEdgeThetaCutNoise(0), // kEdgeThetaCutNoise = 0.018 + fOutputFileName() // filename of outputfile ('Output.root') +{ + // + // default constructor + // +} + + AliTPCcalibTracksCuts::AliTPCcalibTracksCuts(Int_t minClusters, Float_t minRatio, Float_t max1pt, - Float_t edgeXZCutNoise, Float_t edgeThetaCutNoise, char* outputFileName): - TNamed("calibTracksCuts", "calibTracksCuts") { + Float_t edgeXZCutNoise, Float_t edgeThetaCutNoise, char* outputFileName): + TNamed("calibTracksCuts", "calibTracksCuts"), + fMinClusters(minClusters), // number of clusters + fMinRatio(minRatio), // kMinRratio = 0.4 + fMax1pt(max1pt), // kMax1pt = 0.5 + fEdgeYXCutNoise(edgeXZCutNoise), // kEdgeYXCutNoise = 0.13 + fEdgeThetaCutNoise(edgeXZCutNoise), // kEdgeThetaCutNoise = 0.018 + fOutputFileName() // filename of outputfile ('Output.root') +{ // // Constructor for AliTPCcalibTracksCuts // specify the cuts to be set on the processed tracks // default cuts are for comics // - fMinClusters = minClusters; - fMinRatio = minRatio; - fMax1pt = max1pt; - fEdgeYXCutNoise = edgeXZCutNoise; - fEdgeThetaCutNoise = edgeThetaCutNoise; - fOutputFileName = new TObjString(outputFileName); + fOutputFileName = outputFileName; +} + +AliTPCcalibTracksCuts::AliTPCcalibTracksCuts(AliTPCcalibTracksCuts *cuts): + TNamed(cuts->GetName(), cuts->GetTitle()), + fMinClusters(cuts->GetMinClusters()), // number of clusters + fMinRatio(cuts->GetMinRatio()), // kMinRratio = 0.4 + fMax1pt( cuts->GetMax1pt()), // kMax1pt = 0.5 + fEdgeYXCutNoise(cuts->GetEdgeYXCutNoise()), // kEdgeYXCutNoise = 0.13 + fEdgeThetaCutNoise( cuts->GetEdgeThetaCutNoise()), // kEdgeThetaCutNoise = 0.018 + fOutputFileName(0) // filename of outputfile ('Output.root') +{ + // + // copy constructor + // + fOutputFileName = cuts->GetOutputFileName(); } + + AliTPCcalibTracksCuts::~AliTPCcalibTracksCuts(){ // // Destructor @@ -53,29 +88,7 @@ AliTPCcalibTracksCuts::~AliTPCcalibTracksCuts(){ } -AliTPCcalibTracksCuts::AliTPCcalibTracksCuts(AliTPCcalibTracksCuts *cuts){ - // - // copy constructor - // - fMinClusters = cuts->GetMinClusters(); - fMinRatio = cuts->GetMinRatio(); - fMax1pt = cuts->GetMax1pt(); - fEdgeYXCutNoise = cuts->GetEdgeYXCutNoise(); - fEdgeThetaCutNoise = cuts->GetEdgeThetaCutNoise(); - fOutputFileName = new TObjString(cuts->GetOutputFileName()); -} -AliTPCcalibTracksCuts::AliTPCcalibTracksCuts(){ - // - // default constructor - // - fMinClusters = 0; - fMinRatio = 0; - fMax1pt = 0; - fEdgeYXCutNoise = 0; - fEdgeThetaCutNoise = 0; - fOutputFileName = new TObjString(""); -} void AliTPCcalibTracksCuts::AddCuts(TChain * chain, char* ctype, char* outputFileName){ // @@ -133,7 +146,7 @@ void AliTPCcalibTracksCuts::AddCuts(TChain * chain, Int_t minClusters, Float_t m minClusters, minRatio, max1pt, edgeXZCutNoise, edgeThetaCutNoise); } -void AliTPCcalibTracksCuts::Print(Option_t* option) { +void AliTPCcalibTracksCuts::Print(Option_t* option) const { // // Print the cut contents // @@ -144,5 +157,5 @@ void AliTPCcalibTracksCuts::Print(Option_t* option) { cout << "fMax1pt: " << fMax1pt << endl; cout << "fEdgeYXCutNoise: " << fEdgeYXCutNoise << endl; cout << "fEdgeThetaCutNoise: " << fEdgeThetaCutNoise << endl; - cout << "fOutputFileName: " << fOutputFileName->String().Data() << endl; + cout << "fOutputFileName: " << fOutputFileName.GetName() << endl; } // Prints out the specified cuts diff --git a/TPC/AliTPCcalibTracksCuts.h b/TPC/AliTPCcalibTracksCuts.h index c333e00e0b9..73f4300cdc8 100644 --- a/TPC/AliTPCcalibTracksCuts.h +++ b/TPC/AliTPCcalibTracksCuts.h @@ -38,14 +38,14 @@ public: void SetMax1pt(Float_t max1pt){fMax1pt = max1pt;} void SetEdgeXYCutNoise(Float_t edgeCutNoise){fEdgeYXCutNoise = edgeCutNoise;} void SetEdgeThetaCutNoise(Float_t edgeCutNoise){fEdgeThetaCutNoise = edgeCutNoise;} - void SetOuputFileNmae(char *fileName) {fOutputFileName = new TObjString(fileName);} + void SetOuputFileNmae(char *fileName) {fOutputFileName = fileName;} Int_t GetMinClusters() const {return fMinClusters;} Float_t GetMinRatio() const {return fMinRatio;} Float_t GetMax1pt() const {return fMax1pt;} Float_t GetEdgeYXCutNoise() const {return fEdgeYXCutNoise;} Float_t GetEdgeThetaCutNoise() const {return fEdgeThetaCutNoise;} - const char* GetOutputFileName() {return fOutputFileName->String().Data();} - virtual void Print(Option_t* option = ""); + const char* GetOutputFileName() {return fOutputFileName.String().Data();} + virtual void Print(Option_t* option = "") const; private: Int_t fMinClusters; // number of clusters @@ -53,7 +53,7 @@ private: Float_t fMax1pt; // kMax1pt = 0.5 Float_t fEdgeYXCutNoise; // kEdgeYXCutNoise = 0.13 Float_t fEdgeThetaCutNoise; // kEdgeThetaCutNoise = 0.018 - TObjString *fOutputFileName; // filename of outputfile ('Output.root') + TObjString fOutputFileName; // filename of outputfile ('Output.root') protected: ClassDef(AliTPCcalibTracksCuts,1) -- 2.39.3