Changing kAll to kAllP in order to avoid clash with AliDecayer.

diff --git a/EMCAL/AliEMCALJetFinderInputSimPrep.cxx b/EMCAL/AliEMCALJetFinderInputSimPrep.cxx
index 1ed371e0dcd4d81960320b31acdb27a94a3d4e10..cfcfc52a54bb89d044f4901b1df3604a0ec80134 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderInputSimPrep.cxx
+++ b/EMCAL/AliEMCALJetFinderInputSimPrep.cxx
@@ -267,7 +267,7 @@ void AliEMCALJetFinderInputSimPrep::FillTracks()
         switch(fTrackType)
         {
 
-          case kAll:  // All Stable particles to be included
+          case kAllP:  // All Stable particles to be included
                if (fDebug > 5) Info("FillTracks","Storing track");
                if (fSmearType == kSmear ||
                    fSmearType == kSmearEffic ){
@@ -480,7 +480,7 @@ if (fDebug > 1) Info("FillParticles","Beginning FillParticles");
         switch(fTrackType)
         {
 
-          case kAll:  // All Stable particles to be included
+          case kAllP:  // All Stable particles to be included
                if (fDebug > 5) Info("FillParticles","Storing particle");
                fInputObject.AddParticle(mPart);
           break;

diff --git a/EMCAL/AliEMCALJetFinderTypes.h b/EMCAL/AliEMCALJetFinderTypes.h
index 32f2c05d49db8aa6acd964c27a2a91c86144b5fd..9e2781c004d819541cee4e297d707beb2f632bd7 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderTypes.h
+++ b/EMCAL/AliEMCALJetFinderTypes.h
@@ -39,7 +39,7 @@
 
 #ifndef  ALIEMCALJETFINDERTRACKTYPE_T
 #define  ALIEMCALJETFINDERTRACKTYPE_T
-       typedef enum {  kAll, kEM, kCharged, kNeutral, kHadron, kChargedHadron, kNoTracks, kEMChargedPi0, kNoNeutronNeutrinoKlong
+       typedef enum {  kAllP, kEM, kCharged, kNeutral, kHadron, kChargedHadron, kNoTracks, kEMChargedPi0, kNoNeutronNeutrinoKlong
        } AliEMCALJetFinderTrackType_t;
 #endif