New mapping in agreement with the new instructions from Paolo and Giacinto

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

diff --git a/TOF/AliTOFDigitMap.cxx b/TOF/AliTOFDigitMap.cxx
index 7f8690dc74172ed886d7eb6c6e56d9d17f3e5b2a..d120be1ba3e142321247ca523d74974ab4ee33da 100644 (file)
--- a/TOF/AliTOFDigitMap.cxx
+++ b/TOF/AliTOFDigitMap.cxx
@@ -13,6 +13,12 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/*
+$Log$
+Revision 1.12  2007/02/20 15:57:00  decaro
+Raw data update: to read the TOF raw data defined in UNPACKED mode
+
+*/
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -49,8 +55,7 @@ AliTOFDigitMap::AliTOFDigitMap():
   fNpx(-1),
   fNpz(-1),
   fMaxIndex(-1),
-  fDigitMap(0x0),
-  fTOFGeometry(new AliTOFGeometry())
+  fDigitMap(0x0)
 {
 //
 // Default ctor
@@ -58,7 +63,7 @@ AliTOFDigitMap::AliTOFDigitMap():
 
   fNSector = AliTOFGeometry::NSectors();
   fNplate = AliTOFGeometry::NPlates();
-  fNstrip = fTOFGeometry->NStripC();//fTOFGeometry->NMaxNstrip();
+  fNstrip = AliTOFGeometry::NStripC();
   fNpx  = AliTOFGeometry::NpadX();
   fNpz  = AliTOFGeometry::NpadZ();
   fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpz;
@@ -77,8 +82,7 @@ AliTOFDigitMap::AliTOFDigitMap(const AliTOFDigitMap & /*digitMap*/):
   fNpx(-1),
   fNpz(-1),
   fMaxIndex(-1),
-  fDigitMap(0x0),
-  fTOFGeometry(new AliTOFGeometry())
+  fDigitMap(0x0)
 {
 //
 // Dummy copy constructor
@@ -98,7 +102,6 @@ AliTOFDigitMap::~AliTOFDigitMap()
     for (Int_t i=0; i<fMaxIndex; i++)  delete[] fDigitMap[i];
   }
 
-  fTOFGeometry = 0;
 
 }
 
@@ -220,3 +223,33 @@ AliTOFDigitMap & AliTOFDigitMap::operator = (const AliTOFDigitMap & /*rhs*/)
 // Dummy assignment operator
     return *this;
 }
+////////////////////////////////////////////////////////////////////////
+Int_t AliTOFDigitMap::GetFilledCellNumber() const
+{
+  //
+  // Returns the number of filled cells of the TOF digit map
+  //
+
+  Int_t volume[5] = {-1, -1, -1, -1, -1};
+  Int_t counter = 0;
+
+  for (Int_t iSector=0; iSector<fNSector; iSector++)
+    for (Int_t iPlate=0; iPlate<fNplate; iPlate++)
+      for (Int_t iStrip=0; iStrip<fNstrip; iStrip++)
+       for (Int_t iPadX=0; iPadX<fNpx; iPadX++)
+         for (Int_t iPadZ=0; iPadZ<fNpz; iPadZ++)
+           {
+
+             volume[0] = iSector;
+             volume[1] = iPlate;
+             volume[2] = iStrip;
+             volume[3] = iPadX;
+             volume[4] = iPadZ;
+
+             //if (CheckedIndex(volume)!=-1) counter++;
+             if (GetDigitIndex(volume, 0)>0) counter++;
+           }
+
+  return counter;
+
+}