fix for valgrind reports, mem leak and invalid read

[u/mrichter/AliRoot.git] / TOF / AliTOFDDLRawData.h

diff --git a/TOF/AliTOFDDLRawData.h b/TOF/AliTOFDDLRawData.h
index 112d37610910c25b5beea9b905d1c210ae71a4c9..84309fb1bb4a2889d2c4efa8f15d4d33027a34cd 100644 (file)
--- a/TOF/AliTOFDDLRawData.h
+++ b/TOF/AliTOFDDLRawData.h
@@ -1,5 +1,5 @@
-#ifndef AliTOFDDLRAWDATA_H
-#define AliTOFDDLRAWDATA_H
+#ifndef ALITOFDDLRAWDATA_H
+#define ALITOFDDLRAWDATA_H
 
 /* Copyright(c) 1998-2003, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
@@ -12,12 +12,13 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "TObject.h"
+//#include "AliTOFCableLengthMap.h"
 
 class TBranch;
 class TClonesArray;
 
 class AliTOFDigitMap;
-class AliTOFRawStream;
+//class AliTOFRawStream;
 
 class AliTOFDDLRawData:public TObject {
 
@@ -51,12 +52,12 @@ class AliTOFDDLRawData:public TObject {
   void  MakeLTMtrailer(UInt_t *buf);
   void  MakeTRMheader(Int_t nTRM, UInt_t *buf);
   void  MakeTRMtrailer(UInt_t *buf);
-  void  MakeTRMfiller(UInt_t *buf, UInt_t nWordsPerTRM);
+  void  MakeTRMfiller(UInt_t *buf);
   void  MakeTRMchainHeader(Int_t iChain, Int_t nTRM, UInt_t *buf);
   void  MakeTRMchainTrailer(Int_t iChain, UInt_t *buf);
-  void  MakeTDCdigits(Int_t nDDL, Int_t nTRM, Int_t iChain, UInt_t *buf, UInt_t &nWordsPerTRM);
+  void  MakeTDCdigits(Int_t nDDL, Int_t nTRM, Int_t iChain, UInt_t *buf);
 
-  UInt_t MakeFiller();
+  UInt_t MakeFiller() const;
 
   Bool_t HeadOrTail() const;
 
@@ -76,10 +77,12 @@ class AliTOFDDLRawData:public TObject {
 
   TClonesArray *fTOFdigitArray;   //Pointer to the TOF digits
 
-  AliTOFRawStream *fTOFrawStream; //Pointer to the AliTOFRawStream class
+  Int_t fWordsPerDRM;
+  Int_t fWordsPerTRM;
+  Int_t fWordsPerChain;
 
-  ClassDef(AliTOFDDLRawData,2)
+  ClassDef(AliTOFDDLRawData,4)
 
 };
     
-#endif
+#endif // ALITOFDDLRAWDATA_H