X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWGJE%2FEMCALJetTasks%2FUserTasks%2FAliAnalysisTaskRhoVnModulation.cxx;h=a2a28f87a3927c313d962397f4ce1b8b219ebc3c;hb=62620fffe2ecbf41445809c1f90bd587f4e3486c;hp=eb565c14b07714e6690536d160115bfbf23a0d0e;hpb=7714ec7e7fe5d3f1b2573eab950df13d1d07ed9d;p=u%2Fmrichter%2FAliRoot.git diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoVnModulation.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoVnModulation.cxx index eb565c14b07..a2a28f87a39 100644 --- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoVnModulation.cxx +++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoVnModulation.cxx @@ -54,14 +54,13 @@ #include #include - class AliAnalysisTaskRhoVnModulation; using namespace std; ClassImp(AliAnalysisTaskRhoVnModulation) AliAnalysisTaskRhoVnModulation::AliAnalysisTaskRhoVnModulation() : AliAnalysisTaskEmcalJet("AliAnalysisTaskRhoVnModulation", kTRUE), - fDebug(0), fLocalInit(0), fAttachToEvent(kTRUE), fFillHistograms(kTRUE), fFillQAHistograms(kTRUE), fReduceBinsXByFactor(-1.), fReduceBinsYByFactor(-1.), fNoEventWeightsForQC(kTRUE), fCentralityClasses(0), fPtBinsHybrids(0), fPtBinsJets(0), fUserSuppliedV2(0), fUserSuppliedV3(0), fUserSuppliedR2(0), fUserSuppliedR3(0), fLocalRhoName(Form("RhoFrom_%s", GetName())), fNAcceptedTracks(0), fNAcceptedTracksQCn(0), fFitModulationType(kNoFit), fQCRecovery(kTryFit), fUsePtWeight(kTRUE), fDetectorType(kTPC), fFitModulationOptions("QWLI"), fRunModeType(kGrid), fDataType(kESD), fRandom(0), fMappedRunNumber(0), fInCentralitySelection(-1), fFitModulation(0), fMinPvalue(0.01), fMaxPvalue(1), fNameJetClones(0), fNamePicoTrackClones(0), fNameRho(0), fLocalRho(0), fLocalJetMinEta(-10), fLocalJetMaxEta(-10), fLocalJetMinPhi(-10), fLocalJetMaxPhi(-10), fSoftTrackMinPt(0.15), fSoftTrackMaxPt(5.), fAbsVertexZ(10), fHistCentrality(0), fHistVertexz(0), fHistRunnumbersPhi(0), fHistRunnumbersEta(0), fHistPvaluePDF(0), fHistPvalueCDF(0), fMinDisanceRCtoLJ(0), fRandomConeRadius(-1.), fMaxCones(-1), fAbsVnHarmonics(kTRUE), fExcludeLeadingJetsFromFit(1.), fRebinSwapHistoOnTheFly(kTRUE), fPercentageOfFits(10.), fUseV0EventPlaneFromHeader(kTRUE), fExplicitOutlierCut(-1), fMinLeadingHadronPt(0), fSubtractJetPt(kFALSE), fOutputList(0), fOutputListGood(0), fOutputListBad(0), fHistAnalysisSummary(0), fHistSwap(0), fProfV2(0), fProfV2Cumulant(0), fProfV3(0), fProfV3Cumulant(0), fHistPsiControl(0), fHistPsiSpread(0), fHistPsiVZEROA(0), fHistPsiVZEROC(0), fHistPsiVZERO(0), fHistPsiTPC(0), fHistRhoVsMult(0), fHistRhoVsCent(0), fHistRhoAVsMult(0), fHistRhoAVsCent(0) { + fDebug(0), fLocalInit(0), fAttachToEvent(kTRUE), fFillHistograms(kTRUE), fFillQAHistograms(kTRUE), fReduceBinsXByFactor(-1.), fReduceBinsYByFactor(-1.), fNoEventWeightsForQC(kTRUE), fCentralityClasses(0), fPtBinsHybrids(0), fPtBinsJets(0), fUserSuppliedV2(0), fUserSuppliedV3(0), fUserSuppliedR2(0), fUserSuppliedR3(0), fTracksCont(0), fJetsCont(0), fUseScaledRho(0), fNAcceptedTracks(0), fNAcceptedTracksQCn(0), fFitModulationType(kNoFit), fQCRecovery(kTryFit), fUsePtWeight(kTRUE), fDetectorType(kTPC), fFitModulationOptions("QWLI"), fRunModeType(kGrid), fDataType(kESD), fCollisionType(kPbPb), fRandom(0), fMappedRunNumber(0), fInCentralitySelection(-1), fFitModulation(0), fMinPvalue(0.01), fMaxPvalue(1), fNameJetClones(0), fNamePicoTrackClones(0), fNameRho(0), fLocalJetMinEta(-10), fLocalJetMaxEta(-10), fLocalJetMinPhi(-10), fLocalJetMaxPhi(-10), fSoftTrackMinPt(0.15), fSoftTrackMaxPt(5.), fAbsVertexZ(10), fHistCentrality(0), fHistVertexz(0), fHistRunnumbersPhi(0), fHistRunnumbersEta(0), fHistPvaluePDF(0), fHistPvalueCDF(0), fMinDisanceRCtoLJ(0), fRandomConeRadius(-1.), fMaxCones(-1), fAbsVnHarmonics(kTRUE), fExcludeLeadingJetsFromFit(1.), fRebinSwapHistoOnTheFly(kTRUE), fPercentageOfFits(10.), fUseV0EventPlaneFromHeader(kTRUE), fExplicitOutlierCut(-1), fMinLeadingHadronPt(0), fSubtractJetPt(kFALSE), fOutputList(0), fOutputListGood(0), fOutputListBad(0), fHistAnalysisSummary(0), fHistSwap(0), fProfV2(0), fProfV2Cumulant(0), fProfV3(0), fProfV3Cumulant(0), fHistPsiControl(0), fHistPsiSpread(0), fHistPsiVZEROA(0), fHistPsiVZEROC(0), fHistPsiVZERO(0), fHistPsiTPC(0), fHistRhoVsMult(0), fHistRhoVsCent(0), fHistRhoAVsMult(0), fHistRhoAVsCent(0) { for(Int_t i(0); i < 10; i++) { fProfV2Resolution[i] = 0; fProfV3Resolution[i] = 0; @@ -106,7 +105,7 @@ AliAnalysisTaskRhoVnModulation::AliAnalysisTaskRhoVnModulation() : AliAnalysisTa } //_____________________________________________________________________________ AliAnalysisTaskRhoVnModulation::AliAnalysisTaskRhoVnModulation(const char* name, runModeType type) : AliAnalysisTaskEmcalJet(name, kTRUE), - fDebug(0), fLocalInit(0), fAttachToEvent(kTRUE), fFillHistograms(kTRUE), fFillQAHistograms(kTRUE), fReduceBinsXByFactor(-1.), fReduceBinsYByFactor(-1.), fNoEventWeightsForQC(kTRUE), fCentralityClasses(0), fPtBinsHybrids(0), fPtBinsJets(0), fUserSuppliedV2(0), fUserSuppliedV3(0), fUserSuppliedR2(0), fUserSuppliedR3(0), fLocalRhoName(Form("RhoFrom_%s", GetName())), fNAcceptedTracks(0), fNAcceptedTracksQCn(0), fFitModulationType(kNoFit), fQCRecovery(kTryFit), fUsePtWeight(kTRUE), fDetectorType(kTPC), fFitModulationOptions("QWLI"), fRunModeType(type), fDataType(kESD), fRandom(0), fMappedRunNumber(0), fInCentralitySelection(-1), fFitModulation(0), fMinPvalue(0.01), fMaxPvalue(1), fNameJetClones(0), fNamePicoTrackClones(0), fNameRho(0), fLocalRho(0), fLocalJetMinEta(-10), fLocalJetMaxEta(-10), fLocalJetMinPhi(-10), fLocalJetMaxPhi(-10), fSoftTrackMinPt(0.15), fSoftTrackMaxPt(5.), fAbsVertexZ(10), fHistCentrality(0), fHistVertexz(0), fHistRunnumbersPhi(0), fHistRunnumbersEta(0), fHistPvaluePDF(0), fHistPvalueCDF(0), fMinDisanceRCtoLJ(0), fRandomConeRadius(-1.), fMaxCones(-1), fAbsVnHarmonics(kTRUE), fExcludeLeadingJetsFromFit(1.), fRebinSwapHistoOnTheFly(kTRUE), fPercentageOfFits(10.), fUseV0EventPlaneFromHeader(kTRUE), fExplicitOutlierCut(-1), fMinLeadingHadronPt(0), fSubtractJetPt(kFALSE), fOutputList(0), fOutputListGood(0), fOutputListBad(0), fHistAnalysisSummary(0), fHistSwap(0), fProfV2(0), fProfV2Cumulant(0), fProfV3(0), fProfV3Cumulant(0), fHistPsiControl(0), fHistPsiSpread(0), fHistPsiVZEROA(0), fHistPsiVZEROC(0), fHistPsiVZERO(0), fHistPsiTPC(0), fHistRhoVsMult(0), fHistRhoVsCent(0), fHistRhoAVsMult(0), fHistRhoAVsCent(0) { + fDebug(0), fLocalInit(0), fAttachToEvent(kTRUE), fFillHistograms(kTRUE), fFillQAHistograms(kTRUE), fReduceBinsXByFactor(-1.), fReduceBinsYByFactor(-1.), fNoEventWeightsForQC(kTRUE), fCentralityClasses(0), fPtBinsHybrids(0), fPtBinsJets(0), fUserSuppliedV2(0), fUserSuppliedV3(0), fUserSuppliedR2(0), fUserSuppliedR3(0), fTracksCont(0), fJetsCont(0), fUseScaledRho(0), fNAcceptedTracks(0), fNAcceptedTracksQCn(0), fFitModulationType(kNoFit), fQCRecovery(kTryFit), fUsePtWeight(kTRUE), fDetectorType(kTPC), fFitModulationOptions("QWLI"), fRunModeType(type), fDataType(kESD), fCollisionType(kPbPb), fRandom(0), fMappedRunNumber(0), fInCentralitySelection(-1), fFitModulation(0), fMinPvalue(0.01), fMaxPvalue(1), fNameJetClones(0), fNamePicoTrackClones(0), fNameRho(0), fLocalJetMinEta(-10), fLocalJetMaxEta(-10), fLocalJetMinPhi(-10), fLocalJetMaxPhi(-10), fSoftTrackMinPt(0.15), fSoftTrackMaxPt(5.), fAbsVertexZ(10), fHistCentrality(0), fHistVertexz(0), fHistRunnumbersPhi(0), fHistRunnumbersEta(0), fHistPvaluePDF(0), fHistPvalueCDF(0), fMinDisanceRCtoLJ(0), fRandomConeRadius(-1.), fMaxCones(-1), fAbsVnHarmonics(kTRUE), fExcludeLeadingJetsFromFit(1.), fRebinSwapHistoOnTheFly(kTRUE), fPercentageOfFits(10.), fUseV0EventPlaneFromHeader(kTRUE), fExplicitOutlierCut(-1), fMinLeadingHadronPt(0), fSubtractJetPt(kFALSE), fOutputList(0), fOutputListGood(0), fOutputListBad(0), fHistAnalysisSummary(0), fHistSwap(0), fProfV2(0), fProfV2Cumulant(0), fProfV3(0), fProfV3Cumulant(0), fHistPsiControl(0), fHistPsiSpread(0), fHistPsiVZEROA(0), fHistPsiVZEROC(0), fHistPsiVZERO(0), fHistPsiTPC(0), fHistRhoVsMult(0), fHistRhoVsCent(0), fHistRhoAVsMult(0), fHistRhoAVsCent(0) { for(Int_t i(0); i < 10; i++) { fProfV2Resolution[i] = 0; fProfV3Resolution[i] = 0; @@ -158,6 +157,13 @@ AliAnalysisTaskRhoVnModulation::AliAnalysisTaskRhoVnModulation(const char* name, } break; default: fDebug = -1; // suppress debug info explicitely when not running locally } + switch (fCollisionType) { + case kPythia : { + fFitModulationType = kNoFit; + } break; + default : break; + } + if(fLocalRhoName=="") fLocalRhoName = Form("LocalRhoFrom_%s", GetName()); } //_____________________________________________________________________________ AliAnalysisTaskRhoVnModulation::~AliAnalysisTaskRhoVnModulation() @@ -171,15 +177,38 @@ AliAnalysisTaskRhoVnModulation::~AliAnalysisTaskRhoVnModulation() if(fCentralityClasses) delete fCentralityClasses; } //_____________________________________________________________________________ +void AliAnalysisTaskRhoVnModulation::ExecOnce() +{ + // Init the analysis + fLocalRho = new AliLocalRhoParameter(fLocalRhoName.Data(), 0); + if(fAttachToEvent) { + if(!(InputEvent()->FindListObject(fLocalRho->GetName()))) { + InputEvent()->AddObject(fLocalRho); + } else { + AliFatal(Form("%s: Container with name %s already present. Aborting", GetName(), fLocalRho->GetName())); + } + } + AliAnalysisTaskEmcalJet::ExecOnce(); // init the base class + AliAnalysisTaskEmcalJet::SetVzRange(-1.*fAbsVertexZ, fAbsVertexZ); + if(fUseScaledRho) { + // unscaled rho has been retrieved by the parent class, now we retrieve rho scaled + fRho = dynamic_cast(InputEvent()->FindListObject(Form("%s_Scaled", fRho->GetName()))); + if(!fRho) { + AliFatal(Form("%s: Couldn't find container for scaled rho. Aborting !", GetName())); + } + } + if(!GetJetContainer()) AliFatal(Form("%s: Couldn't find jet container. Aborting !", GetName())); +} +//_____________________________________________________________________________ Bool_t AliAnalysisTaskRhoVnModulation::InitializeAnalysis() { // initialize the anaysis if(fDebug > 0) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); - if(fRandomConeRadius <= 0) fRandomConeRadius = fJetRadius; + if(fRandomConeRadius <= 0) fRandomConeRadius = GetJetContainer()->GetJetRadius(); if(fMaxCones <= 0) fMaxCones = TMath::Nint(1.8*TMath::TwoPi()/(TMath::Pi()*fRandomConeRadius*fRandomConeRadius)); - if(fLocalJetMinEta > -10 && fLocalJetMaxEta > -10) SetJetEtaLimits(fLocalJetMinEta, fLocalJetMaxEta); - if(fLocalJetMinPhi > -10 && fLocalJetMaxPhi > -10) SetJetPhiLimits(fLocalJetMinPhi, fLocalJetMaxPhi); - if(fMinDisanceRCtoLJ==0) fMinDisanceRCtoLJ = .5*fJetRadius; + if(fLocalJetMinEta > -10 && fLocalJetMaxEta > -10) GetJetContainer()->SetJetEtaLimits(fLocalJetMinEta, fLocalJetMaxEta); + if(fLocalJetMinPhi > -10 && fLocalJetMaxPhi > -10) GetJetContainer()->SetJetPhiLimits(fLocalJetMinPhi, fLocalJetMaxPhi); + if(fMinDisanceRCtoLJ==0) fMinDisanceRCtoLJ = .5*GetJetRadius(); if(dynamic_cast(InputEvent())) fDataType = kAOD; // determine the datatype else if(dynamic_cast(InputEvent())) fDataType = kESD; fHistAnalysisSummary->SetBinContent(36, (int)fDataType); @@ -214,14 +243,6 @@ Bool_t AliAnalysisTaskRhoVnModulation::InitializeAnalysis() case kGrid : { fFitModulationOptions += "N0"; } break; default : break; } - fLocalRho = new AliLocalRhoParameter(fLocalRhoName.Data(), 0); - if(fAttachToEvent) { - if(!(InputEvent()->FindListObject(fLocalRho->GetName()))) { - InputEvent()->AddObject(fLocalRho); - } else { - AliFatal(Form("%s: Container with name %s already present. Aborting", GetName(), fLocalRho->GetName())); - } - } FillAnalysisSummaryHistogram(); return kTRUE; } @@ -346,17 +367,17 @@ void AliAnalysisTaskRhoVnModulation::UserCreateOutputObjects() } // delta pt distributions for(Int_t i(0); i < fCentralityClasses->GetSize()-1; i ++) { - if(fFillQAHistograms) fHistRCPhiEta[i] = BookTH2F("fHistRCPhiEta", "#phi (RC)", "#eta (RC)", 100, 0, TMath::TwoPi(), 100, -1, 1, i); + if(fFillQAHistograms) fHistRCPhiEta[i] = BookTH2F("fHistRCPhiEta", "#phi (RC)", "#eta (RC)", 40, 0, TMath::TwoPi(), 40, -1, 1, i); fHistRhoVsRCPt[i] = BookTH2F("fHistRhoVsRCPt", "p_{t} (RC) [GeV/c]", "#rho * A (RC) [GeV/c]", 100, 0, 300, 100, 0, 350, i); fHistRCPt[i] = BookTH1F("fHistRCPt", "p_{t} (RC) [GeV/c]", 130, -20, 150, i); - if(fFillQAHistograms) fHistRCPhiEtaExLJ[i] = BookTH2F("fHistRCPhiEtaExLJ", "#phi (RC)", "#eta (RC)", 100, 0, TMath::TwoPi(), 100, -1, 1, i); - fHistDeltaPtDeltaPhi2[i] = BookTH2F("fHistDeltaPtDeltaPhi2", Form("#phi - #Psi_{2, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 25, 0, TMath::Pi(), 400, -50, 100, i); - fHistDeltaPtDeltaPhi3[i] = BookTH2F("fHistDeltaPtDeltaPhi3", Form("#phi - #Psi_{3, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 25, 0, TMath::TwoPi()/3., 400, -50, 100, i); + if(fFillQAHistograms) fHistRCPhiEtaExLJ[i] = BookTH2F("fHistRCPhiEtaExLJ", "#phi (RC)", "#eta (RC)", 40, 0, TMath::TwoPi(), 40, -1, 1, i); + fHistDeltaPtDeltaPhi2[i] = BookTH2F("fHistDeltaPtDeltaPhi2", Form("#phi - #Psi_{2, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 40, 0, TMath::Pi(), 400, -70, 130, i); + fHistDeltaPtDeltaPhi3[i] = BookTH2F("fHistDeltaPtDeltaPhi3", Form("#phi - #Psi_{3, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 40, 0, TMath::TwoPi()/3., 400, -70, 130, i); fHistRhoVsRCPtExLJ[i] = BookTH2F("fHistRhoVsRCPtExLJ", "p_{t} (RC) [GeV/c]", "#rho * A (RC) [GeV/c]", 100, 0, 300, 100, 0, 350, i); fHistRCPtExLJ[i] = BookTH1F("fHistRCPtExLJ", "p_{t} (RC) [GeV/c]", 130, -20, 150, i); /* fHistRCPhiEtaRand[i] = BookTH2F("fHistRCPhiEtaRand", "#phi (RC)", "#eta (RC)", 100, 0, TMath::TwoPi(), 100, -1, 1, i); */ - fHistDeltaPtDeltaPhi2ExLJ[i] = BookTH2F("fHistDeltaPtDeltaPhi2ExLJ", Form("#phi - #Psi_{2, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 25, 0, TMath::Pi(), 400, -50, 100, i); - fHistDeltaPtDeltaPhi3ExLJ[i] = BookTH2F("fHistDeltaPtDeltaPhi3ExLJ", Form("#phi - #Psi_{3, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 25, 0, TMath::TwoPi()/3., 400, -50, 100, i); + fHistDeltaPtDeltaPhi2ExLJ[i] = BookTH2F("fHistDeltaPtDeltaPhi2ExLJ", Form("#phi - #Psi_{2, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 40, 0, TMath::Pi(), 400, -70, 130, i); + fHistDeltaPtDeltaPhi3ExLJ[i] = BookTH2F("fHistDeltaPtDeltaPhi3ExLJ", Form("#phi - #Psi_{3, %s}", detector.Data()), "#delta p_{t} [GeV/c]", 40, 0, TMath::TwoPi()/3., 400, -70, 130, i); /* fHistRhoVsRCPtRand[i] = BookTH2F("fHistRhoVsRCPtRand", "p_{t} (RC) [GeV/c]", "#rho * A (RC) [GeV/c]", 100, 0, 300, 100, 0, 350, i); */ /* fHistRCPtRand[i] = BookTH1F("fHistRCPtRand", "p_{t} (RC) [GeV/c]", 130, -20, 150, i); */ /* fHistDeltaPtDeltaPhi2Rand[i] = BookTH2F("fHistDeltaPtDeltaPhi2Rand", "#phi - #Psi_{TPC}", "#delta p_{t} [GeV/c]", 50, 0, TMath::Pi(), 100, -50, 100, i); */ @@ -369,8 +390,8 @@ void AliAnalysisTaskRhoVnModulation::UserCreateOutputObjects() fHistJetPtConstituents[i] = BookTH2F("fHistJetPtConstituents", "p_{t} [GeV/c]", "Area", 350, -100, 250, 60, 0, 150, i); fHistJetEtaRho[i] = BookTH2F("fHistJetEtaRho", "#eta", "#rho", 100, -1, 1, 100, 0, 300, i); // in plane and out of plane spectra - fHistJetPsi2Pt[i] = BookTH2F("fHistJetPsi2Pt", Form("#phi_{jet} - #Psi_{2, %s}", detector.Data()), "p_{t} [GeV/c]", 50, 0., TMath::Pi(), 350, -100, 250, i); - fHistJetPsi3Pt[i] = BookTH2F("fHistJetPsi3Pt", Form("#phi_{jet} - #Psi_{3, %s}", detector.Data()), "p_{t} [GeV/c]", 50, 0., TMath::TwoPi()/3., 350, -100, 250, i); + fHistJetPsi2Pt[i] = BookTH2F("fHistJetPsi2Pt", Form("#phi_{jet} - #Psi_{2, %s}", detector.Data()), "p_{t} [GeV/c]", 40, 0., TMath::Pi(), 350, -100, 250, i); + fHistJetPsi3Pt[i] = BookTH2F("fHistJetPsi3Pt", Form("#phi_{jet} - #Psi_{3, %s}", detector.Data()), "p_{t} [GeV/c]", 40, 0., TMath::TwoPi()/3., 350, -100, 250, i); // profiles for all correlator permutations which are necessary to calculate each second and third order event plane resolution fProfV2Resolution[i] = new TProfile(Form("fProfV2Resolution_%i", i), Form("fProfV2Resolution_%i", i), 11, -0.5, 10.5); fProfV2Resolution[i]->GetXaxis()->SetBinLabel(3, ""); @@ -431,7 +452,7 @@ void AliAnalysisTaskRhoVnModulation::UserCreateOutputObjects() fHistRunnumbersPhi->Sumw2(); fOutputList->Add(fHistRunnumbersPhi); } - fHistAnalysisSummary = BookTH1F("fHistAnalysisSummary", "flag", 51, -0.5, 51.5); + fHistAnalysisSummary = BookTH1F("fHistAnalysisSummary", "flag", 52, -0.5, 52.5); fHistSwap = new TH1F("fHistSwap", "fHistSwap", 20, 0, TMath::TwoPi()); if(fUsePtWeight) fHistSwap->Sumw2(); @@ -454,13 +475,17 @@ void AliAnalysisTaskRhoVnModulation::UserCreateOutputObjects() } break; default: break; } + + // get the containers + fTracksCont = GetParticleContainer("Tracks"); + fJetsCont = GetJetContainer("Jets"); } //_____________________________________________________________________________ Bool_t AliAnalysisTaskRhoVnModulation::Run() { // user exec: execute once for each event if(fDebug > 0) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); - if(!(fTracks||fJets||fRho)) return kFALSE; + if(!fTracks||!fJets||!fRho) return kFALSE; if(!fLocalInit) fLocalInit = InitializeAnalysis(); // reject the event if expected data is missing if(!PassesCuts(InputEvent())) return kFALSE; @@ -489,7 +514,17 @@ Bool_t AliAnalysisTaskRhoVnModulation::Run() default : break; } switch (fFitModulationType) { // do the fits - case kNoFit : { fFitModulation->FixParameter(0, fLocalRho->GetVal()); } break; + case kNoFit : { + switch (fCollisionType) { + case kPythia : { // background is zero for pp jets + fFitModulation->FixParameter(0, 0); + fLocalRho->SetVal(0); + } break; + default : { + fFitModulation->FixParameter(0, fLocalRho->GetVal()); + } break; + } + } break; case kV2 : { // only v2 if(CorrectRho(psi2, psi3)) { fProfV2->Fill(fCent, fFitModulation->GetParameter(3)); @@ -538,7 +573,7 @@ Bool_t AliAnalysisTaskRhoVnModulation::Run() Double_t r2(fUserSuppliedR2->GetBinContent(fUserSuppliedR2->GetXaxis()->FindBin(fCent))); Double_t r3(fUserSuppliedR3->GetBinContent(fUserSuppliedR3->GetXaxis()->FindBin(fCent))); if(r2 > 0) fFitModulation->SetParameter(3, fFitModulation->GetParameter(3)*r2); - if(r3 > 0) fFitModulation->SetParameter(7, fFitModulation->GetParameter(3)*r3); + if(r3 > 0) fFitModulation->SetParameter(7, fFitModulation->GetParameter(7)*r3); } if (fUsePtWeight) { // use weighted weights fProfV2->Fill(fCent, TMath::Power(fFitModulation->GetParameter(3),0.5)/*, QCnM1111()*/); @@ -556,7 +591,7 @@ Bool_t AliAnalysisTaskRhoVnModulation::Run() Double_t r2(fUserSuppliedR2->GetBinContent(fUserSuppliedR2->GetXaxis()->FindBin(fCent))); Double_t r3(fUserSuppliedR3->GetBinContent(fUserSuppliedR3->GetXaxis()->FindBin(fCent))); if(r2 > 0) fFitModulation->SetParameter(3, fFitModulation->GetParameter(3)/r2); - if(r3 > 0) fFitModulation->SetParameter(7, fFitModulation->GetParameter(3)/r3); + if(r3 > 0) fFitModulation->SetParameter(7, fFitModulation->GetParameter(7)/r3); } fProfV2->Fill(fCent, fFitModulation->GetParameter(3)); fProfV3->Fill(fCent, fFitModulation->GetParameter(7)); @@ -567,7 +602,8 @@ Bool_t AliAnalysisTaskRhoVnModulation::Run() // if all went well, update the local rho parameter fLocalRho->SetLocalRho(fFitModulation); // fill a number of histograms - if(fFillHistograms) FillHistogramsAfterSubtraction(psi2, psi3, vzero, vzeroComb, tpc); + if(fFillHistograms) FillHistogramsAfterSubtraction(psi2, psi3, vzero, vzeroComb, tpc); + if(fFillQAHistograms) FillQAHistograms(InputEvent()); // send the output to the connected output container PostData(1, fOutputList); switch (fRunModeType) { @@ -577,6 +613,7 @@ Bool_t AliAnalysisTaskRhoVnModulation::Run() } break; default: break; } + return kTRUE; } //_____________________________________________________________________________ @@ -625,26 +662,16 @@ void AliAnalysisTaskRhoVnModulation::CalculateEventPlaneTPC(Double_t* tpc) Double_t qx2(0), qy2(0); // for psi2 Double_t qx3(0), qy3(0); // for psi3 if(fTracks) { - Float_t excludeInEta[] = {-999, -999}; + Float_t excludeInEta = -999; if(fExcludeLeadingJetsFromFit > 0 ) { // remove the leading jet from ep estimate - AliEmcalJet* leadingJet[] = {0x0, 0x0}; - static Int_t lJets[9999] = {-1}; - GetSortedArray(lJets, fJets); - for(Int_t i(0); i < fJets->GetEntriesFast(); i++) { // get the two leading jets - if (1 + i > fJets->GetEntriesFast()) break; - leadingJet[0] = static_cast(fJets->At(lJets[i])); - leadingJet[1] = static_cast(fJets->At(lJets[i+1])); - if(PassesCuts(leadingJet[0]) && PassesCuts(leadingJet[1])) break; - } - if(leadingJet[0] && leadingJet[1]) { - for(Int_t i(0); i < 2; i++) excludeInEta[i] = leadingJet[i]->Eta(); - } + AliEmcalJet* leadingJet(GetJetContainer()->GetLeadingJet()); + if(leadingJet) excludeInEta = leadingJet->Eta(); } Int_t iTracks(fTracks->GetEntriesFast()); for(Int_t iTPC(0); iTPC < iTracks; iTPC++) { AliVTrack* track = static_cast(fTracks->At(iTPC)); if(!PassesCuts(track) || track->Pt() < fSoftTrackMinPt || track->Pt() > fSoftTrackMaxPt) continue; - if(fExcludeLeadingJetsFromFit > 0 &&( (TMath::Abs(track->Eta() - excludeInEta[0]) < fJetRadius*fExcludeLeadingJetsFromFit ) || (TMath::Abs(track->Eta()) - fJetRadius - fJetMaxEta ) > 0 )) continue; + if(fExcludeLeadingJetsFromFit > 0 &&( (TMath::Abs(track->Eta() - excludeInEta) < GetJetContainer()->GetJetRadius()*fExcludeLeadingJetsFromFit ) || (TMath::Abs(track->Eta()) - GetJetContainer()->GetJetRadius() - GetJetContainer()->GetJetEtaMax() ) > 0 )) continue; fNAcceptedTracks++; qx2+= TMath::Cos(2.*track->Phi()); qy2+= TMath::Sin(2.*track->Phi()); @@ -743,7 +770,7 @@ Double_t AliAnalysisTaskRhoVnModulation::CalculateEventPlaneChi(Double_t resEP) } //_____________________________________________________________________________ void AliAnalysisTaskRhoVnModulation::CalculateRandomCone(Float_t &pt, Float_t &eta, Float_t &phi, - AliEmcalJet* jet, Bool_t randomize) const + AliEmcalJet* jet) const { // get a random cone if(fDebug > 1) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); @@ -754,15 +781,15 @@ void AliAnalysisTaskRhoVnModulation::CalculateRandomCone(Float_t &pt, Float_t &e phiJet = jet->Phi(); } // force the random cones to at least be within detector acceptance - Float_t minPhi(fJetMinPhi), maxPhi(fJetMaxPhi); + Float_t minPhi(GetJetContainer()->GetJetPhiMin()), maxPhi(GetJetContainer()->GetJetPhiMax()); if(maxPhi > TMath::TwoPi()) maxPhi = TMath::TwoPi(); if(minPhi < 0 ) minPhi = 0; - Float_t diffRcRJR(TMath::Abs(fRandomConeRadius-fJetRadius)); + Float_t diffRcRJR(TMath::Abs(fRandomConeRadius-GetJetContainer()->GetJetRadius())); // construct a random cone and see if it's far away enough from the leading jet Int_t attempts(1000); while(kTRUE) { attempts--; - eta = gRandom->Uniform(fJetMinEta+diffRcRJR, fJetMaxEta-diffRcRJR); + eta = gRandom->Uniform(GetJetContainer()->GetJetEtaMin()+diffRcRJR, GetJetContainer()->GetJetEtaMax()-diffRcRJR); phi = gRandom->Uniform(minPhi, maxPhi); dJet = TMath::Sqrt((etaJet-eta)*(etaJet-eta)+(phiJet-phi)*(phiJet-phi)); @@ -772,21 +799,15 @@ void AliAnalysisTaskRhoVnModulation::CalculateRandomCone(Float_t &pt, Float_t &e return; } } - if(fTracks) { - Int_t iTracks(fTracks->GetEntriesFast()); - for(Int_t i(0); i < iTracks; i++) { - AliVTrack* track = static_cast(fTracks->At(i)); - if(!PassesCuts(track)) continue; + if(fTracksCont) { + AliVParticle* track = fTracksCont->GetNextAcceptParticle(0); + while(track) { Float_t etaTrack(track->Eta()), phiTrack(track->Phi()), ptTrack(track->Pt()); - // if requested, randomize eta and phi to destroy any correlated fluctuations - if(randomize) { - etaTrack = gRandom->Uniform(fTrackMinEta, fTrackMaxEta); - phiTrack = gRandom->Uniform(minPhi, maxPhi); - } // get distance from cone if(TMath::Abs(phiTrack-phi) > TMath::Abs(phiTrack - phi + TMath::TwoPi())) phiTrack+=TMath::TwoPi(); if(TMath::Abs(phiTrack-phi) > TMath::Abs(phiTrack - phi - TMath::TwoPi())) phiTrack-=TMath::TwoPi(); if(TMath::Sqrt(TMath::Abs((etaTrack-eta)*(etaTrack-eta)+(phiTrack-phi)*(phiTrack-phi))) <= fRandomConeRadius) pt+=ptTrack; + track = fTracksCont->GetNextAcceptParticle(); } } } @@ -885,7 +906,7 @@ void AliAnalysisTaskRhoVnModulation::QCnDiffentialFlowVectors( for(Int_t ptBin(0); ptBin < ptBins->GetSize()-1; ptBin++) { AliEmcalJet* poi = static_cast(pois->At(i)); if(PassesCuts(poi)) { - Double_t pt(poi->Pt()-poi->Area()*fLocalRho->GetLocalVal(poi->Phi(), fJetRadius, fLocalRho->GetVal())); + Double_t pt(poi->Pt()-poi->Area()*fLocalRho->GetLocalVal(poi->Phi(), GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())); if(pt >= ptBins->At(ptBin) && pt < ptBins->At(ptBin+1)) { repn[ptBin]+=TMath::Cos(((double)n)*poi->Phi()); impn[ptBin]+=TMath::Sin(((double)n)*poi->Phi()); @@ -1068,26 +1089,16 @@ Bool_t AliAnalysisTaskRhoVnModulation::CorrectRho(Double_t psi2, Double_t psi3) default: break; } Int_t iTracks(fTracks->GetEntriesFast()); - Double_t excludeInEta[] = {-999, -999}; - Double_t excludeInPhi[] = {-999, -999}; - Double_t excludeInPt[] = {-999, -999}; + Double_t excludeInEta = -999; + Double_t excludeInPhi = -999; + Double_t excludeInPt = -999; if(iTracks <= 0 || fLocalRho->GetVal() <= 0 ) return kFALSE; // no use fitting an empty event ... if(fExcludeLeadingJetsFromFit > 0 ) { - AliEmcalJet* leadingJet[] = {0x0, 0x0}; - static Int_t lJets[9999] = {-1}; - GetSortedArray(lJets, fJets); - for(Int_t i(0); i < fJets->GetEntriesFast(); i++) { // get the two leading jets - if (1 + i > fJets->GetEntriesFast()) break; - leadingJet[0] = static_cast(fJets->At(lJets[i])); - leadingJet[1] = static_cast(fJets->At(lJets[i+1])); - if(PassesCuts(leadingJet[0]) && PassesCuts(leadingJet[1])) break; - } - if(leadingJet[0] && leadingJet[1]) { - for(Int_t i(0); i < 2; i++) { - excludeInEta[i] = leadingJet[i]->Eta(); - excludeInPhi[i] = leadingJet[i]->Phi(); - excludeInPt[i] = leadingJet[i]->Pt(); - } + AliEmcalJet* leadingJet(GetJetContainer()->GetLeadingJet()); + if(leadingJet) { + excludeInEta = leadingJet->Eta(); + excludeInPhi = leadingJet->Phi(); + excludeInPt = leadingJet->Pt(); } } fHistSwap->Reset(); // clear the histogram @@ -1100,7 +1111,7 @@ Bool_t AliAnalysisTaskRhoVnModulation::CorrectRho(Double_t psi2, Double_t psi3) else _tempSwap = *fHistSwap; // now _tempSwap holds the desired histo for(Int_t i(0); i < iTracks; i++) { AliVTrack* track = static_cast(fTracks->At(i)); - if(fExcludeLeadingJetsFromFit > 0 &&( (TMath::Abs(track->Eta() - excludeInEta[0]) < fJetRadius*fExcludeLeadingJetsFromFit ) || (TMath::Abs(track->Eta()) - fJetRadius - fJetMaxEta ) > 0 )) continue; + if(fExcludeLeadingJetsFromFit > 0 &&( (TMath::Abs(track->Eta() - excludeInEta) < GetJetContainer()->GetJetRadius()*fExcludeLeadingJetsFromFit ) || (TMath::Abs(track->Eta()) - GetJetContainer()->GetJetRadius() - GetJetContainer()->GetJetEtaMax() ) > 0 )) continue; if(!PassesCuts(track) || track->Pt() > fSoftTrackMaxPt || track->Pt() < fSoftTrackMinPt) continue; if(fUsePtWeight) _tempSwap.Fill(track->Phi(), track->Pt()); else _tempSwap.Fill(track->Phi()); @@ -1167,12 +1178,8 @@ Bool_t AliAnalysisTaskRhoVnModulation::CorrectRho(Double_t psi2, Double_t psi3) } if(fExcludeLeadingJetsFromFit) { // visualize the excluded region TF2 *f2 = new TF2(Form("%s_LJ", didacticSurface->GetName()),"[0]*TMath::Gaus(x,[1],[2])*TMath::Gaus(y,[3],[4])", 0, TMath::TwoPi(), -1, 1); - f2->SetParameters(excludeInPt[0]/3.,excludeInPhi[0],.1,excludeInEta[0],.1); + f2->SetParameters(excludeInPt/3.,excludeInPhi,.1,excludeInEta,.1); didacticSurface->GetListOfFunctions()->Add(f2); - TF2 *f3 = new TF2(Form("%s_NLJ", didacticSurface->GetName()),"[0]*TMath::Gaus(x,[1],[2])*TMath::Gaus(y,[3],[4])", 0, TMath::TwoPi(), -1, 1); - f3->SetParameters(excludeInPt[1]/3.,excludeInPhi[1],.1,excludeInEta[1],.1); - f3->SetLineColor(kGreen); - didacticSurface->GetListOfFunctions()->Add(f3); } fOutputListGood->Add(didacticSurface); } break; @@ -1226,16 +1233,18 @@ Bool_t AliAnalysisTaskRhoVnModulation::PassesCuts(AliVEvent* event) fCent = InputEvent()->GetCentrality()->GetCentralityPercentile("V0M"); if(fCent <= fCentralityClasses->At(0) || fCent >= fCentralityClasses->At(fCentralityClasses->GetSize()-1) || TMath::Abs(fCent-InputEvent()->GetCentrality()->GetCentralityPercentile("TRK")) > 5.) return kFALSE; // determine centrality class + fInCentralitySelection = -1; for(Int_t i(0); i < fCentralityClasses->GetSize()-1; i++) { if(fCent >= fCentralityClasses->At(i) && fCent <= fCentralityClasses->At(1+i)) { fInCentralitySelection = i; break; } } + if(fInCentralitySelection<0) return kFALSE; // should be null op if(fExplicitOutlierCut == 2010 || fExplicitOutlierCut == 2011) { if(!PassesCuts(fExplicitOutlierCut)) return kFALSE; } if(fRho->GetVal() <= 0 ) return kFALSE; - if(fFillQAHistograms) FillQAHistograms(event); + if(fTracks->GetEntries() < 1) return kFALSE; return kTRUE; } //_____________________________________________________________________________ @@ -1269,7 +1278,7 @@ Bool_t AliAnalysisTaskRhoVnModulation::PassesCuts(const AliVCluster* cluster) co return kTRUE; } //_____________________________________________________________________________ -void AliAnalysisTaskRhoVnModulation::FillHistogramsAfterSubtraction(Double_t psi2, Double_t psi3, Double_t vzero[2][2], Double_t* vzeroComb, Double_t* tpc) const +void AliAnalysisTaskRhoVnModulation::FillHistogramsAfterSubtraction(Double_t psi2, Double_t psi3, Double_t vzero[2][2], Double_t* vzeroComb, Double_t* tpc) { // fill histograms if(fDebug > 0) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); @@ -1339,22 +1348,21 @@ void AliAnalysisTaskRhoVnModulation::FillEventPlaneHistograms(Double_t vzero[2][ fHistPsiSpread->Fill(2.5, TMath::Abs(vzero[1][0]-tpc[0])); } //_____________________________________________________________________________ -void AliAnalysisTaskRhoVnModulation::FillRhoHistograms() const +void AliAnalysisTaskRhoVnModulation::FillRhoHistograms() { // fill rho histograms if(fDebug > 0) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); fHistRhoPackage[fInCentralitySelection]->Fill(fLocalRho->GetVal()); // save the rho estimate from the emcal jet package // get multiplicity FIXME inefficient - Int_t iTracks(fTracks->GetEntriesFast()), mult(0), iJets(fJets->GetEntriesFast()); - for(Int_t i(0); i < iTracks; i ++) { if(PassesCuts(static_cast(fTracks->At(i)))) mult++; } + Int_t iJets(fJets->GetEntriesFast()); Double_t rho(fLocalRho->GetLocalVal(TMath::Pi(), TMath::Pi(), fLocalRho->GetVal())); fHistRho[fInCentralitySelection]->Fill(rho); - fHistRhoVsMult->Fill(mult, rho); + fHistRhoVsMult->Fill(fTracks->GetEntries(), rho); fHistRhoVsCent->Fill(fCent, rho); for(Int_t i(0); i < iJets; i++) { AliEmcalJet* jet = static_cast(fJets->At(i)); if(!PassesCuts(jet)) continue; - fHistRhoAVsMult->Fill(mult, rho * jet->Area()); + fHistRhoAVsMult->Fill(fTracks->GetEntries(), rho * jet->Area()); fHistRhoAVsCent->Fill(fCent, rho * jet->Area()); } } @@ -1364,14 +1372,7 @@ void AliAnalysisTaskRhoVnModulation::FillDeltaPtHistograms(Double_t psi2, Double // fill delta pt histograms if(fDebug > 0) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); Int_t i(0); - AliEmcalJet* leadingJet(0x0); - static Int_t sJets[9999] = {-1}; - GetSortedArray(sJets, fJets); - do { // get the leading jet - leadingJet = static_cast(fJets->At(sJets[i])); - i++; - } - while (!PassesCuts(leadingJet)&&iGetEntriesFast()); + AliEmcalJet* leadingJet(GetJetContainer()->GetLeadingJet()); if(!leadingJet && fDebug > 0) printf(" > failed to retrieve leading jet ! < \n"); const Float_t areaRC = fRandomConeRadius*fRandomConeRadius*TMath::Pi(); // we're retrieved the leading jet, now get a random cone @@ -1381,33 +1382,24 @@ void AliAnalysisTaskRhoVnModulation::FillDeltaPtHistograms(Double_t psi2, Double CalculateRandomCone(pt, eta, phi, 0x0); if(pt > 0) { if(fFillQAHistograms) fHistRCPhiEta[fInCentralitySelection]->Fill(phi, eta); - fHistRhoVsRCPt[fInCentralitySelection]->Fill(pt, fLocalRho->GetLocalVal(phi, fJetRadius, fLocalRho->GetVal())*areaRC); + fHistRhoVsRCPt[fInCentralitySelection]->Fill(pt, fLocalRho->GetLocalVal(phi, GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())*areaRC); fHistRCPt[fInCentralitySelection]->Fill(pt); - fHistDeltaPtDeltaPhi2[fInCentralitySelection]->Fill(PhaseShift(phi-psi2, 2.), pt - areaRC*fLocalRho->GetLocalVal(phi, fJetRadius, fLocalRho->GetVal())); - fHistDeltaPtDeltaPhi3[fInCentralitySelection]->Fill(PhaseShift(phi-psi3, 3.), pt - areaRC*fLocalRho->GetLocalVal(phi, fJetRadius, fLocalRho->GetVal())); + fHistDeltaPtDeltaPhi2[fInCentralitySelection]->Fill(PhaseShift(phi-psi2, 2.), pt - areaRC*fLocalRho->GetLocalVal(phi, GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())); + fHistDeltaPtDeltaPhi3[fInCentralitySelection]->Fill(PhaseShift(phi-psi3, 3.), pt - areaRC*fLocalRho->GetLocalVal(phi, GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())); } // get a random cone excluding leading jet area CalculateRandomCone(pt, eta, phi, leadingJet); if(pt > 0) { if(fFillQAHistograms) fHistRCPhiEtaExLJ[fInCentralitySelection]->Fill(phi, eta); - fHistRhoVsRCPtExLJ[fInCentralitySelection]->Fill(pt, fLocalRho->GetLocalVal(phi, fJetRadius, fRho->GetVal())*areaRC); + fHistRhoVsRCPtExLJ[fInCentralitySelection]->Fill(pt, fLocalRho->GetLocalVal(phi, GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())*areaRC); fHistRCPtExLJ[fInCentralitySelection]->Fill(pt); - fHistDeltaPtDeltaPhi2ExLJ[fInCentralitySelection]->Fill(PhaseShift(phi-psi2, 2.), pt - areaRC*fLocalRho->GetLocalVal(phi, fJetRadius, fLocalRho->GetVal())); - fHistDeltaPtDeltaPhi3ExLJ[fInCentralitySelection]->Fill(PhaseShift(phi-psi3, 3.), pt - areaRC*fLocalRho->GetLocalVal(phi, fJetRadius, fLocalRho->GetVal())); + fHistDeltaPtDeltaPhi2ExLJ[fInCentralitySelection]->Fill(PhaseShift(phi-psi2, 2.), pt - areaRC*fLocalRho->GetLocalVal(phi, GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())); + fHistDeltaPtDeltaPhi3ExLJ[fInCentralitySelection]->Fill(PhaseShift(phi-psi3, 3.), pt - areaRC*fLocalRho->GetLocalVal(phi, GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())); } - // get a random cone in an event with randomized phi and eta - /* CalculateRandomCone(pt, eta, phi, 0x0, kTRUE); - if( pt > 0) { - fHistRCPhiEtaRand[fInCentralitySelection]->Fill(phi, eta); - fHistRhoVsRCPtRand[fInCentralitySelection]->Fill(pt, RhoVal(phi, fJetRadius, fRho->GetVal())*areaRC); - fHistRCPtRand[fInCentralitySelection]->Fill(pt); - fHistDeltaPtDeltaPhi2Rand[fInCentralitySelection]->Fill(PhaseShift(phi-psi2, 2.), pt - areaRC*RhoVal(phi, fJetRadius, fRho->GetVal())); - fHistDeltaPtDeltaPhi3Rand[fInCentralitySelection]->Fill(PhaseShift(phi-psi3, 3.), pt - areaRC*RhoVal(phi, fJetRadius, fRho->GetVal())); - } */ } } //_____________________________________________________________________________ -void AliAnalysisTaskRhoVnModulation::FillJetHistograms(Double_t psi2, Double_t psi3) const +void AliAnalysisTaskRhoVnModulation::FillJetHistograms(Double_t psi2, Double_t psi3) { // fill jet histograms if(fDebug > 0) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); @@ -1416,7 +1408,7 @@ void AliAnalysisTaskRhoVnModulation::FillJetHistograms(Double_t psi2, Double_t p AliEmcalJet* jet = static_cast(fJets->At(i)); if(PassesCuts(jet)) { Double_t pt(jet->Pt()), area(jet->Area()), eta(jet->Eta()), phi(jet->Phi()); - Double_t rho(fLocalRho->GetLocalVal(phi, fJetRadius, fLocalRho->GetVal())); + Double_t rho(fLocalRho->GetLocalVal(phi, GetJetContainer()->GetJetRadius(), fLocalRho->GetVal())); fHistJetPtRaw[fInCentralitySelection]->Fill(pt); fHistJetPt[fInCentralitySelection]->Fill(pt-area*rho); if(fFillQAHistograms) fHistJetEtaPhi[fInCentralitySelection]->Fill(eta, phi); @@ -1469,36 +1461,16 @@ void AliAnalysisTaskRhoVnModulation::FillAnalysisSummaryHistogram() const { // fill the analysis summary histrogram, saves all relevant analysis settigns if(fDebug > 0) printf("__FILE__ = %s \n __LINE __ %i , __FUNC__ %s \n ", __FILE__, __LINE__, __func__); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(1, "fJetRadius"); - fHistAnalysisSummary->SetBinContent(1, fJetRadius); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(2, "fPtBiasJetTrack"); - fHistAnalysisSummary->SetBinContent(2, fPtBiasJetTrack); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(3, "fPtBiasJetClus"); - fHistAnalysisSummary->SetBinContent(3, fPtBiasJetClus); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(4, "fJetPtCut"); - fHistAnalysisSummary->SetBinContent(4, fJetPtCut); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(5, "fJetAreaCut"); - fHistAnalysisSummary->SetBinContent(5, fJetAreaCut); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(6, "fPercAreaCut"); - fHistAnalysisSummary->SetBinContent(6, fPercAreaCut); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(7, "fAreaEmcCut"); - fHistAnalysisSummary->SetBinContent(7, fAreaEmcCut); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(8, "fJetMinEta"); - fHistAnalysisSummary->SetBinContent(8, fJetMinEta); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(9, "fJetMaxEta"); - fHistAnalysisSummary->SetBinContent(9, fJetMaxEta); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(10, "fJetMinPhi"); - fHistAnalysisSummary->SetBinContent(10, fJetMinPhi); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(11, "fJetMaxPhi"); - fHistAnalysisSummary->SetBinContent(11, fJetMaxPhi); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(12, "fMaxClusterPt"); - fHistAnalysisSummary->SetBinContent(12, fMaxClusterPt); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(13, "fMaxTrackPt"); - fHistAnalysisSummary->SetBinContent(13, fMaxTrackPt); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(14, "fLeadingHadronType"); - fHistAnalysisSummary->SetBinContent(14, fLeadingHadronType); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(15, "fAnaType"); - fHistAnalysisSummary->SetBinContent(15, fAnaType); + fHistAnalysisSummary->GetXaxis()->SetBinLabel(2, "fJetRadius"); + fHistAnalysisSummary->SetBinContent(2, GetJetContainer()->GetJetRadius()); + fHistAnalysisSummary->GetXaxis()->SetBinLabel(3, "fJetEtaMin"); + fHistAnalysisSummary->SetBinContent(3, GetJetContainer()->GetJetEtaMin()); + fHistAnalysisSummary->GetXaxis()->SetBinLabel(4, "fJetEtaMax"); + fHistAnalysisSummary->SetBinContent(4, GetJetContainer()->GetJetEtaMax()); + fHistAnalysisSummary->GetXaxis()->SetBinLabel(5, "fJetPhiMin"); + fHistAnalysisSummary->SetBinContent(5, GetJetContainer()->GetJetPhiMin()); + fHistAnalysisSummary->GetXaxis()->SetBinLabel(6, "fJetPhiMax"); + fHistAnalysisSummary->SetBinContent(6, GetJetContainer()->GetJetPhiMin()); fHistAnalysisSummary->GetXaxis()->SetBinLabel(16, "fForceBeamType"); fHistAnalysisSummary->SetBinContent(16, fForceBeamType); fHistAnalysisSummary->GetXaxis()->SetBinLabel(17, "fMinCent"); @@ -1511,28 +1483,6 @@ void AliAnalysisTaskRhoVnModulation::FillAnalysisSummaryHistogram() const fHistAnalysisSummary->SetBinContent(20, fMaxVz); fHistAnalysisSummary->GetXaxis()->SetBinLabel(21, "fOffTrigger"); fHistAnalysisSummary->SetBinContent(21, fOffTrigger); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(22, "fClusPtCut"); - fHistAnalysisSummary->SetBinContent(22, fClusPtCut); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(23, "fTrackPtCut"); - fHistAnalysisSummary->SetBinContent(23, fTrackPtCut); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(24, "fTrackMinEta"); - fHistAnalysisSummary->SetBinContent(24, fTrackMinEta); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(25, "fTrackMaxEta"); - fHistAnalysisSummary->SetBinContent(25, fTrackMaxEta); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(26, "fTrackMinPhi"); - fHistAnalysisSummary->SetBinContent(26, fTrackMinPhi); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(27, "fTrackMaxPhi"); - fHistAnalysisSummary->SetBinContent(27, fTrackMaxPhi); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(28, "fClusTimeCutLow"); - fHistAnalysisSummary->SetBinContent(28, fClusTimeCutLow); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(29, "fClusTimeCutUp"); - fHistAnalysisSummary->SetBinContent(29, fClusTimeCutUp); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(30, "fMinPtTrackInEmcal"); - fHistAnalysisSummary->SetBinContent(30, fMinPtTrackInEmcal); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(31, "fEventPlaneVsEmcal"); - fHistAnalysisSummary->SetBinContent(31, fEventPlaneVsEmcal); - fHistAnalysisSummary->GetXaxis()->SetBinLabel(32, "fMinEventPlane"); - fHistAnalysisSummary->SetBinContent(32, fMaxEventPlane); fHistAnalysisSummary->GetXaxis()->SetBinLabel(33, "fRandomConeRadius"); fHistAnalysisSummary->SetBinContent(33, fRandomConeRadius); fHistAnalysisSummary->GetXaxis()->SetBinLabel(34, "fitModulationType"); @@ -1571,6 +1521,8 @@ void AliAnalysisTaskRhoVnModulation::FillAnalysisSummaryHistogram() const fHistAnalysisSummary->SetBinContent(50, fSoftTrackMaxPt); fHistAnalysisSummary->GetXaxis()->SetBinLabel(51, "fMaxCones"); fHistAnalysisSummary->SetBinContent(51, fMaxCones); + fHistAnalysisSummary->GetXaxis()->SetBinLabel(52, "fUseScaledRho"); + fHistAnalysisSummary->SetBinContent(52, fUseScaledRho); } //_____________________________________________________________________________ void AliAnalysisTaskRhoVnModulation::Terminate(Option_t *) @@ -1595,6 +1547,13 @@ void AliAnalysisTaskRhoVnModulation::Terminate(Option_t *) } } //_____________________________________________________________________________ +void AliAnalysisTaskRhoVnModulation::SetModulationFit(TF1* fit) +{ +// set modulation fit + if (fFitModulation) delete fFitModulation; + fFitModulation = fit; +} +//_____________________________________________________________________________ TH1F* AliAnalysisTaskRhoVnModulation::GetResolutionFromOuptutFile(detectorType det, Int_t h, TArrayD* cen) { // INTERFACE METHOD FOR OUTPUTFILE @@ -1654,7 +1613,8 @@ TH1F* AliAnalysisTaskRhoVnModulation::CorrectForResolutionDiff(TH1F* v, detector Double_t res(1./r->GetBinContent(1+r->FindBin(c))); TF1* line = new TF1("line", "pol0", 0, 200); line->SetParameter(0, res); - return (v->Multiply(line)) ? v : 0x0; + v->Multiply(line); + return v; } //_____________________________________________________________________________ TH1F* AliAnalysisTaskRhoVnModulation::CorrectForResolutionInt(TH1F* v, detectorType det, TArrayD* cen, Int_t h) @@ -1663,7 +1623,8 @@ TH1F* AliAnalysisTaskRhoVnModulation::CorrectForResolutionInt(TH1F* v, detectorT // correct the supplied intetrated vn histogram v for detector resolution // integrated vn must have the same centrality binning as the resolotion correction TH1F* r(GetResolutionFromOuptutFile(det, h, cen)); - return (v->Divide(v, r)) ? v : 0x0; + v->Divide(v, r); + return v; } //_____________________________________________________________________________ TH1F* AliAnalysisTaskRhoVnModulation::GetDifferentialQC(TProfile* refCumulants, TProfile* diffCumlants, TArrayD* ptBins, Int_t h)