Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/FMD/AliFMDBaseDigitizer.h b/FMD/AliFMDBaseDigitizer.h
index 351e5542f31f185c1b39c493c2349a2cc855dff4..0c9e85da50ea6097e8cefc97fe8d76997112e79a 100644 (file)
--- a/FMD/AliFMDBaseDigitizer.h
+++ b/FMD/AliFMDBaseDigitizer.h
@@ -32,7 +32,7 @@
 # include <AliDigitizer.h>
 #endif
 #ifndef ALIRUNDIGITIZER_H
-# include <AliRunDigitizer.h>
+# include <AliDigitizationInput.h>
 #endif
 #ifndef ALIFMDEdepMAP_H
 # include "AliFMDEdepMap.h"
@@ -160,7 +160,7 @@ public:
   AliFMDBaseDigitizer();
   /** Normal CTOR 
       @param manager Manager of digitization */
-  AliFMDBaseDigitizer(AliRunDigitizer * manager);
+  AliFMDBaseDigitizer(AliDigitizationInput * digInp);
   /** Normal ctor 
       @param name Name 
       @param title Title */
@@ -251,13 +251,14 @@ protected:
   virtual TTree* MakeOutputTree(AliLoader* loader);
   /** Store the data using the loader 
       @param loader The loader */
-  virtual void StoreDigits(AliLoader* loader);
+  virtual void StoreDigits(const AliLoader* loader);
 
   AliFMD*         fFMD;              // Detector object 
   AliRunLoader*   fRunLoader;       //! Run loader
   AliFMDEdepMap   fEdep;             // Cache of Energy from hits 
   Float_t         fShapingTime;      // Shaping profile parameter
   Bool_t          fStoreTrackRefs;   // Wether to store track references
+  mutable Int_t   fIgnoredLabels;    //! Number of labels not assigned 
   
   /** Copy CTOR 
       @param o object to copy from  */
@@ -267,20 +268,17 @@ protected:
       fRunLoader(0),
       fEdep(o.fEdep),
       fShapingTime(o.fShapingTime),
-      fStoreTrackRefs(o.fStoreTrackRefs)
+      fStoreTrackRefs(o.fStoreTrackRefs), 
+      fIgnoredLabels(o.fIgnoredLabels)
   {}
-  /** Assignment operator
-      @return Reference to this object */
-  AliFMDBaseDigitizer& operator=(const AliFMDBaseDigitizer& o) 
-  { 
-    AliDigitizer::operator=(o);
-    fRunLoader      = o.fRunLoader;
-    fEdep           = o.fEdep;
-    fShapingTime    = o.fShapingTime;
-    fStoreTrackRefs = o.fStoreTrackRefs;
-    return *this; 
-  }
-  ClassDef(AliFMDBaseDigitizer,3) // Base class for FMD digitizers
+  /** 
+   * Assignment operator
+   * 
+   * @return Reference to this object 
+   */
+  AliFMDBaseDigitizer& operator=(const AliFMDBaseDigitizer& o);
+
+  ClassDef(AliFMDBaseDigitizer,5) // Base class for FMD digitizers
 };