Merge branch 'master_patch'

[u/mrichter/AliRoot.git] / FMD / AliFMDDigitizer.h

diff --git a/FMD/AliFMDDigitizer.h b/FMD/AliFMDDigitizer.h
index 22ceced04bb6ca690ec45b7ee0df010f54213ae7..08e972f2378610e6131b872b69e31363e5cddd90 100644 (file)
--- a/FMD/AliFMDDigitizer.h
+++ b/FMD/AliFMDDigitizer.h
@@ -5,7 +5,7 @@
  *
  * See cxx source for full Copyright notice                               
  */
-// Classses to make Hits into digits and summable digits. 
+// Classses to make SDigits into Digits 
 //    
 //    Digits consists of
 //    - Detector #
@@ -42,61 +42,51 @@ class AliFMDDigit;
 
 
 //====================================================================
-/** @class AliFMDDigitizer
-    @brief Concrete digitizer to make digits from hits.  See also
-    AliFMDBaseDigitizer documentation.  
-    @ingroup FMD_sim
+/** 
+ * @class AliFMDDigitizer
+ * @brief Concrete digitizer to make digits from hits.  See also
+ * AliFMDBaseDigitizer documentation.  
+ *
+ * @ingroup FMD_sim
  */
 class AliFMDDigitizer : public AliFMDBaseDigitizer 
 {
 public:
-  /** CTOR */
-  AliFMDDigitizer();
-  /** CTOR 
-      @param manager Manager of digitization */
-  AliFMDDigitizer(AliRunDigitizer * manager);
-  /** DTOR */
+  /** 
+   * CTOR 
+   */
+  AliFMDDigitizer() : AliFMDBaseDigitizer() {}
+  /** 
+   * CTOR 
+   *
+   * @param input Input of digitization 
+   */
+  AliFMDDigitizer(AliDigitizationInput * digInput)
+    : AliFMDBaseDigitizer(digInput) {}
+  /** 
+   * DTOR 
+   */
   virtual ~AliFMDDigitizer() {}
-  /** Do everything
-      @param option Not used */
-  virtual void  Exec(Option_t* option=0);
+  /** 
+   * Initialise 
+   */
+  virtual Bool_t Init();
+  /** 
+   * Execute this digitizer.  
+   * This member function will be called once per event by the passed
+   * AliDigitizationInput* digInput object. 
+   *
+   * @param options Not used 
+   */
+  virtual void Digitize(Option_t* option="");
 protected:
-  /** Add a digit to output.
-      @param fmd      Pointer to detector object
-      @param detector Detector #
-      @param ring     Ring ID
-      @param sector   Sector number
-      @param strip    Strip number
-      @param edep     Energy deposited (not used)
-      @param count1   ADC count 1
-      @param count2   ADC count 2 (-1 if not used)
-      @param count3   ADC count 3 (-1 if not used) */
-  virtual void     AddDigit(AliFMD*  fmd,
-                           UShort_t detector, 
-                           Char_t   ring,
-                           UShort_t sector, 
-                           UShort_t strip, 
-                           Float_t  edep, 
-                           UShort_t count1, 
-                           Short_t  count2, 
-                           Short_t  count3) const;
-  /** MAke a pedestal
-      @param detector Detector #
-      @param ring     Ring ID
-      @param sector   Sector number
-      @param strip    Strip number
-      @return Random noise */
-  virtual UShort_t MakePedestal(UShort_t  detector, 
-                               Char_t    ring, 
-                               UShort_t  sector, 
-                               UShort_t  strip) const;
-  /** Check that digit data is consistent
-      @param digit   Digit
-      @param nhits   Number of hits
-      @param counts  ADC counts */
-  virtual void     CheckDigit(AliFMDDigit*    digit,
-                             UShort_t        nhits,
-                             const TArrayI&  counts);
+  /** 
+   * Sum contributions from SDigits 
+   *
+   * @param sdigitsBranch Branch of SDigit data 
+   */
+  void SumContributions(TBranch* sdigitsBranch);
+  
   ClassDef(AliFMDDigitizer,1) // Make Digits from Hits
 };