From: gconesab Date: Fri, 22 Aug 2014 21:16:17 +0000 (+0200) Subject: replace return by continue in loop, stopping loop unnecessarily; change name of switc... X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=71f8368b6201e9fae1b48287e34961dc9320f8ec replace return by continue in loop, stopping loop unnecessarily; change name of switch method to be in agreement with complementary method --- diff --git a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx index bfdc47d3f7c..220cdbf7c9c 100755 --- a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx +++ b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx @@ -3406,18 +3406,20 @@ void AliAnaParticleIsolation::MakeAnalysisFillAOD() for(Int_t iaod = iaod0; iaod < naod; iaod++) { AliAODPWG4ParticleCorrelation * aodinput = (AliAODPWG4ParticleCorrelation*) (GetInputAODBranch()->At(iaod)); - + // Check isolation only of clusters in fiducial region + if(IsFiducialCutOn()) { Bool_t in = GetFiducialCut()->IsInFiducialCut(*aodinput->Momentum(),aodinput->GetDetector()) ; - if(! in ) return ; + if(! in ) continue ; } //If too small or too large pt, skip Float_t pt = aodinput->Pt(); if(pt < GetMinPt() || pt > GetMaxPt() ) continue ; + //check if it is low pt trigger particle if( ( pt < GetIsolationCut()->GetPtThreshold() || pt < GetIsolationCut()->GetSumPtThreshold() ) && !fMakeSeveralIC) @@ -3433,13 +3435,14 @@ void AliAnaParticleIsolation::MakeAnalysisFillAOD() n,nfrac,coneptsum,coneptlead,isolated); if(!fMakeSeveralIC) aodinput->SetIsolated(isolated); - } // particle isolationloop - - if(GetDebug() > 1) - { - if(isolated) printf("AliAnaParticleIsolation::MakeAnalysisFillAOD() : Particle %d IS ISOLATED \n",idLeading); - printf("AliAnaParticleIsolation::MakeAnalysisFillAOD() - End fill AODs \n"); - } + + if(GetDebug() > 1) + { + if(isolated) printf("AliAnaParticleIsolation::MakeAnalysisFillAOD() : Particle %d IS ISOLATED \n",iaod); + printf("AliAnaParticleIsolation::MakeAnalysisFillAOD() - End fill AODs \n"); + } + + } // particle isolation loop } diff --git a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h index 48be5f4070e..4386d65ccec 100755 --- a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h +++ b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h @@ -140,7 +140,7 @@ class AliAnaParticleIsolation : public AliAnaCaloTrackCorrBaseClass { void SetDecayBits(Int_t i, UInt_t bit) { if(i < 4) fDecayBits[i] = bit ; } void SwitchOnBackgroundBinHistoFill() { fFillBackgroundBinHistograms = kTRUE ; } - void SwitchOffBackgroundHistoFill() { fFillBackgroundBinHistograms = kFALSE; } + void SwitchOffBackgroundBinHistoFill() { fFillBackgroundBinHistograms = kFALSE; } void SetNBackgroundBins(Int_t n) { if(n < 19) fNBkgBin = n ; } void SetBackgroundLimits(Int_t i,Float_t l){ if(i <= fNBkgBin) fBkgBinLimit[i] = l; }