removing fc++ warnings
authorpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 5 Sep 2006 18:14:12 +0000 (18:14 +0000)
committerpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 5 Sep 2006 18:14:12 +0000 (18:14 +0000)
12 files changed:
MUON/AliMUONLocalTrigger.cxx
MUON/AliMUONLocalTriggerBoard.cxx
MUON/AliMUONResponseTriggerV1.cxx
MUON/AliMUONTriggerBoard.cxx
MUON/AliMUONTriggerDecision.cxx
MUON/AliMUONTriggerDecisionV1.cxx
MUON/AliMUONTriggerLut.cxx
MUON/AliMUONTriggerLut.h
MUON/AliMUONTriggerSegmentation.cxx
MUON/AliMUONTriggerTrack.cxx
MUON/mapping/AliMpTrigger.cxx
MUON/mapping/AliMpTriggerSegmentation.cxx

index 6d5d88b18be035a1b6ff166ceabf7830f6e3a34c..4bae71370953c40cf0eba980df892a30d0f44b3e 100644 (file)
@@ -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()
 {
index 058981e0863d1db8f0f4b89b728e06a8bdfe04d7..ac8cfb8b1b70d4681c81f725e6d01748e63a29f2 100644 (file)
@@ -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)
 
index 7834162b63322383e2908fb51ab8d3e840d03181..f215527e3ea60f180dd83da3a70a335a08d627ca 100644 (file)
@@ -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);
index 0fe4b0f36fb06b52a57f2479dbd848119e360c20..6b26d63bc252111c3e283c5455272f0c61d658a4 100644 (file)
 
 //___________________________________________
 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);
index a3911a6d8b7c19c68e4a8fbbb46bd89d4e6d367b..c75174f4e7fa2aaca86ef4e7e48217baaff7441f 100644 (file)
@@ -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; i<AliMUONConstants::NCh() ;i++) 
     fDigits->AddAt(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.");
 }
 
 //----------------------------------------------------------------------
index 1a556458b9288fe8a2660204987f45b0a765de51..ee96c605617a98601e20c5bed1853126c57df60f 100644 (file)
@@ -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
 
index b18d2eb6bcc7da6757d8ac5724945e762e7b0e56..5be553b7f6314d6b14d9a90e695c11b79c5789b6 100644 (file)
@@ -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() 
 {
index c2ace1ab9e58c0cb5e5bdc9beebf3ae66eb84d52..3cefebe71fbe0a3abf98d693911aeca8b11cd0aa 100644 (file)
@@ -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:
index 1f8c1397b29025bfd9053c6ed739ed7f1f5b6fb0..abd2000e040ef791763765eae1e9bfb133d82fe6 100644 (file)
@@ -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;
index 12349e0e1bed69a1b8df9e56dfd56a0a41acf1a0..c57ce9d37be5658afedcd85a5df70d2450b439f2 100644 (file)
@@ -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
+//
 }
       
 //__________________________________________________________________________
index fcc1d5cbc7007abd2d0e1786e3eee29bb90a70d9..82bf2da90f9b23b0794cb68ffdc7615ba8de6887 100644 (file)
@@ -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
 }
index 25eea1cbfa7ce7ef93116a48b4d42e64f9eeb0db..b2eb4ae8380714b1040b1139bf8d94483ca4000f 100644 (file)
@@ -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)