coverity #24434 #24433, add check on nullness of primary particles pointer, default...

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

diff --git a/TOF/AliTOFDigitMap.h b/TOF/AliTOFDigitMap.h
index a3d8eef7ac31f21bef073607f31fa440a7b613fc..24e3d7ab585d770277401199ba5abc6be8789cba 100644 (file)
--- a/TOF/AliTOFDigitMap.h
+++ b/TOF/AliTOFDigitMap.h
@@ -13,53 +13,64 @@
 //                                                          //
 //   Author: F. Pierella | pierella@bo.infn.it              //
 //                                                          //
+// Modified by A. De Caro | decaro@sa.infn.it               //
+//                                                          //
 //////////////////////////////////////////////////////////////
 
 #include "TObject.h"
 
 #include "AliHitMap.h"
 
-class TClonesArray;
-class AliTOFGeometry;
-
 class AliTOFDigitMap : public TObject
 {
  public:
     AliTOFDigitMap();
-    AliTOFDigitMap(TClonesArray *dig, AliTOFGeometry *tofGeom);
     AliTOFDigitMap(const AliTOFDigitMap & digitMap);
     
     virtual ~AliTOFDigitMap();
-    // Clear the hit map
-    virtual  void  Clear(const char *opt = "");
-    // Set a single hit
-    virtual  void  SetHit(Int_t *vol, Int_t idigit);
-    virtual  void  SetHit(Int_t *vol);
-    // Get index of hit in the list of digits
-    virtual Int_t  GetHitIndex(Int_t *vol) const;
-    // Get pointer to digit
-    virtual TObject*  GetHit(Int_t *vol) const;
-    // Test hit status
-    virtual FlagType TestHit(Int_t *vol) const;
+
+    // Clear the digit map
+    virtual void  Clear(const Option_t* opt = "");
+    // Add a single digit
+    void  AddDigit(Int_t *vol, Int_t idigit);
+
+    // Get index of digit in the cell labelled by vol
+    Int_t  GetDigitIndex(Int_t *vol, Int_t index) const;
+    // Get indices of digits in the cell labelled by vol
+    void   GetDigitIndex(Int_t *vol, Int_t *index) const;
+
+    // Test digit status
+    virtual FlagType TestDigit(Int_t *vol) const;
+
     // Assignment operator
     AliTOFDigitMap& operator = (const AliTOFDigitMap& rhs);
     
+    Int_t  GetFilledCellNumber() const;
+    Bool_t StripDigitCheck(Int_t iSector, Int_t iPlate, Int_t iStrip) const;
+    Int_t  DigitInStrip(Int_t iSector, Int_t iPlate, Int_t iStrip) const;
+    Int_t  FilledCellsInStrip(Int_t iSector, Int_t iPlate, Int_t iStrip) const;
+    void   ResetDigitNumber(Int_t *vol, Int_t dig);
+    void   ResetDigit(Int_t *vol, Int_t dig);
+    void   ResetDigit(Int_t *vol);
+    Int_t  GetNumberOfDigits(Int_t *vol);
+
+    enum {
+      kMaxDigitsPerPad = 10
+    };
+
  private:
     // Check index
-    Int_t CheckedIndex(Int_t *vol) const;
- private:
+    Int_t CheckedIndex(Int_t * const vol) const;
+
     Int_t fNSector;                       // Number of sectors
     Int_t fNplate;                        // Number of plates
     Int_t fNstrip;                        // Maximum number of strips
     Int_t fNpx;                           // Number of pads in x
     Int_t fNpz;                           // Number of pads in z
 
-    TClonesArray *fDigits;                // Pointer to sdigits
     Int_t fMaxIndex;                      // maximum index in hit map
-    Int_t *fDigitMap;                     // ! [fMaxIndex]         
-
-    AliTOFGeometry *fTOFGeometry;         // Pointer to the TOF geometry
+    Int_t **fDigitMap;                    // ! [fMaxIndex][kMaxDigitsPerPad]
 
-    ClassDef(AliTOFDigitMap,0) // Implements DigitMap as a 1-dim array
+    ClassDef(AliTOFDigitMap,2) // Implements DigitMap as a 1-dim array
 };
 #endif