Correcting EffC++ warnings

(Christian)

diff --git a/MUON/AliMUONBlockHeader.cxx b/MUON/AliMUONBlockHeader.cxx
index 8c1a2d8e9fbdda331ca6bcb2b4e13eb20bc95e2a..e1d5104fa6969fed00339199d92f94c86fa28326 100644 (file)
--- a/MUON/AliMUONBlockHeader.cxx
+++ b/MUON/AliMUONBlockHeader.cxx
@@ -42,14 +42,14 @@ AliMUONBlockHeader::AliMUONBlockHeader()
      fL0Trigger(0),
      fMiniEventId(0),
      fEventId1(0),
-     fEventId2(0)
+     fEventId2(0),
+     fDspHeaderArray(new TClonesArray("AliMUONDspHeader", 5))
+
 {
   //
   // ctor
   //
 
-  fDspHeaderArray = new TClonesArray("AliMUONDspHeader", 5);
-
 }
 
 //___________________________________________
@@ -64,22 +64,21 @@ AliMUONBlockHeader::~AliMUONBlockHeader()
 
 //___________________________________________
 AliMUONBlockHeader::AliMUONBlockHeader(const AliMUONBlockHeader& event)
-  :  TObject(event)
+  :  TObject(event),
+     fDataKey(event.fDataKey),
+     fTotalLength(event.fTotalLength),
+     fLength(event.fLength),
+     fDspId(event.fDspId),
+     fL0Trigger(event.fL0Trigger),
+     fMiniEventId(event.fMiniEventId),
+     fEventId1(event.fEventId1),
+     fEventId2(event.fEventId2),
+     fDspHeaderArray(new TClonesArray("AliMUONDspHeader", 5))
 {
   //
   // copy ctor
   //
 
-  fDataKey     = event.fDataKey;
-  fTotalLength = event.fTotalLength;
-  fLength      = event.fLength;
-  fDspId       = event.fDspId;
-  fL0Trigger   = event.fL0Trigger;
-  fMiniEventId = event.fMiniEventId;
-  fEventId1    = event.fEventId1;
-  fEventId2    = event.fEventId2;
-
-  fDspHeaderArray = new TClonesArray("AliMUONDspHeader", 5);
   for (Int_t index = 0; index < (event.fDspHeaderArray)->GetEntriesFast(); index++) {
     {new ((*fDspHeaderArray)[fDspHeaderArray->GetEntriesFast()]) 
         AliMUONDspHeader(*(AliMUONDspHeader*)(event.fDspHeaderArray)->At(index));}

diff --git a/MUON/AliMUONBusStruct.cxx b/MUON/AliMUONBusStruct.cxx
index d9aaed5e7bef2acc2342d2826a6afc40806787bc..1a0718a763c115b9c27d670520ac1174e6c4a2bf 100644 (file)
--- a/MUON/AliMUONBusStruct.cxx
+++ b/MUON/AliMUONBusStruct.cxx
@@ -42,6 +42,7 @@ AliMUONBusStruct::AliMUONBusStruct()
      fTotalLength(0),
      fLength(0),
      fBusPatchId(0),
+     fData(new UInt_t[1024]),
      fBufSize(1024),
      fDspId(0),
      fBlkId(0)
@@ -49,7 +50,7 @@ AliMUONBusStruct::AliMUONBusStruct()
   //
   // ctor
   // 
-  fData = new UInt_t[fBufSize];
+
 }
 //___________________________________________
 AliMUONBusStruct::~AliMUONBusStruct()
@@ -102,21 +103,21 @@ void AliMUONBusStruct::ResizeData(Int_t size)
 }
 //___________________________________________
 AliMUONBusStruct::
-AliMUONBusStruct(const AliMUONBusStruct& event): TObject(event)
+AliMUONBusStruct(const AliMUONBusStruct& event)
+  : TObject(event),
+    fDataKey(event.fDataKey),
+    fTotalLength(event.fTotalLength),
+    fLength(event.fLength),
+    fBusPatchId(event.fBusPatchId),
+    fData(new UInt_t[event.fBufSize]),
+    fBufSize(event.fBufSize),
+    fDspId(event.fDspId),
+    fBlkId(event.fBlkId)
 {
   //
   // copy ctor
   //
-  fDataKey     = event.fDataKey;
-  fTotalLength = event.fTotalLength;
-  fLength      = event.fLength;
-  fBusPatchId  = event.fBusPatchId;
-  fBufSize     = event.fBufSize;
 
-  fBlkId = event.fBlkId;
-  fDspId = event.fDspId;
-
-  fData =  new UInt_t[event.fBufSize];
   for (int i = 0; i < event.fBufSize; i++)
     fData[i] = event.fData[i];
 }

diff --git a/MUON/AliMUONDDLTracker.cxx b/MUON/AliMUONDDLTracker.cxx
index 7c427ecd7617a2c8628ffeeb54f9b7a3fe178f73..9c233bc7cccb394ce2da86ac245d71d9b345a3f7 100644 (file)
--- a/MUON/AliMUONDDLTracker.cxx
+++ b/MUON/AliMUONDDLTracker.cxx
@@ -33,12 +33,12 @@ ClassImp(AliMUONDDLTracker)
 
 //___________________________________________
 AliMUONDDLTracker::AliMUONDDLTracker()
-  :  TObject()
+  :  TObject(),
+     fBlkHeaderArray(new TClonesArray("AliMUONBlockHeader", 2))
 {
   //
   //ctor
   //
-  fBlkHeaderArray = new TClonesArray("AliMUONBlockHeader", 2);
 
 }
 

diff --git a/MUON/AliMUONDDLTracker.h b/MUON/AliMUONDDLTracker.h
index 0df22d33a7d42a86df5a7dae9d19aef208f096bc..834472211397999bcc8012167d0d035f5f1e7e7c 100644 (file)
--- a/MUON/AliMUONDDLTracker.h
+++ b/MUON/AliMUONDDLTracker.h
@@ -45,7 +45,9 @@ public:
  private:
 
    TClonesArray* fBlkHeaderArray;  ///< array of block header
-   
+ 
+   AliMUONDDLTracker(const AliMUONDDLTracker& event);
+   AliMUONDDLTracker& operator=(const AliMUONDDLTracker& event);
  
    ClassDef(AliMUONDDLTracker,1)  // MUON DDL Tracker
 };

diff --git a/MUON/AliMUONDDLTrigger.cxx b/MUON/AliMUONDDLTrigger.cxx
index ef040300a92f6ad6f173bbf082d8ac6dd296d1fa..44c74d6ea9ea7e7639509c2f6f7aebefd9cf6c24 100644 (file)
--- a/MUON/AliMUONDDLTrigger.cxx
+++ b/MUON/AliMUONDDLTrigger.cxx
@@ -34,12 +34,12 @@ ClassImp(AliMUONDDLTrigger)
 
 //___________________________________________
 AliMUONDDLTrigger::AliMUONDDLTrigger()
-  :  TObject()
+  :  TObject(),
+     fDarcHeader(new AliMUONDarcHeader())
 {
   //
   //ctor
   //
-  fDarcHeader = new AliMUONDarcHeader();
 }
 
 //___________________________________________

diff --git a/MUON/AliMUONDDLTrigger.h b/MUON/AliMUONDDLTrigger.h
index ca0c14c93def4b0e5edd5829da5308653bda3b49..d04a10a5351f4785e0706ba4bad707333e742868 100644 (file)
--- a/MUON/AliMUONDDLTrigger.h
+++ b/MUON/AliMUONDDLTrigger.h
@@ -33,8 +33,11 @@ public:
 
  private:
 
+
    AliMUONDarcHeader* fDarcHeader;  ///< pointer of darc header
-   
+
+   AliMUONDDLTrigger(const AliMUONDDLTrigger& event);
+   AliMUONDDLTrigger& operator=(const AliMUONDDLTrigger& event);
 
    ClassDef(AliMUONDDLTrigger,1)  // MUON DDL Trigger
 };

diff --git a/MUON/AliMUONDarcHeader.cxx b/MUON/AliMUONDarcHeader.cxx
index 9820302e3fa10cc86794179df75bbae2f7a71b41..c4db726953ee22caf76fa687905f224e4ce4050c 100644 (file)
--- a/MUON/AliMUONDarcHeader.cxx
+++ b/MUON/AliMUONDarcHeader.cxx
@@ -57,7 +57,9 @@ AliMUONDarcHeader::AliMUONDarcHeader()
      fDarcL2R(0),
      fDarcClk(0),
      fDarcHold(0),
-     fDarcSpare(0)     
+     fDarcSpare(0),
+     fRegHeaderArray(new TClonesArray("AliMUONRegHeader",8))
+  
 
 {
   //
@@ -69,32 +71,32 @@ AliMUONDarcHeader::AliMUONDarcHeader()
   for (Int_t i = 0; i < 6; i++)
     fGlobalScaler[i] = 0;
 
-  fRegHeaderArray = new TClonesArray("AliMUONRegHeader",8);
 }
 
 //___________________________________________
 AliMUONDarcHeader::AliMUONDarcHeader(const AliMUONDarcHeader& event)
-  :  TObject(event)
+  :  TObject(event),
+     fWord(event.fWord),
+     fGlobalOutput(event.fGlobalOutput),
+     fGlobalL0(event.fGlobalL0),
+     fGlobalClk(event.fGlobalClk),
+     fGlobalHold(event.fGlobalHold),   
+     fGlobalSpare(event.fGlobalSpare),
+
+     fDarcL0R(event.fDarcL0R),
+     fDarcL1P(event.fDarcL1P),
+     fDarcL1S(event.fDarcL1S),
+     fDarcL2A(event.fDarcL2A),
+     fDarcL2R(event.fDarcL2R),
+     fDarcClk(event.fDarcClk),
+     fDarcHold(event.fDarcHold),
+     fDarcSpare(event.fDarcSpare),
+     fRegHeaderArray(new TClonesArray("AliMUONRegHeader", 8))
+
 {
   //
   // copy ctor
   //
-  fWord         = event.fWord;
-  fGlobalOutput = event.fGlobalOutput;
-  fGlobalL0     = event.fGlobalL0;
-  fGlobalClk    = event.fGlobalClk;
-  fGlobalHold   = event.fGlobalHold;   
-  fGlobalSpare  = event.fGlobalSpare;
-
-  fDarcL0R   = event.fDarcL0R;
-  fDarcL1P   = event.fDarcL1P;
-  fDarcL1S   = event.fDarcL1S;
-  fDarcL2A   = event.fDarcL2A;
-  fDarcL2R   = event.fDarcL2R;
-  fDarcClk   = event.fDarcClk;
-  fDarcHold  = event.fDarcHold;
-  fDarcSpare = event.fDarcSpare;
-
  
  for (Int_t i = 0; i < 4; i++)
     fGlobalInput[i] = event.fGlobalInput[i];
@@ -102,7 +104,6 @@ AliMUONDarcHeader::AliMUONDarcHeader(const AliMUONDarcHeader& event)
   for (Int_t i = 0; i < 6; i++)
     fGlobalScaler[i] = event.fGlobalScaler[i];
 
-  fRegHeaderArray = new TClonesArray("AliMUONRegHeader", 8);
   for (Int_t index = 0; index < (event.fRegHeaderArray)->GetEntriesFast(); index++) {
     new ((*fRegHeaderArray)[fRegHeaderArray->GetEntriesFast()]) 
         AliMUONRegHeader(*(AliMUONRegHeader*)(event.fRegHeaderArray)->At(index));

diff --git a/MUON/AliMUONDigitMaker.cxx b/MUON/AliMUONDigitMaker.cxx
index 7ce15efd8d48d4d12d97f0e71d690364cd077bf9..8700996503ed6e693d50b21c30b7ddd72c72d8ec 100644 (file)
--- a/MUON/AliMUONDigitMaker.cxx
+++ b/MUON/AliMUONDigitMaker.cxx
@@ -76,7 +76,18 @@ ClassImp(AliMUONDigitMaker) // Class implementation in ROOT context
 //__________________________________________________________________________
 AliMUONDigitMaker::AliMUONDigitMaker(AliMUONData* data)
   : TObject(),
-    fScalerEvent(kFALSE)
+    fMUONData(data),
+    fSegFactory(new AliMpSegFactory()),
+    fBusPatchManager(new AliMpBusPatch()),
+    fScalerEvent(kFALSE),
+    fRawStreamTracker(new AliMUONRawStreamTracker()),    
+    fRawStreamTrigger(new AliMUONRawStreamTrigger()),    
+    fDigit(new AliMUONDigit()),
+    fLocalTrigger(new AliMUONLocalTrigger()),
+    fGlobalTrigger(new AliMUONGlobalTrigger()),
+    fTrackerTimer(),
+    fTriggerTimer(),
+    fMappingTimer()
 {
   //
   // ctor with AliMUONData as argument
@@ -87,26 +98,9 @@ AliMUONDigitMaker::AliMUONDigitMaker(AliMUONData* data)
 
   // Standard Constructor
 
-  // initialize segmentation factory
-  fSegFactory = new AliMpSegFactory();
-
-  // initialize container
-  fMUONData  = data;
-
   // bus patch 
-  fBusPatchManager = new AliMpBusPatch();
   fBusPatchManager->ReadBusPatchFile();
 
-  // raw streamers
-  fRawStreamTracker = new AliMUONRawStreamTracker();    
-  fRawStreamTrigger = new AliMUONRawStreamTrigger();    
-
-  // digit
-  fDigit = new AliMUONDigit();
-
-  // local trigger
-  fLocalTrigger  =  new AliMUONLocalTrigger();
-  fGlobalTrigger =  new AliMUONGlobalTrigger();
 
   fTrackerTimer.Start(kTRUE); fTrackerTimer.Stop();
   fTriggerTimer.Start(kTRUE); fTriggerTimer.Stop();
@@ -124,7 +118,11 @@ AliMUONDigitMaker::AliMUONDigitMaker()
     fRawStreamTracker(0),
     fRawStreamTrigger(0),
     fDigit(0),
-    fLocalTrigger(0)
+    fLocalTrigger(0),
+    fGlobalTrigger(0),
+    fTrackerTimer(),
+    fTriggerTimer(),
+    fMappingTimer()
 {
   //
   // Default Constructor
@@ -136,32 +134,8 @@ AliMUONDigitMaker::AliMUONDigitMaker()
   
 }
 
-//_______________________________________________________________________
-AliMUONDigitMaker::AliMUONDigitMaker (const AliMUONDigitMaker& rhs)
-  : TObject(rhs)
-{
-  //
-  // Protected copy constructor
-  //
-  AliFatal("Not implemented.");
-}
-
-//_______________________________________________________________________
-AliMUONDigitMaker & 
-AliMUONDigitMaker::operator=(const AliMUONDigitMaker& rhs)
-{
-  //
-  // Protected assignement operator
-  //
-  if (this == &rhs) return *this;
-
-  AliFatal("Not implemented.");
-    
-  return *this;  
-}
-
 //__________________________________________________________________________
-AliMUONDigitMaker::~AliMUONDigitMaker(void)
+AliMUONDigitMaker::~AliMUONDigitMaker()
 {
   //
   // clean up

diff --git a/MUON/AliMUONDigitMaker.h b/MUON/AliMUONDigitMaker.h
index 354825d912815b13a21300f9c65fec807dfb9cb0..f53c643ce9f16d13c910b55caedaec5980b60072 100644 (file)
--- a/MUON/AliMUONDigitMaker.h
+++ b/MUON/AliMUONDigitMaker.h
@@ -46,8 +46,6 @@ class AliMUONDigitMaker : public TObject
 
  protected:
   AliMUONDigitMaker();                  // Default constructor
-  AliMUONDigitMaker (const AliMUONDigitMaker& rhs); // copy constructor
-  AliMUONDigitMaker& operator=(const AliMUONDigitMaker& rhs); // assignment operator
 
  private:
 
@@ -71,6 +69,9 @@ class AliMUONDigitMaker : public TObject
   TStopwatch fTriggerTimer;                    //!< time watcher for trigger part
   TStopwatch fMappingTimer;                    //!< time watcher for mapping-tracker part
 
+  AliMUONDigitMaker (const AliMUONDigitMaker& rhs); // copy constructor
+  AliMUONDigitMaker& operator=(const AliMUONDigitMaker& rhs); // assignment operator
+
   ClassDef(AliMUONDigitMaker,1) // MUON digit maker from rawdata
 };
        

diff --git a/MUON/AliMUONDspHeader.cxx b/MUON/AliMUONDspHeader.cxx
index 115db8f791860a3b5e249bc79efc888bcfe6d2d8..e5acb0b611a18372e9010bc156e3a3404d55d0ac 100644 (file)
--- a/MUON/AliMUONDspHeader.cxx
+++ b/MUON/AliMUONDspHeader.cxx
@@ -46,14 +46,13 @@ AliMUONDspHeader::AliMUONDspHeader()
      fL1ATrigger(0),
      fL1RTrigger(0),
      fPaddingWord(0),
-     fErrorWord(0)
+     fErrorWord(0),
+     fBusPatchArray(new TClonesArray("AliMUONBusStruct",5))
 {
   //
   //ctor
   //
 
-  fBusPatchArray  = new TClonesArray("AliMUONBusStruct",5);
-
 }
 
 //___________________________________________
@@ -68,22 +67,23 @@ AliMUONDspHeader::~AliMUONDspHeader()
 
 //___________________________________________
 AliMUONDspHeader::AliMUONDspHeader(const AliMUONDspHeader& event)
-  :  TObject(event)
+  :  TObject(event),
+     fDataKey(event.fDataKey),
+     fTotalLength(event.fTotalLength),
+     fLength(event.fLength),
+     fDspId(event.fDspId),
+     fBlkL1ATrigger(event.fBlkL1ATrigger),
+     fMiniEventId(event.fMiniEventId),
+     fL1ATrigger(event.fL1ATrigger),
+     fL1RTrigger(event.fL1RTrigger),
+     fPaddingWord(event.fPaddingWord),
+     fErrorWord(event.fErrorWord),
+     fBusPatchArray(new TClonesArray("AliMUONBusStruct", 5))
 {
   // 
   // copy constructor
   //
-  fTotalLength   = event.fTotalLength;
-  fLength        = event.fLength;
-  fDspId         = event.fDspId;
-  fBlkL1ATrigger = event.fBlkL1ATrigger;
-  fMiniEventId   = event.fMiniEventId;
-  fL1ATrigger    = event.fL1ATrigger;
-  fL1RTrigger    = event.fL1RTrigger;
-  fPaddingWord   = event.fPaddingWord;
-  fErrorWord     = event.fErrorWord;
 
-  fBusPatchArray = new TClonesArray("AliMUONBusStruct", 5);
   for (Int_t index = 0; index < (event.fBusPatchArray)->GetEntriesFast(); index++) {
     {new ((*fBusPatchArray)[fBusPatchArray->GetEntriesFast()]) 
         AliMUONBusStruct(*(AliMUONBusStruct*)(event.fBusPatchArray)->At(index));}
@@ -100,9 +100,10 @@ AliMUONDspHeader& AliMUONDspHeader::operator=(const AliMUONDspHeader& event)
   //
   if (this == &event) return *this;
 
-  fTotalLength = event.fTotalLength;
-  fLength      = event.fLength;
-  fDspId       = event.fDspId;
+  fDataKey       = event.fDataKey;
+  fTotalLength   = event.fTotalLength;
+  fLength        = event.fLength;
+  fDspId         = event.fDspId;
   fBlkL1ATrigger = event.fBlkL1ATrigger;
   fMiniEventId   = event.fMiniEventId;
   fL1ATrigger    = event.fL1ATrigger;

diff --git a/MUON/AliMUONLocalStruct.cxx b/MUON/AliMUONLocalStruct.cxx
index cf578b21ccecdbe5ae27c8c6bbadf1ef72c85a77..0ead7747b1d95689652736f61291f5355fa0399d 100644 (file)
--- a/MUON/AliMUONLocalStruct.cxx
+++ b/MUON/AliMUONLocalStruct.cxx
@@ -64,25 +64,24 @@ AliMUONLocalStruct::AliMUONLocalStruct()
 
 //___________________________________________
 AliMUONLocalStruct::AliMUONLocalStruct(const AliMUONLocalStruct& event)
-  :  TObject(event)
+  :  TObject(event),
+     fL0(event.fL0),
+     fHold(event.fHold),
+     fClk(event.fClk),
+     fLPtNTrig(event.fLPtNTrig),
+     fHPtNTrig(event.fHPtNTrig),
+     fLPtRTrig(event.fLPtRTrig),
+     fHPtRTrig(event.fHPtRTrig),
+     fLPtLTrig(event.fLPtLTrig),
+     fHPtLTrig(event.fHPtLTrig),
+     fLPtSTrig(event.fLPtSTrig),
+     fHPtSTrig(event.fHPtSTrig),
+     fEOS(event.fEOS),
+     fReset(event.fReset)
 {
   //
   // copy ctor
   //
-  fL0       = event.fL0;
-  fHold     = event.fHold;
-  fClk      = event.fClk;
-  fLPtNTrig = event.fLPtNTrig;
-  fHPtNTrig = event.fHPtNTrig;
-  fLPtRTrig = event.fLPtRTrig;
-  fHPtRTrig = event.fHPtRTrig;
-  fLPtLTrig = event.fLPtLTrig;
-  fHPtLTrig = event.fHPtLTrig;
-  fLPtSTrig = event.fLPtSTrig;
-  fHPtSTrig = event.fHPtSTrig;
-  fEOS      = event.fEOS;
-  fReset    = event.fReset  ;
-
   for (Int_t i = 0; i < 5; i++)
     fData[i] = event.fData[i];
 

diff --git a/MUON/AliMUONPayloadTracker.cxx b/MUON/AliMUONPayloadTracker.cxx
index 683a5696656350d68d592a0f42b8ae3f8c17d1bb..376ddfca8ad275ff8e1f5bfc8364231a0f4005fc 100644 (file)
--- a/MUON/AliMUONPayloadTracker.cxx
+++ b/MUON/AliMUONPayloadTracker.cxx
@@ -39,42 +39,24 @@ ClassImp(AliMUONPayloadTracker)
 
 AliMUONPayloadTracker::AliMUONPayloadTracker()
   : TObject(),
+    fBusPatchId(0),
+    fDspId(0),
+    fBlkId(0),
+    fMaxDDL(20),
     fMaxBlock(2),
     fMaxDsp(5),
-    fMaxBus(5)
+    fMaxBus(5),
+    fDDLTracker(new AliMUONDDLTracker()),
+    fBusStruct(new AliMUONBusStruct()),
+    fBlockHeader(new AliMUONBlockHeader()),
+    fDspHeader(new AliMUONDspHeader())
 {
   //
   // create an object to decode MUON payload
   //
 
-  fDDLTracker      = new AliMUONDDLTracker();
-  fBusStruct       = new AliMUONBusStruct();
-  fBlockHeader     = new AliMUONBlockHeader();
-  fDspHeader       = new AliMUONDspHeader();
 }
 
-//_________________________________________________________________
-AliMUONPayloadTracker::AliMUONPayloadTracker(const AliMUONPayloadTracker& stream) :
-  TObject(stream)
-{ 
-  //
-  // copy ctor
-  //
-  AliFatal("copy constructor not implemented");
-}
-
-//______________________________________________________________________
-AliMUONPayloadTracker& AliMUONPayloadTracker::operator = (const AliMUONPayloadTracker& 
-                                             /* stream */)
-{
-  // 
-  // assignment operator
-  //
-  AliFatal("assignment operator not implemented");
-  return *this;
-}
-
-
 //___________________________________
 AliMUONPayloadTracker::~AliMUONPayloadTracker()
 {

diff --git a/MUON/AliMUONPayloadTracker.h b/MUON/AliMUONPayloadTracker.h
index 619dbdeae73aea24efde9f3558c10b6fc3326e10..a5ed7218dc81b1a8e172bbd0b3c77305ef3cfe66 100644 (file)
--- a/MUON/AliMUONPayloadTracker.h
+++ b/MUON/AliMUONPayloadTracker.h
@@ -28,8 +28,6 @@ class AliMUONBlockHeader;
 class AliMUONPayloadTracker: public TObject {
   public :
     AliMUONPayloadTracker();
-    AliMUONPayloadTracker(const AliMUONPayloadTracker& stream);
-    AliMUONPayloadTracker& operator = (const AliMUONPayloadTracker& stream);
     virtual ~AliMUONPayloadTracker();
 
     Int_t GetMaxBlock() const {return fMaxBlock;}
@@ -50,9 +48,8 @@ class AliMUONPayloadTracker: public TObject {
     AliMUONBusStruct*       GetBusPatchInfo() const {return fBusStruct;}
     AliMUONDDLTracker*      GetDDLTracker()   const {return fDDLTracker;}
 
-  protected :
+  private :
 
- 
     Int_t  fBusPatchId;   ///< entry of buspatch structure
     Int_t  fDspId;        ///< entry of Dsp header
     Int_t  fBlkId;        ///< entry of Block header
@@ -67,6 +64,9 @@ class AliMUONPayloadTracker: public TObject {
     AliMUONBlockHeader*     fBlockHeader;     //!< pointer for block structure 
     AliMUONDspHeader*       fDspHeader;       //!< pointer for dsp structure 
 
+    AliMUONPayloadTracker(const AliMUONPayloadTracker& stream);
+    AliMUONPayloadTracker& operator = (const AliMUONPayloadTracker& stream);
+
     Bool_t CheckDataParity();
 
     ClassDef(AliMUONPayloadTracker, 1)    // base class for reading MUON raw digits

diff --git a/MUON/AliMUONPayloadTrigger.cxx b/MUON/AliMUONPayloadTrigger.cxx
index 2794b200af2150a61d5fbdcffe0fed405517247b..b859630915a96923fb1bed7e4886d9d940c7d4ba 100644 (file)
--- a/MUON/AliMUONPayloadTrigger.cxx
+++ b/MUON/AliMUONPayloadTrigger.cxx
@@ -40,38 +40,16 @@ ClassImp(AliMUONPayloadTrigger)
 AliMUONPayloadTrigger::AliMUONPayloadTrigger()
   : TObject(),
     fMaxReg(8),
-    fMaxLoc(16)
+    fMaxLoc(16),
+    fDDLTrigger(new AliMUONDDLTrigger()),
+    fRegHeader(new AliMUONRegHeader()), 
+    fLocalStruct(new AliMUONLocalStruct())
 {
   //
   // create an object to read MUON raw digits
   // Default ctor for monitoring purposes
   //
 
-  fDDLTrigger  = new AliMUONDDLTrigger();
-  fRegHeader   = new AliMUONRegHeader();  
-  fLocalStruct = new AliMUONLocalStruct();
-
-}
-
-//_________________________________________________________________
-AliMUONPayloadTrigger::AliMUONPayloadTrigger(const AliMUONPayloadTrigger& stream) :
-  TObject(stream)
-{
-  //
-  // copy ctor
-  //
-  AliFatal("copy constructor not implemented");
-}
-
-//______________________________________________________________________
-AliMUONPayloadTrigger& AliMUONPayloadTrigger::operator = (const AliMUONPayloadTrigger& 
-                                             /* stream */)
-{ 
-  // 
-  // assignment operator
-  //
-  AliFatal("assignment operator not implemented");
-  return *this;
 }
 
 //___________________________________

diff --git a/MUON/AliMUONPayloadTrigger.h b/MUON/AliMUONPayloadTrigger.h
index 4e11d457a97257749405bd159e8724546600a423..933013b06d33bf60d8a2cd814060fa2254c121ee 100644 (file)
--- a/MUON/AliMUONPayloadTrigger.h
+++ b/MUON/AliMUONPayloadTrigger.h
@@ -27,8 +27,6 @@ class AliMUONRegHeader;
 class AliMUONPayloadTrigger: public TObject {
   public :
     AliMUONPayloadTrigger();
-    AliMUONPayloadTrigger(const AliMUONPayloadTrigger& stream);
-    AliMUONPayloadTrigger& operator = (const AliMUONPayloadTrigger& stream);
     virtual ~AliMUONPayloadTrigger();
 
     Bool_t Decode(UInt_t *buffer);
@@ -45,7 +43,7 @@ class AliMUONPayloadTrigger: public TObject {
     AliMUONRegHeader*       GetRegHeader()  const {return fRegHeader;}
     AliMUONDDLTrigger*      GetDDLTrigger() const {return fDDLTrigger;}
 
-  protected :
+  private :
 
     Int_t fMaxReg;        ///< maximum number of regional cards in DATE file
     Int_t fMaxLoc;        ///< maximum number of local cards in DATE file
@@ -54,6 +52,10 @@ class AliMUONPayloadTrigger: public TObject {
     AliMUONRegHeader*        fRegHeader;    //!< pointer for regional structure
     AliMUONLocalStruct*      fLocalStruct;  //!< pointer to local structure
 
+
+    AliMUONPayloadTrigger(const AliMUONPayloadTrigger& stream);
+    AliMUONPayloadTrigger& operator = (const AliMUONPayloadTrigger& stream);
+
     ClassDef(AliMUONPayloadTrigger, 1)    // base class for reading MUON trigger rawdata
 };
 

diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx
index e33b921c027be37e4f1b36f4b7ad4566cdff042a..d97bf18180795efe3206455732c9fba8d46cb566 100644 (file)
--- a/MUON/AliMUONRawStreamTracker.cxx
+++ b/MUON/AliMUONRawStreamTracker.cxx
@@ -47,59 +47,38 @@ AliMUONRawStreamTracker::AliMUONRawStreamTracker()
     fDspId(0),
     fBlkId(0),
     fNextDDL(kTRUE),
-    fMaxDDL(20)
+    fMaxDDL(20),
+    fPayload(new AliMUONPayloadTracker())
 {
   //
   // create an object to read MUON raw digits
   // Default ctor for monitoring purposes
   //
 
-  fPayload = new AliMUONPayloadTracker();
 
 }
 
 //_________________________________________________________________
 AliMUONRawStreamTracker::AliMUONRawStreamTracker(AliRawReader* rawReader)
   : TObject(),
+    fRawReader(rawReader),
     fDDL(0),
     fBusPatchId(0),
     fDspId(0),
     fBlkId(0),
     fNextDDL(kTRUE),
-    fMaxDDL(20)
+    fMaxDDL(20),
+    fPayload(new AliMUONPayloadTracker())
+
 {
   //
   // ctor with AliRawReader as argument
   // for reconstruction purpose
   //
 
-  fRawReader = rawReader;
-  fPayload   = new AliMUONPayloadTracker();
-
-}
 
-//_________________________________________________________________
-AliMUONRawStreamTracker::AliMUONRawStreamTracker(const AliMUONRawStreamTracker& stream) :
-  TObject(stream)
-{ 
-  //
-  // copy ctor
-  //
-  AliFatal("copy constructor not implemented");
 }
 
-//______________________________________________________________________
-AliMUONRawStreamTracker& AliMUONRawStreamTracker::operator = (const AliMUONRawStreamTracker& 
-                                             /* stream */)
-{
-  // 
-  // assignment operator
-  //
-  AliFatal("assignment operator not implemented");
-  return *this;
-}
-
-
 //___________________________________
 AliMUONRawStreamTracker::~AliMUONRawStreamTracker()
 {

diff --git a/MUON/AliMUONRawStreamTracker.h b/MUON/AliMUONRawStreamTracker.h
index 88434e18713d4800e6404b5e043dbdbfb0ad2aed..0554f09ae88c633c42b8df5c203d0970f0444dd8 100644 (file)
--- a/MUON/AliMUONRawStreamTracker.h
+++ b/MUON/AliMUONRawStreamTracker.h
@@ -29,8 +29,6 @@ class AliMUONRawStreamTracker: public TObject {
   public :
     AliMUONRawStreamTracker();
     AliMUONRawStreamTracker(AliRawReader* rawReader);
-    AliMUONRawStreamTracker(const AliMUONRawStreamTracker& stream);
-    AliMUONRawStreamTracker& operator = (const AliMUONRawStreamTracker& stream);
     virtual ~AliMUONRawStreamTracker();
 
     virtual Bool_t   Next();
@@ -55,7 +53,7 @@ class AliMUONRawStreamTracker: public TObject {
     AliMUONDDLTracker*      GetDDLTracker()   const {return fPayload->GetDDLTracker();}
     Int_t                   GetDDL()          const {return fDDL - 1;}
 
-  protected :
+  private :
 
     AliRawReader*    fRawReader;    ///< object for reading the raw data
  
@@ -70,6 +68,9 @@ class AliMUONRawStreamTracker: public TObject {
 
     AliMUONPayloadTracker* fPayload; ///< pointer to payload decoder
 
+    AliMUONRawStreamTracker(const AliMUONRawStreamTracker& stream);
+    AliMUONRawStreamTracker& operator = (const AliMUONRawStreamTracker& stream);
+
     ClassDef(AliMUONRawStreamTracker, 2)    // base class for reading MUON raw digits
 };
 

diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx
index 657da67924fc6843dc45f3ff98eaf5e25febc6f3..7b0a9c1803a6114e12d0c2ed94caa926816dd460 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.cxx
+++ b/MUON/AliMUONRawStreamTrigger.cxx
@@ -41,6 +41,7 @@ ClassImp(AliMUONRawStreamTrigger)
 AliMUONRawStreamTrigger::AliMUONRawStreamTrigger()
   : TObject(),
     fRawReader(0x0),
+    fPayload(new AliMUONPayloadTrigger()),
     fDDL(0),
     fSubEntries(0),
     fNextDDL(kTRUE),
@@ -51,13 +52,14 @@ AliMUONRawStreamTrigger::AliMUONRawStreamTrigger()
   // Default ctor for monitoring purposes
   //
 
-  fPayload = new AliMUONPayloadTrigger();
 
 }
 
 //_________________________________________________________________
 AliMUONRawStreamTrigger::AliMUONRawStreamTrigger(AliRawReader* rawReader)
   : TObject(),
+    fRawReader(rawReader),
+    fPayload(new AliMUONPayloadTrigger()),
     fDDL(0),
     fSubEntries(0),
     fNextDDL(kTRUE),
@@ -69,30 +71,6 @@ AliMUONRawStreamTrigger::AliMUONRawStreamTrigger(AliRawReader* rawReader)
   // for reconstruction purpose
   //
 
-  fRawReader = rawReader;
-  fPayload   = new AliMUONPayloadTrigger();
-
-}
-
-//_________________________________________________________________
-AliMUONRawStreamTrigger::AliMUONRawStreamTrigger(const AliMUONRawStreamTrigger& stream) :
-  TObject(stream)
-{
-  //
-  // copy ctor
-  //
-  AliFatal("copy constructor not implemented");
-}
-
-//______________________________________________________________________
-AliMUONRawStreamTrigger& AliMUONRawStreamTrigger::operator = (const AliMUONRawStreamTrigger& 
-                                             /* stream */)
-{ 
-  // 
-  // assignment operator
-  //
-  AliFatal("assignment operator not implemented");
-  return *this;
 }
 
 //___________________________________

diff --git a/MUON/AliMUONRawStreamTrigger.h b/MUON/AliMUONRawStreamTrigger.h
index 78b0ed564243e4ed1bbeda8e27fa28afa053143a..21cf53ff851f737cf8d655ea299a652ea7288736 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.h
+++ b/MUON/AliMUONRawStreamTrigger.h
@@ -29,8 +29,6 @@ class AliMUONRawStreamTrigger: public TObject {
   public :
     AliMUONRawStreamTrigger();
     AliMUONRawStreamTrigger(AliRawReader* rawReader);
-    AliMUONRawStreamTrigger(const AliMUONRawStreamTrigger& stream);
-    AliMUONRawStreamTrigger& operator = (const AliMUONRawStreamTrigger& stream);
     virtual ~AliMUONRawStreamTrigger();
 
     virtual Bool_t   Next();
@@ -51,7 +49,7 @@ class AliMUONRawStreamTrigger: public TObject {
     AliMUONDDLTrigger* GetDDLTrigger() const {return fPayload->GetDDLTrigger();}
     Int_t              GetDDL()        const {return fDDL - 1;}
 
-  protected :
+  private :
 
     AliRawReader*    fRawReader;     ///< object for reading the raw data
     AliMUONPayloadTrigger* fPayload; ///< pointer to payload decoder
@@ -61,6 +59,9 @@ class AliMUONRawStreamTrigger: public TObject {
     Bool_t fNextDDL;      ///< flag for next DDL to be read
     Int_t  fMaxDDL;       ///< maximum number of DDL in DATE file
 
+    AliMUONRawStreamTrigger(const AliMUONRawStreamTrigger& stream);
+    AliMUONRawStreamTrigger& operator = (const AliMUONRawStreamTrigger& stream);
+
     ClassDef(AliMUONRawStreamTrigger, 3)    // base class for reading MUON trigger rawdata
 };
 

diff --git a/MUON/AliMUONRawWriter.cxx b/MUON/AliMUONRawWriter.cxx
index d8e98854ddf421b4bb4f85d725ea662cb97ed4be..a448b205e630ed7e68e3400d2243f6631406fddf 100644 (file)
--- a/MUON/AliMUONRawWriter.cxx
+++ b/MUON/AliMUONRawWriter.cxx
@@ -87,47 +87,46 @@ Int_t AliMUONRawWriter::fgManuPerBusSwp2NB[12] = {1, 27, 53, 79, 105, 131, 157,
 
 //__________________________________________________________________________
 AliMUONRawWriter::AliMUONRawWriter(AliMUONData* data)
-: TObject(),
-  fScalerEvent(kFALSE)
+  : TObject(),
+    fMUONData(data),
+    fBusArray(new TClonesArray("AliMUONBusStruct",1000)),
+    fBlockHeader(new AliMUONBlockHeader()),
+    fDspHeader(new AliMUONDspHeader()),
+    fBusStruct(new AliMUONBusStruct()),
+    fDarcHeader(new AliMUONDarcHeader()),
+    fRegHeader(new AliMUONRegHeader()),
+    fLocalStruct(new AliMUONLocalStruct()),
+    fBusPatchManager(new AliMpBusPatch()),
+    fCrateManager(new AliMUONTriggerCrateStore()),
+    fScalerEvent(kFALSE),
+    fHeader(),
+    fTrackerTimer(),
+    fTriggerTimer(),
+    fMappingTimer(),
+    fSegFactory(new AliMpSegFactory())
+
 {
   //
   // Standard Constructor
   //
   AliDebug(1,"Standard ctor");
-      
-  // initialize container
-  fMUONData  = data;
+  fFile[0] = fFile[1] = 0x0;  
+  fFile[2] = fFile[3] = 0x0;  
 
   // initialize array
-  fBusArray = new TClonesArray("AliMUONBusStruct",1000);
   fBusArray->SetOwner(kTRUE);
 
-  // ddl tracker pointers
-  fBlockHeader     = new AliMUONBlockHeader();
-  fDspHeader       = new AliMUONDspHeader();
-  fBusStruct       = new AliMUONBusStruct();
-
   // setting data key to default value (only for writting)
   fBlockHeader->SetDataKey(fBlockHeader->GetDefaultDataKey());
   fDspHeader->SetDataKey(fDspHeader->GetDefaultDataKey());
   fBusStruct->SetDataKey(fBusStruct->GetDefaultDataKey());
 
-  // ddl trigger pointers
-  fDarcHeader      = new AliMUONDarcHeader();
-  fRegHeader       = new AliMUONRegHeader();
-  fLocalStruct     = new AliMUONLocalStruct();
-
   // bus patch managers
-  fBusPatchManager = new AliMpBusPatch();
   fBusPatchManager->ReadBusPatchFile();
 
   // Crate manager
-  fCrateManager = new AliMUONTriggerCrateStore();
   fCrateManager->ReadFromFile();
 
-  //Seg factory
-  fSegFactory = new AliMpSegFactory();
-
   // timers
   fTrackerTimer.Start(kTRUE); fTrackerTimer.Stop();
   fTriggerTimer.Start(kTRUE); fTriggerTimer.Stop();
@@ -139,6 +138,7 @@ AliMUONRawWriter::AliMUONRawWriter(AliMUONData* data)
 AliMUONRawWriter::AliMUONRawWriter()
   : TObject(),
     fMUONData(0),
+    fBusArray(0),
     fBlockHeader(0),
     fDspHeader(0),
     fBusStruct(0),
@@ -148,6 +148,10 @@ AliMUONRawWriter::AliMUONRawWriter()
     fBusPatchManager(0),
     fCrateManager(0x0),
     fScalerEvent(kFALSE),
+    fHeader(),
+    fTrackerTimer(),
+    fTriggerTimer(),
+    fMappingTimer(),
     fSegFactory(0x0)
 {
   //
@@ -162,30 +166,6 @@ AliMUONRawWriter::AliMUONRawWriter()
   fMappingTimer.Start(kTRUE); fMappingTimer.Stop();
 }
 
-//_______________________________________________________________________
-AliMUONRawWriter::AliMUONRawWriter (const AliMUONRawWriter& rhs)
-  : TObject(rhs)
-{
-  //
-  // Protected copy constructor
-  //
-  AliFatal("Not implemented.");
-}
-
-//_______________________________________________________________________
-AliMUONRawWriter & 
-AliMUONRawWriter::operator=(const AliMUONRawWriter& rhs)
-{
-  //
-  // Protected assignement operator
-  //
-  if (this == &rhs) return *this;
-
-  AliFatal("Not implemented.");
-    
-  return *this;  
-}
-
 //__________________________________________________________________________
 AliMUONRawWriter::~AliMUONRawWriter(void)
 {

diff --git a/MUON/AliMUONRawWriter.h b/MUON/AliMUONRawWriter.h
index acafba632632e18bb510eb113cfbd65f5f6552e4..d7ba0d941b910b6e262ff716ebd0e7820ede99f2 100644 (file)
--- a/MUON/AliMUONRawWriter.h
+++ b/MUON/AliMUONRawWriter.h
@@ -42,8 +42,6 @@ class AliMUONRawWriter : public TObject
 
 protected:
   AliMUONRawWriter();                  // Default constructor
-  AliMUONRawWriter (const AliMUONRawWriter& rhs); // copy constructor
-  AliMUONRawWriter& operator=(const AliMUONRawWriter& rhs); // assignment operator
 
   // writing raw data
   Int_t WriteTrackerDDL(Int_t iCh);
@@ -96,6 +94,9 @@ private:
   
   AliMpSegFactory* fSegFactory;         //!< mapping segmentation factory
   
+  AliMUONRawWriter (const AliMUONRawWriter& rhs); // copy constructor
+  AliMUONRawWriter& operator=(const AliMUONRawWriter& rhs); // assignment operator
+
   ClassDef(AliMUONRawWriter,1) // MUON cluster reconstructor in ALICE
 };
        

diff --git a/MUON/AliMUONRegHeader.cxx b/MUON/AliMUONRegHeader.cxx
index fe22e929c79bd6e019a45d56911feecdcc9b77d3..62d7bc5d3e0b8722332781797acae24e9036ac78 100644 (file)
--- a/MUON/AliMUONRegHeader.cxx
+++ b/MUON/AliMUONRegHeader.cxx
@@ -41,8 +41,8 @@ AliMUONRegHeader::AliMUONRegHeader()
      fMask(0),
      fL0(0),
      fClk(0),
-     fHold(0)
-
+     fHold(0),
+     fLocalArray(new TClonesArray("AliMUONLocalStruct",16))
 {
   //
   // ctor
@@ -52,8 +52,6 @@ AliMUONRegHeader::AliMUONRegHeader()
   for (Int_t i = 0; i < 8; i++)
     fScaler[i] = 0;
 
-  fLocalArray  = new TClonesArray("AliMUONLocalStruct",16);
-
 }
 
 //___________________________________________
@@ -68,17 +66,18 @@ AliMUONRegHeader::~AliMUONRegHeader()
 
 //___________________________________________
 AliMUONRegHeader::AliMUONRegHeader(const AliMUONRegHeader& event)
-  :  TObject(event)
+  :  TObject(event),
+     fDarcWord(event.fDarcWord),
+     fWord(event.fWord),
+     fMask(event.fMask),
+     fL0(event.fL0),
+     fClk(event.fClk),
+     fHold(event.fHold),
+     fLocalArray(new TClonesArray("AliMUONLocalStruct", 16))
 {
   //
   // copy ctor
   //
-  fDarcWord = event.fDarcWord;
-  fWord     = event.fWord;
-  fClk      = event.fClk;
-  fHold     = event.fHold;
-  fL0       = event.fL0;
-  fMask     = event.fMask;
 
   fInput[0] = event.fInput[0];
   fInput[1] = event.fInput[1];
@@ -86,7 +85,6 @@ AliMUONRegHeader::AliMUONRegHeader(const AliMUONRegHeader& event)
   for (Int_t i = 0; i < 8; i++)
     fScaler[i] = event.fScaler[i];
 
-  fLocalArray = new TClonesArray("AliMUONLocalStruct", 16);
   for (Int_t index = 0; index < (event.fLocalArray)->GetEntriesFast(); index++) {
     {new ((*fLocalArray)[fLocalArray->GetEntriesFast()]) 
         AliMUONLocalStruct(*(AliMUONLocalStruct*)(event.fLocalArray)->At(index));}