rewriting of objects (binning change)

[u/mrichter/AliRoot.git] / PMD / AliPMDDigitizer.h

diff --git a/PMD/AliPMDDigitizer.h b/PMD/AliPMDDigitizer.h
index a7987fd9326b2a4952dab462fd5071e57bf813f2..004beb23505fe56882ff583193b9b3fe5d402af3 100644 (file)
--- a/PMD/AliPMDDigitizer.h
+++ b/PMD/AliPMDDigitizer.h
@@ -28,7 +28,7 @@ class AliDetector;
 class AliPMDhit;
 class AliHit;
 class AliHeader;
-class AliRunDigitizer;
+class AliDigitizationInput;
 class AliCDBManager;
 class AliCDBStorage;
 
@@ -45,7 +45,7 @@ class AliPMDDigitizer:public AliDigitizer
   AliPMDDigitizer();
   AliPMDDigitizer(const AliPMDDigitizer &digitizer);  // copy constructor
   AliPMDDigitizer &operator=(const AliPMDDigitizer &digitizer); // assign op
-  AliPMDDigitizer(AliRunDigitizer *manager);
+  AliPMDDigitizer(AliDigitizationInput* digInput);
   virtual ~AliPMDDigitizer();
 
   void OpengAliceFile(const char *file, Option_t *option);
@@ -53,13 +53,14 @@ class AliPMDDigitizer:public AliDigitizer
   void Hits2SDigits(Int_t ievt);
   void Hits2Digits(Int_t ievt);
   void SDigits2Digits(Int_t ievt);
-  void Exec(Option_t *option);
+  void Digitize(Option_t *option);
   void MergeSDigits(Int_t filenumber, Int_t troffset);
+  void TrackAssignment2CPVCell();
   void TrackAssignment2Cell();
   void MeV2ADC(Float_t mev, Float_t & adc) const;
-  void AddSDigit(Int_t trnumber, Int_t det, Int_t smnumber, 
+  void AddSDigit(Int_t trnumber, Int_t trpid, Int_t det, Int_t smnumber, 
                 Int_t irow, Int_t icol, Float_t adc);
-  void AddDigit(Int_t trnumber, Int_t det, Int_t smnumber, 
+  void AddDigit(Int_t trnumber, Int_t trpid, Int_t det, Int_t smnumber, 
                Int_t irow, Int_t icol, Float_t adc);
   void  SetZPosition(Float_t zpos);
   Float_t GetZPosition() const;
@@ -87,8 +88,9 @@ class AliPMDDigitizer:public AliDigitizer
   TClonesArray *fSDigits;    //! List of summable digits
   TClonesArray *fDigits;     //! List of digits
 
+  TObjArray     fCPVCell;     //! List of cpv cells   
   TObjArray     fCell;       //! List of pmd cells
-
+  
   Int_t   fNsdigit;          // Summable digits counter
   Int_t   fNdigit;           // Digits counter
   Int_t   fDetNo;            // Detector Number (0:PRE, 1:CPV)
@@ -97,14 +99,27 @@ class AliPMDDigitizer:public AliDigitizer
   static const Int_t fgkTotUM = 24; // Total Unit modules in one detector
   static const Int_t fgkRow   = 48; // Total number of rows in one unitmodule
   static const Int_t fgkCol   = 96; // Total number of cols in one unitmodule
+
   Float_t fCPV[fgkTotUM][fgkRow][fgkCol]; //! CPV Array containing total edep
   Float_t fPRE[fgkTotUM][fgkRow][fgkCol]; //! PRE Array containing total edep
+  
+  Int_t   fCPVCounter[fgkTotUM][fgkRow][fgkCol]; //! Number of times each cell
+                                                 // is fired in CPV
   Int_t   fPRECounter[fgkTotUM][fgkRow][fgkCol]; //! Number of times each cell
                                                  // is fired in PMD
-  Int_t   fPRETrackNo[fgkTotUM][fgkRow][fgkCol]; //! PRE Array containing track number
-  Int_t   fCPVTrackNo[fgkTotUM][fgkRow][fgkCol]; //! CPV Array containing track number
 
-  ClassDef(AliPMDDigitizer,7)    // To digitize PMD Hits
+  Int_t   fCPVTrackNo[fgkTotUM][fgkRow][fgkCol]; //! CPV Array containing 
+                                                 //  track number
+  Int_t   fPRETrackNo[fgkTotUM][fgkRow][fgkCol]; //! PRE Array containing 
+                                                 //  track number
+
+  Int_t   fCPVTrackPid[fgkTotUM][fgkRow][fgkCol]; //! CPV Array containing 
+                                                 //  track number
+  Int_t   fPRETrackPid[fgkTotUM][fgkRow][fgkCol]; //! PRE Array containing 
+                                                 //  track number
+
+  
+  ClassDef(AliPMDDigitizer,9)    // To digitize PMD Hits
 };
 #endif