Fixes for invalid write, detected by valgrind

[u/mrichter/AliRoot.git] / TRD / AliTRDdigitizer.h

diff --git a/TRD/AliTRDdigitizer.h b/TRD/AliTRDdigitizer.h
index af091731f38c8b35633e98233615280b52daf4bf..304fa8b677f6431c1eb8ae7e91ee605a2bf164c6 100644 (file)
--- a/TRD/AliTRDdigitizer.h
+++ b/TRD/AliTRDdigitizer.h
@@ -16,7 +16,7 @@
 class TFile;
 class TF1;
 
-class AliRunDigitizer;
+class AliDigitizationInput;
 class AliRunLoader;
 
 class AliTRD;
@@ -24,6 +24,7 @@ class AliTRDdigitsManager;
 class AliTRDgeometry;
 class AliTRDarraySignal;
 class AliTRDarrayADC;
+class AliTRDmcmSim;
 
 class AliTRDdigitizer : public AliDigitizer {
 
@@ -31,8 +32,8 @@ class AliTRDdigitizer : public AliDigitizer {
 
   AliTRDdigitizer();
   AliTRDdigitizer(const Text_t *name, const Text_t *title);
-  AliTRDdigitizer(AliRunDigitizer *manager, const Text_t *name, const Text_t *title);
-  AliTRDdigitizer(AliRunDigitizer *manager);
+  AliTRDdigitizer(AliDigitizationInput* digInput, const Text_t *name, const Text_t *title);
+  AliTRDdigitizer(AliDigitizationInput* digInput);
   AliTRDdigitizer(const AliTRDdigitizer &d);
   virtual             ~AliTRDdigitizer();
   AliTRDdigitizer     &operator=(const AliTRDdigitizer &d);
@@ -40,7 +41,7 @@ class AliTRDdigitizer : public AliDigitizer {
   virtual void         Copy(TObject &d) const;
           Bool_t       InitDetector();
           void         InitOutput(Int_t iEvent);
-  virtual void         Exec(const Option_t * const option = 0);  
+  virtual void         Digitize(const Option_t * option = 0);  
 
   virtual Bool_t       Open(const Char_t *file, Int_t nEvent = 0);
   virtual Bool_t       Open(AliRunLoader * const runLoader, Int_t nEvent = 0);
@@ -77,11 +78,9 @@ class AliTRDdigitizer : public AliDigitizer {
 
           Bool_t       GetCompress() const                         { return fCompress;       }
           Bool_t       GetSDigits() const                          { return fSDigits;        }
-          Float_t      GetLorentzFactor(Float_t vdrift);
 
-          Int_t        Diffusion(Float_t vdrift, Double_t absdriftlength
+          Int_t        Diffusion(Float_t vdrift, Double_t absdriftlength, Double_t exbvalue
                                , Double_t &lRow, Double_t &lCol, Double_t &lTime);
-          Int_t        ExB(Float_t vdrift, Double_t driftlength, Double_t &lRow);
          void         RunDigitalProcessing(Int_t det = 0);
 
  protected:
@@ -93,6 +92,8 @@ class AliTRDdigitizer : public AliDigitizer {
   AliTRD              *fTRD;                //! TRD detector class
   AliTRDgeometry      *fGeo;                //! TRD geometry
 
+  AliTRDmcmSim        *fMcmSim;             //! MCM simulation for digital processing
+
           Int_t        fEvent;              //! Event number
           Int_t       *fMasks;              //! Masks for the merging
           Bool_t       fCompress;           //  Switch to keep only compressed data in memory