X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFDigitMap.cxx;h=da9be4df8884db24481041af63fa9d88b06a4118;hb=52fec07c512fad80c2b23f8f8b2553ecaaf32bc1;hp=2d2b857adbfc87f2bc3ab0f4c0726210e489a908;hpb=1a0fcc345f688a852a8172e5414ac825e7655b23;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFDigitMap.cxx b/TOF/AliTOFDigitMap.cxx
index 2d2b857adbf..da9be4df888 100644
--- a/TOF/AliTOFDigitMap.cxx
+++ b/TOF/AliTOFDigitMap.cxx
@@ -108,6 +108,7 @@ AliTOFDigitMap::~AliTOFDigitMap()
 //
   if (fDigitMap) {
     for (Int_t i=0; i<fMaxIndex; i++)  delete[] fDigitMap[i];
+    delete [] fDigitMap;
   }
 
 
@@ -129,7 +130,7 @@ void AliTOFDigitMap::Clear(const Option_t*)
 }
 
 ////////////////////////////////////////////////////////////////////////
-Int_t AliTOFDigitMap::CheckedIndex(Int_t *vol) const
+Int_t AliTOFDigitMap::CheckedIndex(Int_t * const vol) const
 {
   //
   // Return checked index for vol
@@ -159,8 +160,9 @@ void AliTOFDigitMap::AddDigit(Int_t *vol, Int_t idigit)
   // 0 means empty pad, we need to shift indeces by 1
 
   if (fDigitMap[CheckedIndex(vol)][kMaxDigitsPerPad-1]!=0) {
-    AliWarning(Form("For this volume (Se%i, Pl%i, St%i, PadR%i, Pad%i) there are not more possibility to add digits.", vol[0], vol[1], vol[2], vol[4], vol[3]));
-    AliWarning(Form("Then, the digit number %i will be not inserted in the digit map, i.e. it will be lost.", idigit));
+    AliDebug(1,Form("In the volume (Se%i, Pl%i, St%i, PadR%i, Pad%i) there is not more possibility to add other digits.", vol[0], vol[1], vol[2], vol[4], vol[3]));
+    AliDebug(1,Form("Then, the digit number %i will be not inserted in the digit map, i.e. it will be lost.", idigit));
+    AliDebug(1,Form("Please, check the possibility to increase the digit map size (succently set to %i)", kMaxDigitsPerPad));
     return;
   }
 
@@ -173,6 +175,7 @@ void AliTOFDigitMap::AddDigit(Int_t *vol, Int_t idigit)
     //else continue;
 
   }
+
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -206,9 +209,10 @@ Int_t AliTOFDigitMap::GetDigitIndex(Int_t *vol, Int_t label) const
     return -1;
   }
 
-  if (CheckedIndex(vol)==-1) return -1;
+  Int_t ci = CheckedIndex(vol);
+  if (ci==-1) return -1;
   
-  Int_t dummy = fDigitMap[CheckedIndex(vol)][label];
+  Int_t dummy = fDigitMap[ci][label];
   
   if (dummy>0) return dummy-1;
   else return -1;
@@ -238,34 +242,21 @@ 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;
 
-  Bool_t checkContent = kFALSE;
-
-  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;
-
-	      checkContent = kFALSE;
-	      for (Int_t label=0; label<kMaxDigitsPerPad; label++)
-		checkContent = checkContent || (GetDigitIndex(volume, label)>=0);
-
-	      //if (CheckedIndex(volume)!=-1) counter++;
-	      if (checkContent) counter++;
-	    }
+  for (Int_t index = 0; index < fMaxIndex; ++index)
+  {
+    for (Int_t label = 0; label < kMaxDigitsPerPad; ++label)
+    {
+      if (fDigitMap[index][label] > 0)
+      {
+	++counter;
+	break;
+      }
+    }
+  }
 
   return counter;
-
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -321,6 +312,29 @@ Int_t AliTOFDigitMap::DigitInStrip(Int_t iSector, Int_t iPlate, Int_t iStrip) co
 
 }
 
+////////////////////////////////////////////////////////////////////////
+Int_t AliTOFDigitMap::FilledCellsInStrip(Int_t iSector, Int_t iPlate, Int_t iStrip) const
+{
+  //
+  // Returns number of digits in the strip iStrip,
+  //         in the plate iPlate of the sector iSector
+  //
+
+  Int_t volume[5] = {iSector, iPlate, iStrip, -1, -1};
+  Int_t counter = 0;
+
+  for (Int_t iPadX=0; iPadX<fNpx; iPadX++)
+    for (Int_t iPadZ=0; iPadZ<fNpz; iPadZ++) {
+      volume[3] = iPadX;
+      volume[4] = iPadZ;
+      if (GetDigitIndex(volume, 0)>=0)
+	counter++;
+    }
+
+  return counter;
+
+}
+
 ////////////////////////////////////////////////////////////////////////
 void AliTOFDigitMap::ResetDigitNumber(Int_t *vol, Int_t dig)
 {