Rearranged conditions for faster execution

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

diff --git a/TOF/AliTOFSDigitizer.h b/TOF/AliTOFSDigitizer.h
index 20b7e88a2f2cdde7532d569e97b21978a321839d..a3b86e7baf119313d988852ba0b3d0c47d169b27 100644 (file)
--- a/TOF/AliTOFSDigitizer.h
+++ b/TOF/AliTOFSDigitizer.h
@@ -13,6 +13,7 @@
 #include "TTask.h"
 #include "TString.h"
 class AliRunLoader;
+class AliLoader;
 
 class TF1;
 
@@ -20,19 +21,20 @@ class AliTOFSDigitizer: public TTask {
 
 public:
   AliTOFSDigitizer() ;          // ctor
-  AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1=0, Int_t nEvents=-1) ; // par ctor
+  //AliTOFSDigitizer(const char* HeaderFile) ; // par ctor
+  AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1=-1, Int_t nEvents=0) ; // par ctor
 
   virtual ~AliTOFSDigitizer() ; // dtor
 
-  virtual void  Exec(Option_t *verboseOption, Option_t *allEvents="noAll"); 
+  virtual void  Exec(Option_t *verboseOption); 
   void SetSDigitsFile(char * /*file*/ ) {;}
   
   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 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 Print(Option_t* opt) const ;
-  void  SetFirstEvent(Int_t event1)      {fEvent1=event1;}
-  void  SetSecondEvent(Int_t event2)     {fEvent2=event2;}
+  void  SetFirstEvent(Int_t event1)      {fEvent1 = event1;}
+  void  SetSecondEvent(Int_t event2)     {fEvent2 = event2;}
   Int_t GetFirstEvent()  const {return fEvent1;}
   Int_t GetSecondEvent() const {return fEvent2;}
   Int_t GetNEvents() const {return (fEvent2-fEvent1);}
@@ -51,6 +53,7 @@ public:
   void  SetEffBoundary(Float_t effBoundary)          {fEffBoundary=effBoundary;}
   void  SetEff2Boundary(Float_t eff2Boundary)        {fEff2Boundary=eff2Boundary;}
   void  SetEff3Boundary(Float_t eff3Boundary)        {fEff3Boundary=eff3Boundary;}
+  void  SetAddTRes(Float_t addTRes)                  {fAddTRes=addTRes;}
   void  SetResCenter (Float_t resCenter)             {fResCenter=resCenter;}
   void  SetResBoundary(Float_t resBoundary)          {fResBoundary=resBoundary;}
   void  SetResSlope(Float_t resSlope)                {fResSlope=resSlope;}
@@ -82,6 +85,7 @@ public:
   Float_t  GetEffBoundary()      const {return fEffBoundary;}
   Float_t  GetEff2Boundary()     const {return fEff2Boundary;}
   Float_t  GetEff3Boundary()     const {return fEff3Boundary;}
+  Float_t  GetAddTRes ()         const {return fAddTRes;}
   Float_t  GetResCenter ()       const {return fResCenter;}
   Float_t  GetResBoundary()      const {return fResBoundary;}
   Float_t  GetResSlope()         const {return fResSlope;}
@@ -102,12 +106,16 @@ public:
   Float_t  GetAdcRms()           const {return fAdcRms;}
   
 
+protected:
+
+
 private:
   Int_t   fEvent1;          // lower bound for events to sdigitize
   Int_t   fEvent2;          // upper bound for events to sdigitize
   TF1     *ftail;           // pointer to formula for time with tail
   TString fHeadersFile;     // input file
-  AliRunLoader* fRunLoader;  //! Run Loader
+  AliRunLoader* fRunLoader; //! Run Loader
+  AliLoader* fTOFLoader;    //! Loader
   
 
   Int_t fSelectedSector;    // sector number for sdigitization
@@ -119,17 +127,19 @@ private:
   Float_t fpadefficiency;   // intrinsic pad efficiency, used if fEdgeEffect==0
   Int_t   fEdgeEffect;      // edge effects option
   Int_t   fEdgeTails;       // edge tails option
-  Float_t fHparameter;      // sensitive edge (to produce hits on the
-  // neighbouring pads) =0.7, new = 0.4 cm
+  Float_t fHparameter;      // sensitive edge (to produce hits on the neighbouring pads)
+                            //                 0.7 cm (old); 0.4 cm (new)
   Float_t fH2parameter;     // parameter to fit the efficiency
-  Float_t fKparameter;      // sensitive edge (going ahead towards the
-  // center no delay effects are suffered) =1.0, new = 0.5 cm
+  Float_t fKparameter;      // sensitive edge (going ahead towards the center
+                            // no delay effects are suffered) 1.0 cm (old); 0.5 cm (new)
   Float_t fK2parameter;     // parameter to fit the efficiency
   // Pad Efficiency and Resolution parameters
   Float_t fEffCenter;       // efficiency in the central region of the pad
   Float_t fEffBoundary;     // efficiency at the boundary of the pad
   Float_t fEff2Boundary;    // efficiency value at H2parameter
   Float_t fEff3Boundary;    // efficiency value at K2parameter
+  Float_t fAddTRes;         // additional contribution to 
+                            // the intrinsic MRPC time resolution (ps)
   Float_t fResCenter;       // resolution (ps) in the central region of the pad
   Float_t fResBoundary;     // resolution (ps)  at the boundary of the pad
   Float_t fResSlope;        // slope (ps/K) for neighbouring pad
@@ -154,9 +164,6 @@ private:
   Float_t fAdcMean;     // mean value for the ADC spectrum [bins]
   Float_t fAdcRms;      // rms value for the ADC spectrum [bins]
 
- protected:
-
-
   ClassDef(AliTOFSDigitizer,2)  // creates TOF SDigits
 
 };