#101318: Patch for various problems in AliROOT

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

diff --git a/TOF/AliTOFSDigitizer.h b/TOF/AliTOFSDigitizer.h
index 9e37f9253052376a7a66c2917320f28270f5b286..c0df7d4124b1c8b7c856d941fb7e705785c57681 100644 (file)
--- a/TOF/AliTOFSDigitizer.h
+++ b/TOF/AliTOFSDigitizer.h
@@ -1,39 +1,50 @@
-#ifndef ALITOFSDigitizer_H
-#define ALITOFSDigitizer_H
+#ifndef ALITOFSDIGITIZER_H
+#define ALITOFSDIGITIZER_H
+
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+//__________________________________________//
+//                                          //
+//       Class for making SDigits in TOF    // 
+//                                          //
+//-- Authors: F. Pierella, A. De Caro       //
+//                                          //
+//__________________________________________//
 
-//_________________________________________________________________________
-//  Task Class for making SDigits in TOF      
-//                  
-//-- Authors: F. Pierella, A. De Caro
+/* $Id$ */
 
+#include "TNamed.h"
+
+class TF1;
+class TString;
 
-#include "TTask.h"
-#include "TString.h"
-class AliRunLoader;
 class AliLoader;
+class AliRunLoader;
 
-class TF1;
+class AliTOFcalib;
 
-class AliTOFSDigitizer: public TTask {
+class AliTOFSDigitizer: public TNamed {
 
 public:
   AliTOFSDigitizer() ;          // ctor
   //AliTOFSDigitizer(const char* HeaderFile) ; // par ctor
   AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1=-1, Int_t nEvents=0) ; // par ctor
 
+  AliTOFSDigitizer(const AliTOFSDigitizer &source); // copy constructor
+  AliTOFSDigitizer& operator=(const AliTOFSDigitizer &/*source*/); // ass. op.
+
   virtual ~AliTOFSDigitizer() ; // dtor
 
   //static Float_t WidthTdcBin() {return fgkTdcBin;};
 
-  virtual void  Exec(Option_t *verboseOption); 
-  void SetSDigitsFile(char * /*file*/ ) {;}
+  virtual void  Digitize(Option_t *verboseOption); 
+  void SetSDigitsFile(char * /*file*/ ) const {;}
   
   void InitParameters();
   virtual void PrintParameters() const ;
   virtual void SimulateDetectorResponse(Float_t z0, Float_t x0, Float_t geantTime, Int_t& nActivatedPads, Int_t& nFiredPads, Bool_t* isFired, Int_t* nPlace, Float_t* qInduced, Float_t* tofTime, Float_t& averageTime);
+  virtual void SimulateDetectorResponseOLD(Float_t z0, Float_t x0, Float_t geantTime, Int_t& nActivatedPads, Int_t& nFiredPads, Bool_t* isFired, Int_t* nPlace, Float_t* qInduced, Float_t* tofTime, Float_t& averageTime);
   virtual void Print(Option_t* opt) const ;
   void  SetFirstEvent(Int_t event1)      {fEvent1 = event1;}
   void  SetSecondEvent(Int_t event2)     {fEvent2 = event2;}
@@ -76,6 +87,8 @@ public:
   void  SetAdcMean(Float_t adcMean)                  {fAdcMean=adcMean;}
   void  SetAdcRms(Float_t adcRms)                    {fAdcRms=adcRms;}
 
+  void SetTimeResolution(Float_t time) {fTimeResolution=time;}
+
   Float_t  GetPadefficiency()    const {return fpadefficiency;}
   Int_t    GetEdgeEffect()       const {return fEdgeEffect;}
   Int_t    GetEdgeTails()        const {return fEdgeTails;}
@@ -107,6 +120,8 @@ public:
   Float_t  GetAdcMean()          const {return fAdcMean;}
   Float_t  GetAdcRms()           const {return fAdcRms;}
   
+  Float_t  GetTimeResolution()  const {return fTimeResolution;}
+
 
 protected:
 
@@ -118,14 +133,13 @@ private:
   TString fHeadersFile;     // input file
   AliRunLoader* fRunLoader; //! Run Loader
   AliLoader* fTOFLoader;    //! Loader
-  
 
   Int_t fSelectedSector;    // sector number for sdigitization
   Int_t fSelectedPlate ;    // plate  number for sdigitization
 
   // detector response simulation
   // Intrisic MRPC time resolution and pad (edge effect) parameters
-  Float_t fTimeResolution;  // time resolution of the MRPC (ns)
+  Float_t fTimeResolution;   // time resolution (ps)
   Float_t fpadefficiency;   // intrinsic pad efficiency, used if fEdgeEffect==0
   Int_t   fEdgeEffect;      // edge effects option
   Int_t   fEdgeTails;       // edge tails option
@@ -166,8 +180,10 @@ private:
   Float_t fAdcMean;     // mean value for the ADC spectrum [bins]
   Float_t fAdcRms;      // rms value for the ADC spectrum [bins]
 
-  ClassDef(AliTOFSDigitizer,2)  // creates TOF SDigits
+  AliTOFcalib * fCalib; //! calibration object
+
+  ClassDef(AliTOFSDigitizer,5)  // creates TOF SDigits
 
 };
 
-#endif // AliTOFSDigitizer_H
+#endif // AliTOFSDIGITIZER_H