Bugfixes: - Do not remove MC Label in case of 0 - Add offset to the trigger patch...

diff --git a/PWG/EMCAL/AliAnalysisTaskEmcal.cxx b/PWG/EMCAL/AliAnalysisTaskEmcal.cxx
index 913dcd09cccded87d077feee6bb28de1c4730eaf..1374af024299aac874ff28231b20c9596013e818 100644 (file)
--- a/PWG/EMCAL/AliAnalysisTaskEmcal.cxx
+++ b/PWG/EMCAL/AliAnalysisTaskEmcal.cxx
@@ -3,7 +3,6 @@
 // Emcal base analysis task.
 //
 // Author: S.Aiola, M. Verweij
-
 #include "AliAnalysisTaskEmcal.h"
 
 #include <TClonesArray.h>
@@ -729,6 +728,11 @@ ULong_t AliAnalysisTaskEmcal::GetTriggerList(){
            if (patch->IsJetLow())  nJ2++;
          }
 
+         AliDebug(2, "Patch summary: ");
+         AliDebug(2, Form("Number of patches: %d", nPatch));
+         AliDebug(2, Form("Jet:   low[%d], high[%d]" ,nJ2, nJ1));
+         AliDebug(2, Form("Gamma: low[%d], high[%d]" ,nG2, nG1));
+
          ULong_t triggers(0);
          if (nG1>0)
                SETBIT(triggers, kG1);

diff --git a/PWG/EMCAL/AliEmcalEsdTrackFilterTask.cxx b/PWG/EMCAL/AliEmcalEsdTrackFilterTask.cxx
index 34283c9bb54be84721a4fc351cea2bc42ee8cb50..3b72c5fdbaf2c1af710bc227768cc27017de4418 100644 (file)
--- a/PWG/EMCAL/AliEmcalEsdTrackFilterTask.cxx
+++ b/PWG/EMCAL/AliEmcalEsdTrackFilterTask.cxx
@@ -208,7 +208,7 @@ void AliEmcalEsdTrackFilterTask::UserExec(Option_t *)
          AliEMCALRecoUtils::ExtrapolateTrackToEMCalSurface(newTrack,fDist);
         newTrack->SetBit(BIT(22),0); 
         newTrack->SetBit(BIT(23),0);
-       if (!fIsMC) newTrack->SetLabel(0);
+       if (!fMCEvent) newTrack->SetLabel(0);
         ++ntrnew;
       } else if (fHybridTrackCuts->AcceptTrack(etrack)) {
        if (!etrack->GetConstrainedParam())
@@ -237,7 +237,7 @@ void AliEmcalEsdTrackFilterTask::UserExec(Option_t *)
          newTrack->SetBit(BIT(22),1); //type 1
          newTrack->SetBit(BIT(23),0);
        }
-       if (!fIsMC) newTrack->SetLabel(0);
+       if (!fMCEvent) newTrack->SetLabel(0);
        ++ntrnew;
       }
     }

diff --git a/PWG/EMCAL/AliEmcalTriggerMaker.cxx b/PWG/EMCAL/AliEmcalTriggerMaker.cxx
index 98f0650618b9260ea5a09ebc04184545de11fdfa..d76b70d798dae540a76cc5a63ff08709f5f55f6d 100644 (file)
--- a/PWG/EMCAL/AliEmcalTriggerMaker.cxx
+++ b/PWG/EMCAL/AliEmcalTriggerMaker.cxx
@@ -501,12 +501,16 @@ AliEmcalTriggerPatchInfo* AliEmcalTriggerMaker::ProcessPatch( Int_t type, Bool_t
        trigger = (AliEmcalTriggerPatchInfo*)fCaloTriggersOut->At( fITrigger );
        fITrigger++;
        
+       Int_t isMC = MCEvent() ? 1 : 0;
+       Int_t offSet = (1 - isMC) * kTriggerTypeEnd;
+
        trigger->SetCenterGeo( centerGeo, amp );
        trigger->SetCenterMass( centerMass, amp );
        trigger->SetEdge1( edge1, amp );
        trigger->SetEdge2( edge2, amp );
        trigger->SetADCAmp( adcAmp );
        trigger->SetTriggerBits( tBits );
+       trigger->SetOffSet(offSet);
        trigger->SetEdgeCell( globCol*2, globRow*2 ); // from triggers to cells
        
        return trigger;