X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALTrigger.cxx;h=a8ed0f3f8b9c076a24d6ab91c8e5e53b4b8dd951;hb=852a34a038252c6710d0e9a7f3e1ef783c9698b6;hp=68bd95b2bb6e7f998fcf5debc72022bb74243222;hpb=0bd264d520369187da0dfe07db00007d2265c332;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALTrigger.cxx b/EMCAL/AliEMCALTrigger.cxx
index 68bd95b2bb6..a8ed0f3f8b9 100644
--- a/EMCAL/AliEMCALTrigger.cxx
+++ b/EMCAL/AliEMCALTrigger.cxx
@@ -199,7 +199,7 @@ Bool_t AliEMCALTrigger::IsPatchIsolated(Int_t iPatchType, const TClonesArray * a
   if(!ampmatrixes) return kFALSE;
   
   // Get matrix of TRU or Module with maximum amplitude patch.
-  Int_t itru = mtru + iSM * fGeom->GetNTRU(); //number of tru, min 0 max 3*12=36.
+  Int_t itru = mtru + iSM * fGeom->GetNTRU(); //number of tru, min 0 max 3*22=66.
   TMatrixD * ampmatrix   = 0x0;
   Int_t colborder = 0;
   Int_t rowborder = 0;
@@ -880,7 +880,7 @@ void AliEMCALTrigger::Trigger()
     AliFatal("Did not get geometry from EMCALLoader");
   
   //Define parameters
-  Int_t nSuperModules = fGeom->GetNumberOfSuperModules() ; //12 SM in EMCAL
+  Int_t nSuperModules = fGeom->GetNumberOfSuperModules() ; //12 SM in EMCAL and 6/10 DCAL SMs
   Int_t nTRU       = fGeom->GetNTRU();    // 3 TRU per super module
 
   //Intialize data members each time the trigger is called in event loop
@@ -1090,7 +1090,7 @@ Double_t AliEMCALTrigger::GetEmcalSumAmp() const
 { 
   // Return sum of amplidutes from EMCal
   // Used calibration coefficeint for transition to energy
-  return fAmpJetMatrix >0 ?fAmpJetMatrix->Sum() :0.0;
+  return fAmpJetMatrix ?fAmpJetMatrix->Sum() :0.0;
 }
 
 //____________________________________________________________________________