defects fixed

[u/mrichter/AliRoot.git] / PMD / AliPMDBlockHeader.cxx

diff --git a/PMD/AliPMDBlockHeader.cxx b/PMD/AliPMDBlockHeader.cxx
index 8c82afa0f3968e43d909a3dba658099c7d7f6c0b..50f029a8c43d00269cc97b867ae74683d590919e 100644 (file)
--- a/PMD/AliPMDBlockHeader.cxx
+++ b/PMD/AliPMDBlockHeader.cxx
@@ -26,14 +26,14 @@ const Int_t  AliPMDBlockHeader::fgkHeaderLength = 8;
 //------------------------------------------------------------
 AliPMDBlockHeader::AliPMDBlockHeader()
   :  TObject(),
+     fDataKey(0),
      fTotalLength(0),
      fRawDataLength(0),
      fDspId(0),
-     fTrWord1(0),
-     fTrWord2(0),
-     fTrWord3(0),
-     fTrWord4(0),
-     fPadWord(0)
+     fL0Trigger(0),
+     fMiniEventId(0),
+     fEventId1(0),
+     fEventId2(0)
 {
   //
   // ctor
@@ -50,21 +50,20 @@ AliPMDBlockHeader::~AliPMDBlockHeader()
 }
 
 //___________________________________________
-AliPMDBlockHeader::AliPMDBlockHeader(const AliPMDBlockHeader & blockh)
-  :  TObject()
+AliPMDBlockHeader::AliPMDBlockHeader(const AliPMDBlockHeader & blockh):
+  TObject(),
+  fDataKey(blockh.fDataKey),
+  fTotalLength(blockh.fTotalLength),
+  fRawDataLength(blockh.fRawDataLength),
+  fDspId(blockh.fDspId),
+  fL0Trigger(blockh.fL0Trigger),
+  fMiniEventId(blockh.fMiniEventId),
+  fEventId1(blockh.fEventId1),
+  fEventId2(blockh.fEventId2)
 {
   //
   // copy ctor
   //
-
-  fTotalLength = blockh.fTotalLength;
-  fRawDataLength      = blockh.fRawDataLength;
-  fDspId       = blockh.fDspId;
-  fTrWord1     = blockh.fTrWord1;
-  fTrWord2     = blockh.fTrWord2;
-  fTrWord3     = blockh.fTrWord3;
-  fTrWord4     = blockh.fTrWord4;
-  fPadWord     = blockh.fPadWord;
 }
 
 //___________________________________________
@@ -74,29 +73,28 @@ AliPMDBlockHeader::operator=(const AliPMDBlockHeader &blockh)
   // 
   // assignment operator
   //
-  if (this == &blockh) return *this;
-
-  fTotalLength = blockh.fTotalLength;
-  fRawDataLength      = blockh.fRawDataLength;
-  fDspId       = blockh.fDspId;
-  fTrWord1     = blockh.fTrWord1;
-  fTrWord2     = blockh.fTrWord2;
-  fTrWord3     = blockh.fTrWord3;
-  fTrWord4     = blockh.fTrWord4;
-  fPadWord     = blockh.fPadWord;
-
+  if (this != &blockh)
+    {
+      fDataKey       = blockh.fDataKey;
+      fTotalLength   = blockh.fTotalLength;
+      fRawDataLength = blockh.fRawDataLength;
+      fDspId         = blockh.fDspId;
+      fL0Trigger     = blockh.fL0Trigger;
+      fMiniEventId   = blockh.fMiniEventId;
+      fEventId1      = blockh.fEventId1;
+      fEventId2      = blockh.fEventId2;
+    }
   return *this;
 }
 void AliPMDBlockHeader::SetHeader(Int_t *header)
 {
-  fTotalLength   = header[0];
-  fRawDataLength = header[1];
-  fDspId         = header[2];
-  fTrWord1       = header[3];
-  fTrWord2       = header[4];
-  fTrWord3       = header[5];
-  fTrWord4       = header[6];
-  fPadWord       = header[7];
-
+  fDataKey       = header[0];
+  fTotalLength   = header[1];
+  fRawDataLength = header[2];
+  fDspId         = header[3];
+  fL0Trigger     = header[4];
+  fMiniEventId   = header[5];
+  fEventId1      = header[6];
+  fEventId2      = header[7];
 }