From 1657f946aacfcb7b256e1ef2355593e67161036c Mon Sep 17 00:00:00 2001 From: pcrochet Date: Tue, 5 Sep 2006 18:14:12 +0000 Subject: [PATCH] removing fc++ warnings --- MUON/AliMUONLocalTrigger.cxx | 44 ++++++++++----------- MUON/AliMUONLocalTriggerBoard.cxx | 48 +++++++++++++---------- MUON/AliMUONResponseTriggerV1.cxx | 12 +++++- MUON/AliMUONTriggerBoard.cxx | 14 ++++--- MUON/AliMUONTriggerDecision.cxx | 41 ++++++++++--------- MUON/AliMUONTriggerDecisionV1.cxx | 11 ++++-- MUON/AliMUONTriggerLut.cxx | 18 ++++++--- MUON/AliMUONTriggerLut.h | 4 +- MUON/AliMUONTriggerSegmentation.cxx | 4 +- MUON/AliMUONTriggerTrack.cxx | 28 +++++++------ MUON/mapping/AliMpTrigger.cxx | 18 +++++++-- MUON/mapping/AliMpTriggerSegmentation.cxx | 9 +++-- 12 files changed, 147 insertions(+), 104 deletions(-) diff --git a/MUON/AliMUONLocalTrigger.cxx b/MUON/AliMUONLocalTrigger.cxx index 6d5d88b18be..4bae7137095 100644 --- a/MUON/AliMUONLocalTrigger.cxx +++ b/MUON/AliMUONLocalTrigger.cxx @@ -59,31 +59,30 @@ AliMUONLocalTrigger::AliMUONLocalTrigger() } //---------------------------------------------------------------------- AliMUONLocalTrigger::AliMUONLocalTrigger(const AliMUONLocalTrigger& theMUONLocalTrig) - : TObject(theMUONLocalTrig) + : TObject(theMUONLocalTrig), + fLoCircuit(theMUONLocalTrig.fLoCircuit), + fLoStripX(theMUONLocalTrig.fLoStripX), + fLoDev(theMUONLocalTrig.fLoDev), + fLoStripY(theMUONLocalTrig.fLoStripY), + fLoLpt(theMUONLocalTrig.fLoLpt), + fLoHpt(theMUONLocalTrig.fLoHpt), + fLoApt(theMUONLocalTrig.fLoApt), + + fX1Pattern(theMUONLocalTrig.fX1Pattern), + fX2Pattern(theMUONLocalTrig.fX2Pattern), + fX3Pattern(theMUONLocalTrig.fX3Pattern), + fX4Pattern(theMUONLocalTrig.fX4Pattern), + + fY1Pattern(theMUONLocalTrig.fY1Pattern), + fY2Pattern(theMUONLocalTrig.fY2Pattern), + fY3Pattern(theMUONLocalTrig.fY3Pattern), + fY4Pattern(theMUONLocalTrig.fY4Pattern), + + fLoDecision(theMUONLocalTrig.fLoDecision), + fDigits(theMUONLocalTrig.fDigits) { /// Copy constructor (useful for TClonesArray) - fLoCircuit = theMUONLocalTrig.fLoCircuit; - fLoStripX = theMUONLocalTrig.fLoStripX; - fLoDev = theMUONLocalTrig.fLoDev; - fLoStripY = theMUONLocalTrig.fLoStripY; - fLoLpt = theMUONLocalTrig.fLoLpt; - fLoHpt = theMUONLocalTrig.fLoHpt; - fLoApt = theMUONLocalTrig.fLoApt; - - fX1Pattern = theMUONLocalTrig.fX1Pattern; - fX2Pattern = theMUONLocalTrig.fX2Pattern; - fX3Pattern = theMUONLocalTrig.fX3Pattern; - fX4Pattern = theMUONLocalTrig.fX4Pattern; - - fY1Pattern = theMUONLocalTrig.fY1Pattern; - fY2Pattern = theMUONLocalTrig.fY2Pattern; - fY3Pattern = theMUONLocalTrig.fY3Pattern; - fY4Pattern = theMUONLocalTrig.fY4Pattern; - - fLoDecision = theMUONLocalTrig.fLoDecision; - - fDigits = theMUONLocalTrig.fDigits; } //---------------------------------------------------------------------- AliMUONLocalTrigger& AliMUONLocalTrigger::operator=(const AliMUONLocalTrigger& theMUONLocalTrig) @@ -148,6 +147,7 @@ AliMUONLocalTrigger::AliMUONLocalTrigger(const Int_t* localtr, const TArrayI& di fDigits = digits; } + //---------------------------------------------------------------------- Char_t AliMUONLocalTrigger::GetLoDecision() { diff --git a/MUON/AliMUONLocalTriggerBoard.cxx b/MUON/AliMUONLocalTriggerBoard.cxx index 058981e0863..ac8cfb8b1b7 100644 --- a/MUON/AliMUONLocalTriggerBoard.cxx +++ b/MUON/AliMUONLocalTriggerBoard.cxx @@ -56,11 +56,18 @@ const Int_t AliMUONLocalTriggerBoard::fgkCircuitId[234] = //___________________________________________ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard() -: AliMUONTriggerBoard() + : AliMUONTriggerBoard(), + fNumber(0), + fCrate(0), + fTC(kTRUE), + fStripX11(0), + fStripY11(0), + fDev(0), + fOutput(0), + fLUT(0x0) { //* constructor //* - fNumber = 0; for (Int_t i=0; i<2; i++) for (Int_t j=0; j<4; j++) @@ -72,27 +79,26 @@ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard() for (Int_t i=0; i<10; i++) fSwitch[i] = 0; - fTC = kTRUE; - - fLUT = 0x0; - for (Int_t i=0; i<5; i++) fMinDevStrip[i] = fMinDev[i] = fCoordY[i] = 0; - fOutput = 0; - - fStripX11 = fStripY11 = fDev = 0; - for (Int_t i=0; i<2; i++) fLutLpt[i] = fLutHpt[i] = fLutApt[i] = 0; } //___________________________________________ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard(const char *name, Int_t a, AliMUONTriggerLut* lut) -: AliMUONTriggerBoard(name, a) + : AliMUONTriggerBoard(name, a), + fNumber(0), + fCrate(0), + fTC(kTRUE), + fStripX11(0), + fStripY11(0), + fDev(0), + fOutput(0), + fLUT(lut) { //* constructor //* - fNumber = 0; for (Int_t i=0; i<2; i++) for (Int_t j=0; j<4; j++) @@ -104,22 +110,22 @@ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard(const char *name, Int_t a, for (Int_t i=0; i<10; i++) fSwitch[i] = 0; - fTC = kTRUE; - - fLUT = lut; - for (Int_t i=0; i<5; i++) fMinDevStrip[i] = fMinDev[i] = fCoordY[i] = 0; - fOutput = 0; - - fStripX11 = fStripY11 = fDev = 0; - for (Int_t i=0; i<2; i++) fLutLpt[i] = fLutHpt[i] = fLutApt[i] = 0; } //______________________________________________________________________________ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard(const AliMUONLocalTriggerBoard& right) - : AliMUONTriggerBoard(right) + : AliMUONTriggerBoard(right), + fNumber(right.fNumber), + fCrate(right.fCrate), + fTC(right.fTC), + fStripX11(right.fStripX11), + fStripY11(right.fStripY11), + fDev(right.fDev), + fOutput(right.fOutput), + fLUT(right.fLUT) { /// Protected copy constructor (not implemented) diff --git a/MUON/AliMUONResponseTriggerV1.cxx b/MUON/AliMUONResponseTriggerV1.cxx index 7834162b633..f215527e3ea 100644 --- a/MUON/AliMUONResponseTriggerV1.cxx +++ b/MUON/AliMUONResponseTriggerV1.cxx @@ -65,7 +65,11 @@ namespace //------------------------------------------------------------------ AliMUONResponseTriggerV1::AliMUONResponseTriggerV1() - : AliMUONResponseTrigger() + : AliMUONResponseTrigger(), + fGenerCluster(0), + fA(0), + fB(0), + fC(0) { // default constructor Float_t hv=9.2; @@ -74,7 +78,11 @@ AliMUONResponseTriggerV1::AliMUONResponseTriggerV1() //------------------------------------------------------------------ AliMUONResponseTriggerV1::AliMUONResponseTriggerV1(Float_t hv) - : AliMUONResponseTrigger() + : AliMUONResponseTrigger(), + fGenerCluster(0), + fA(0), + fB(0), + fC(0) { // Constructor SetParameters(hv); diff --git a/MUON/AliMUONTriggerBoard.cxx b/MUON/AliMUONTriggerBoard.cxx index 0fe4b0f36fb..6b26d63bc25 100644 --- a/MUON/AliMUONTriggerBoard.cxx +++ b/MUON/AliMUONTriggerBoard.cxx @@ -26,22 +26,26 @@ //___________________________________________ AliMUONTriggerBoard::AliMUONTriggerBoard() + : TNamed(), + fSlot(0), + fResponse(0) { // Default Ctor - fSlot = fResponse = 0; + } //___________________________________________ -AliMUONTriggerBoard::AliMUONTriggerBoard(const char *Name, Int_t islot) : TNamed(Name,"Trigger board") +AliMUONTriggerBoard::AliMUONTriggerBoard(const char *Name, Int_t islot) + : TNamed(Name,"Trigger board"), + fSlot(islot), + fResponse(0) { // Standard Ctor - fSlot = islot; - fResponse = 0; } //___________________________________________ -AliMUONTriggerBoard::AliMUONTriggerBoard(const AliMUONTriggerBoard &board) : TNamed(board) +AliMUONTriggerBoard::AliMUONTriggerBoard(const AliMUONTriggerBoard &board): TNamed(board) { // Dummy Copy Ctor board.Copy(*this); diff --git a/MUON/AliMUONTriggerDecision.cxx b/MUON/AliMUONTriggerDecision.cxx index a3911a6d8b7..c75174f4e7f 100644 --- a/MUON/AliMUONTriggerDecision.cxx +++ b/MUON/AliMUONTriggerDecision.cxx @@ -44,10 +44,17 @@ ClassImp(AliMUONTriggerDecision) //---------------------------------------------------------------------- AliMUONTriggerDecision::AliMUONTriggerDecision(AliLoader* loader, Int_t iprint, AliMUONData* data) - : TObject() + : TObject(), + fDebug(iprint), + fLoader(loader), + fTriggerCircuit(new TObjArray(AliMUONConstants::NTriggerCircuit())), + fDigits(new TObjArray(AliMUONConstants::NCh())), + fDigitIndices(new TArrayI[AliMUONConstants::NCh()]), + fMUONData(data), + fMUON((AliMUON*) gAlice->GetDetector("MUON")) { // Constructor - fDebug = iprint; // print option + // iprint = 0 : don't print anything // iprint = 1 : print Global Trigger Output // iprint = 2 : print Local and Global Trigger Outputs @@ -92,20 +99,6 @@ AliMUONTriggerDecision::AliMUONTriggerDecision(AliLoader* loader, Int_t iprint, } } - fTriggerCircuit = new TObjArray(AliMUONConstants::NTriggerCircuit()); - - // initialize loader's - fLoader = loader; - - // initialize container - if (data == 0){ - AliError("No MUONdata for trigger"); - }else{ - fMUONData = data; - } - - // getting MUON - fMUON = (AliMUON*) gAlice->GetDetector("MUON"); // setting circuit for (icirc = 0; icirc < AliMUONConstants::NTriggerCircuit(); icirc++) { @@ -115,17 +108,18 @@ AliMUONTriggerDecision::AliMUONTriggerDecision(AliLoader* loader, Int_t iprint, } // setting digits - fDigits = new TObjArray(AliMUONConstants::NCh()); //NTriggerCh for (Int_t i=0; iAddAt(new TClonesArray("AliMUONDigit",10000),i); - fDigitIndices = new TArrayI[AliMUONConstants::NCh()]; } //---------------------------------------------------------------------- AliMUONTriggerDecision::AliMUONTriggerDecision() : TObject(), + fDebug(0), fLoader(0), fTriggerCircuit(0), + fDigits(0), + fDigitIndices(0), fMUONData(0), fMUON(0) { @@ -135,11 +129,16 @@ AliMUONTriggerDecision::AliMUONTriggerDecision() //---------------------------------------------------------------------- AliMUONTriggerDecision::AliMUONTriggerDecision(const AliMUONTriggerDecision& rhs) - : TObject(rhs) + : TObject(rhs), + fDebug(rhs.fDebug), + fLoader(rhs.fLoader), + fTriggerCircuit(new TObjArray(AliMUONConstants::NTriggerCircuit())), + fDigits(new TObjArray(AliMUONConstants::NCh())), + fDigitIndices(new TArrayI[AliMUONConstants::NCh()]), + fMUONData(rhs.fMUONData), + fMUON(rhs.fMUON) { // Protected copy constructor - - AliFatal("Not implemented."); } //---------------------------------------------------------------------- diff --git a/MUON/AliMUONTriggerDecisionV1.cxx b/MUON/AliMUONTriggerDecisionV1.cxx index 1a556458b92..ee96c605617 100644 --- a/MUON/AliMUONTriggerDecisionV1.cxx +++ b/MUON/AliMUONTriggerDecisionV1.cxx @@ -60,8 +60,9 @@ ClassImp(AliMUONTriggerDecisionV1) AliMUONTriggerDecisionV1::AliMUONTriggerDecisionV1(AliMUONData* data) : TTask("AliMUONTriggerDecisionV1", "From trigger digits to Local and Global Trigger objects (old style)"), -fMUONData(data), -fMUON(0x0) + fMUONData(data), + fMUON(0x0), + fTriggerCircuit(new TObjArray(AliMUONConstants::NTriggerCircuit())) { // Constructor @@ -115,7 +116,6 @@ fMUON(0x0) } } - fTriggerCircuit = new TObjArray(AliMUONConstants::NTriggerCircuit()); // getting MUON fMUON = (AliMUON*) gAlice->GetDetector("MUON"); @@ -143,7 +143,10 @@ AliMUONTriggerDecisionV1::AliMUONTriggerDecisionV1() //---------------------------------------------------------------------- AliMUONTriggerDecisionV1::AliMUONTriggerDecisionV1(const AliMUONTriggerDecisionV1& rhs) - : TTask(rhs) + : TTask(rhs), + fTriggerCircuit(rhs.fTriggerCircuit), + fMUONData(rhs.fMUONData), + fMUON(rhs.fMUON) { // Protected copy constructor diff --git a/MUON/AliMUONTriggerLut.cxx b/MUON/AliMUONTriggerLut.cxx index b18d2eb6bcc..5be553b7f63 100644 --- a/MUON/AliMUONTriggerLut.cxx +++ b/MUON/AliMUONTriggerLut.cxx @@ -33,14 +33,20 @@ ClassImp(AliMUONTriggerLut) //---------------------------------------------------------------------- AliMUONTriggerLut::AliMUONTriggerLut() - : TNamed() + : TNamed(), + fLptPlus(0), + fLptMinu(0), + fLptUnde(0), + fHptPlus(0), + fHptMinu(0), + fHptUnde(0), + fAptPlus(0), + fAptMinu(0), + fAptUnde(0) { -/// Default constructor - - fLptPlus = fLptMinu = fLptUnde = 0; - fHptPlus = fHptMinu = fHptUnde = 0; - fAptPlus = fAptMinu = fAptUnde = 0; + //ctor } + //---------------------------------------------------------------------- AliMUONTriggerLut::~AliMUONTriggerLut() { diff --git a/MUON/AliMUONTriggerLut.h b/MUON/AliMUONTriggerLut.h index c2ace1ab9e5..3cefebe71fb 100644 --- a/MUON/AliMUONTriggerLut.h +++ b/MUON/AliMUONTriggerLut.h @@ -27,12 +27,12 @@ class AliMUONTriggerLut : public TNamed Int_t lutLpt[2], Int_t lutHpt[2], Int_t lutApt[2]); protected: - // copy constructor - AliMUONTriggerLut (const AliMUONTriggerLut& AliMUONTriggerLut); // assignment operator AliMUONTriggerLut& operator=(const AliMUONTriggerLut& AliMUONTriggerLut); private: + // copy constructor + AliMUONTriggerLut (const AliMUONTriggerLut& AliMUONTriggerLut); Int_t GetMask(Int_t ystrip); private: diff --git a/MUON/AliMUONTriggerSegmentation.cxx b/MUON/AliMUONTriggerSegmentation.cxx index 1f8c1397b29..abd2000e040 100644 --- a/MUON/AliMUONTriggerSegmentation.cxx +++ b/MUON/AliMUONTriggerSegmentation.cxx @@ -37,6 +37,7 @@ AliMUONTriggerSegmentation::AliMUONTriggerSegmentation() fNsec(7), fNpx(999999), fNpy(999999), + fSector(0), fXhit(0.), fYhit(0.), fIx(0), @@ -69,8 +70,10 @@ AliMUONTriggerSegmentation::AliMUONTriggerSegmentation(Bool_t bending) : AliMUONVGeometryDESegmentation(), fBending(bending), fId(0), + fNsec(7), fNpx(999999), fNpy(999999), + fSector(0), fXhit(0.), fYhit(0.), fIx(0), @@ -84,7 +87,6 @@ AliMUONTriggerSegmentation::AliMUONTriggerSegmentation(Bool_t bending) { /// Standard constructor - fNsec = 7; // add to St345SlatSegmentation for (Int_t i=0; i<7; i++) { fNstrip[i]=0; diff --git a/MUON/AliMUONTriggerTrack.cxx b/MUON/AliMUONTriggerTrack.cxx index 12349e0e1be..c57ce9d37be 100644 --- a/MUON/AliMUONTriggerTrack.cxx +++ b/MUON/AliMUONTriggerTrack.cxx @@ -44,15 +44,14 @@ AliMUONTriggerTrack::AliMUONTriggerTrack() } //__________________________________________________________________________ AliMUONTriggerTrack::AliMUONTriggerTrack(Float_t x11, Float_t y11, Float_t thetax, Float_t thetay, Long_t theGTPattern) - : TObject() + : TObject(), + fx11(x11), + fy11(y11), + fthetax(thetax), + fthetay(thetay), + fGTPattern(theGTPattern) { // ctor from local trigger output - fx11 = x11; - fy11 = y11; - fthetax = thetax; - fthetay = thetay; - fGTPattern = theGTPattern; - } //__________________________________________________________________________ @@ -65,13 +64,16 @@ AliMUONTriggerTrack::~AliMUONTriggerTrack() //__________________________________________________________________________ AliMUONTriggerTrack::AliMUONTriggerTrack (const AliMUONTriggerTrack& theMUONTriggerTrack) - : TObject(theMUONTriggerTrack) + : TObject(theMUONTriggerTrack), + fx11(theMUONTriggerTrack.fx11), + fy11(theMUONTriggerTrack.fy11), + fthetax(theMUONTriggerTrack.fthetax), + fthetay(theMUONTriggerTrack.fthetay), + fGTPattern(theMUONTriggerTrack.fGTPattern) { - fx11 = theMUONTriggerTrack.fx11; - fy11 = theMUONTriggerTrack.fy11; - fthetax = theMUONTriggerTrack.fthetax; - fthetay = theMUONTriggerTrack.fthetay; - fGTPattern = theMUONTriggerTrack.fGTPattern; +// +// copy ctor +// } //__________________________________________________________________________ diff --git a/MUON/mapping/AliMpTrigger.cxx b/MUON/mapping/AliMpTrigger.cxx index fcc1d5cbc70..82bf2da90f9 100644 --- a/MUON/mapping/AliMpTrigger.cxx +++ b/MUON/mapping/AliMpTrigger.cxx @@ -63,16 +63,26 @@ namespace //_____________________________________________________________________________ AliMpTrigger::AliMpTrigger() -: TObject(), fId(""), fPlaneType(kNonBendingPlane), -fMaxNofPadsY(0), fDX(0), fDY(0) +: TObject(), + fId(""), + fPlaneType(kNonBendingPlane), + fSlats(0), + fMaxNofPadsY(0), + fDX(0), + fDY(0) { // default ctor } //_____________________________________________________________________________ AliMpTrigger::AliMpTrigger(const char* slatType, AliMpPlaneType bendingOrNot) -: TObject(), fId(slatType), fPlaneType(bendingOrNot), -fMaxNofPadsY(0), fDX(0), fDY(0) + : TObject(), + fId(slatType), + fPlaneType(bendingOrNot), + fSlats(0), + fMaxNofPadsY(0), + fDX(0), + fDY(0) { // normal ctor } diff --git a/MUON/mapping/AliMpTriggerSegmentation.cxx b/MUON/mapping/AliMpTriggerSegmentation.cxx index 25eea1cbfa7..b2eb4ae8380 100644 --- a/MUON/mapping/AliMpTriggerSegmentation.cxx +++ b/MUON/mapping/AliMpTriggerSegmentation.cxx @@ -56,7 +56,8 @@ fNofStrips(0) //_____________________________________________________________________________ AliMpTriggerSegmentation::AliMpTriggerSegmentation(const AliMpTrigger* slat) : AliMpVSegmentation(), -fkSlat(slat) + fkSlat(slat), + fNofStrips(0) { // // Normal ctor. @@ -68,7 +69,7 @@ fkSlat(slat) // into account the fact that a given strip might be part of several // layer. Otherwise we would double count pads. - fNofStrips = 0; + for ( Int_t ix = 0; ix <= MaxPadIndexX(); ++ix ) { for ( Int_t iy = 0; iy <= MaxPadIndexY(); ++iy ) @@ -83,7 +84,9 @@ fkSlat(slat) //______________________________________________________________________________ AliMpTriggerSegmentation::AliMpTriggerSegmentation(const AliMpTriggerSegmentation& right) - : AliMpVSegmentation(right) + : AliMpVSegmentation(right), + fkSlat(right.fkSlat), + fNofStrips(right.fNofStrips) { /// Protected copy constructor (not implemented) -- 2.39.3