From 229bed7ac079f4f1861e83f056d6c7850fa6d1e0 Mon Sep 17 00:00:00 2001 From: gconesab Date: Sun, 10 Aug 2014 11:07:02 +0200 Subject: [PATCH] Add name of the detectors for fiducial cut selection, remove hardcoded fiducial selection, remove declaration of unused method --- .../AliAnaGeneratorKine.cxx | 36 +++++++++---------- .../AliAnaGeneratorKine.h | 12 +++++-- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.cxx b/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.cxx index c9b55711056..2355034cd3e 100755 --- a/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.cxx +++ b/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.cxx @@ -37,6 +37,8 @@ ClassImp(AliAnaGeneratorKine) //__________________________________________ AliAnaGeneratorKine::AliAnaGeneratorKine() : AliAnaCaloTrackCorrBaseClass(), +fTriggerDetector("EMCAL"), +fCalorimeter("EMCAL"), fStack(0), fParton2(0), fParton3(0), fParton6(0), fParton7(0), @@ -862,22 +864,22 @@ void AliAnaGeneratorKine::IsLeadingAndIsolated(TLorentzVector trigger, if( pt > ptThresIC && radius < rThresIC ) nICNeutPhot++ ; } - //EMCAL acceptance - Bool_t inEMCAL = GetFiducialCut()->IsInFiducialCut(trigger,"EMCAL") ; + //Calorimeter acceptance + Bool_t inCalo = GetFiducialCut()->IsInFiducialCut(trigger,fCalorimeter) ; - if(inEMCAL) + if(!inCalo) continue; + + if( ptMaxNeutEMCAL < pt ) ptMaxNeutEMCAL = pt; + if( pt > ptThresIC && radius < rThresIC ) nICNeutEMCAL++ ; + + if(phPDG) { - if( ptMaxNeutEMCAL < pt ) ptMaxNeutEMCAL = pt; - if( pt > ptThresIC && radius < rThresIC ) nICNeutEMCAL++ ; - - if(phPDG) - { - if( ptMaxNeutEMCALPhot < pt ) ptMaxNeutEMCALPhot = pt; - if( pt > ptThresIC && radius < rThresIC ) nICNeutEMCALPhot++ ; - } + if( ptMaxNeutEMCALPhot < pt ) ptMaxNeutEMCALPhot = pt; + if( pt > ptThresIC && radius < rThresIC ) nICNeutEMCALPhot++ ; } + } - else + else { if( pt < ptThresTrack) continue ; @@ -970,16 +972,12 @@ void AliAnaGeneratorKine::MakeAnalysisFillHistograms() // Acceptance and kinematical cuts if( ptTrig < GetMinPt() ) continue ; - //EMCAL acceptance, a bit less - if(TMath::Abs(particle->Eta()) > 0.6) continue ; - if(particle->Phi() > TMath::DegToRad()*176) continue ; - if(particle->Phi() < TMath::DegToRad()*74 ) continue ; + Bool_t in = GetFiducialCut()->IsInFiducialCut(trigger,fTriggerDetector) ; + if(! in ) continue ; + particle->Momentum(trigger); -// Bool_t in = GetFiducialCut()->IsInFiducialCu(trigger,"EMCAL") ; -// if(! in ) continue ; - // printf("Particle %d : pdg %d status %d, mother index %d, pT %2.2f, eta %2.2f, phi %2.2f \n", // ipr, pdgTrig, statusTrig, imother, ptTrig, particle->Eta(), particle->Phi()*TMath::RadToDeg()); diff --git a/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h b/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h index 1f86c9de828..986a497387b 100755 --- a/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h +++ b/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h @@ -51,13 +51,19 @@ public: Int_t pdgTrig, Bool_t leading[4], Bool_t isolated[4]) ; + + void MakeAnalysisFillHistograms() ; + + void SetTriggerDetector( TString name ) { fTriggerDetector = name ; } + void SetCalorimeter ( TString name ) { fCalorimeter = name ; } - void MakeAnalysisFillAOD() { ; } - void MakeAnalysisFillHistograms() ; private: + TString fTriggerDetector; //! trigger detector, for fiducial region + TString fCalorimeter; //! detector neutral particles, for fiducial region + AliStack * fStack; //! access stack TParticle * fParton2; //! Initial state Parton @@ -128,7 +134,7 @@ private: AliAnaGeneratorKine (const AliAnaGeneratorKine & gk) ; // cpy ctor AliAnaGeneratorKine & operator = (const AliAnaGeneratorKine & gk) ; // cpy assignment - ClassDef(AliAnaGeneratorKine,2) + ClassDef(AliAnaGeneratorKine,3) } ; -- 2.43.0