- Updated for modifying AliMUONHitMapA1 constructor

[u/mrichter/AliRoot.git] / MUON / AliMUONDigitizer.cxx

diff --git a/MUON/AliMUONDigitizer.cxx b/MUON/AliMUONDigitizer.cxx
index 9ff58252882f11449419f7eba6f5ac580f95c471..39a156728f447d5a0ad51bcfd6482f6541e64d5a 100644 (file)
--- a/MUON/AliMUONDigitizer.cxx
+++ b/MUON/AliMUONDigitizer.cxx
@@ -15,12 +15,6 @@
 
 /* $Id$ */
 
-#include <assert.h>
-
-#include "AliRun.h"
-#include "AliRunDigitizer.h"
-#include "AliRunLoader.h"
-
 #include "AliMUONDigitizer.h"
 #include "AliMUONConstants.h"
 #include "AliMUONSegmentation.h"
@@ -35,6 +29,10 @@
 #include "AliMUONGeometryModule.h"
 #include "AliMUONGeometryStore.h"
 
+#include "AliRun.h"
+#include "AliRunDigitizer.h"
+#include "AliRunLoader.h"
+
 /////////////////////////////////////////////////////////////////////////////////////
 //
 // AliMUONDigitizer should be base abstract class of all digitisers in the MUON 
@@ -298,8 +296,13 @@ void AliMUONDigitizer::CreateDigits()
            AliDebug(3,Form( "Creating digit from transient digit 0x%X", (void*)td));
 
            Int_t q = GetSignalFrom(td);
-            assert( 0 <= td->Chamber() && td->Chamber() <= 13 );
-           if (q > 0) AddDigit(td, q, digitindex[td->Chamber()]++);
+           if (q > 0) {
+             Int_t chamber = td->Chamber();
+             if (0 <= chamber && chamber <= 13 )
+               AddDigit(td, q, digitindex[chamber]++);
+             else
+               AliError(Form("Invalid chamber %d\n",chamber));
+           }
          }
          FillOutputData();
          //    }
@@ -514,9 +517,13 @@ void AliMUONDigitizer::InitArrays()
        idDE = detElements->GetEntry(j)->GetUniqueID();
        fNDetElemId[idDE] = k;
 
-       fHitMap[k] = new AliMUONHitMapA1(idDE,c1Segmentation, fTDList); 
+        Int_t npx1 = c1Segmentation->Npx(idDE)+1;
+        Int_t npy1 = c1Segmentation->Npy(idDE)+1;
+       fHitMap[k] = new AliMUONHitMapA1(npx1, npy1, fTDList); 
      
-       fHitMap[k+AliMUONConstants::NDetElem()] = new AliMUONHitMapA1(idDE,c2Segmentation, fTDList);
+        Int_t npx2 = c2Segmentation->Npx(idDE)+1;
+        Int_t npy2 = c2Segmentation->Npy(idDE)+1;
+       fHitMap[k+AliMUONConstants::NDetElem()] = new AliMUONHitMapA1(npx2, npy2, fTDList);
        k++;
       }
     }