Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions PWGJE/Tasks/jetChargedV2.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ struct JetChargedV2 {

Configurable<float> jetAreaFractionMin{"jetAreaFractionMin", -99.0, "used to make a cut on the jet areas"};
Configurable<float> leadingConstituentPtMin{"leadingConstituentPtMin", -99.0, "minimum pT selection on jet constituent"};
Configurable<float> leadingConstituentPtMax{"leadingConstituentPtMax", 9999.0, "maximum pT selection on jet constituent"};
Configurable<float> jetPtMin{"jetPtMin", 0.15, "minimum pT acceptance for jets"};
Configurable<float> jetPtMax{"jetPtMax", 200.0, "maximum pT acceptance for jets"};
Configurable<float> jetEtaMin{"jetEtaMin", -0.9, "minimum eta acceptance for jets"};
Expand Down Expand Up @@ -149,7 +150,7 @@ struct JetChargedV2 {
std::vector<double> jetPtBins;
std::vector<double> jetPtBinsRhoAreaSub;

int eventSelection = -1;
std::vector<int> eventSelectionBits;
int trackSelection = -1;
double evtnum = 0;
double accptTrack = 0;
Expand Down Expand Up @@ -200,7 +201,7 @@ struct JetChargedV2 {
AxisSpec axixCent = {20, 0, 100};
AxisSpec axisChID = {220, 0, 220};

eventSelection = jetderiveddatautilities::initialiseEventSelection(static_cast<std::string>(eventSelections));
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));

//< \sigma p_T at local rho test plot >
Expand All @@ -221,6 +222,7 @@ struct JetChargedV2 {
registry.add("h2_Chi2Cent_CombinFit", "Chi2 vs centrality; centrality; #tilde{#chi^{2}}", {HistType::kTH2F, {{100, 0, 100}, {100, 0, 5}}});
registry.add("h2_PChi2_CombinFit", "p-value vs #tilde{#chi^{2}}; p-value; #tilde{#chi^{2}}", {HistType::kTH2F, {{100, 0, 1}, {100, 0, 5}}});

registry.add("Thn_PChi2_CombinFitCent", "p-value vs #tilde{#chi^{2}}; p-value; #tilde{#chi^{2}}", {HistType::kTHnSparseF, {{100, 0.0, 100.0}, {100, 0, 1}, {100, 0, 5}}});
registry.add("h2_PChi2_CombinFitA", "p-value vs #tilde{#chi^{2}}; p-value; #tilde{#chi^{2}}", {HistType::kTH2F, {{100, 0, 1}, {100, 0, 5}}});
registry.add("h2_PChi2_CombinFitB", "p-value vs #tilde{#chi^{2}}; p-value; #tilde{#chi^{2}}", {HistType::kTH2F, {{100, 0, 1}, {100, 0, 5}}});

Expand Down Expand Up @@ -260,7 +262,6 @@ struct JetChargedV2 {
//< RC test plots >//
registry.add("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet", "centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}; #Delta#varphi_{jet}", {HistType::kTH3F, {{120, -10.0, 110.0}, {800, -400.0, 400.0}, {160, 0., o2::constants::math::TwoPI}}});
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet", "centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}(#varphi); #Delta#varphi_{jet}", {HistType::kTH3F, {{120, -10.0, 110.0}, {800, -400.0, 400.0}, {160, 0., o2::constants::math::TwoPI}}});

//< bkg sub plot | end >//
//< median rho >//
registry.add("h_jet_pt_in_out_plane_v2", "jet pT;#it{p}_{T,jet} (GeV/#it{c});entries", {HistType::kTH1F, {jetPtAxisRhoAreaSub}});
Expand Down Expand Up @@ -322,17 +323,27 @@ struct JetChargedV2 {
return false;
}
}
if (leadingConstituentPtMin > -98.0) {
bool isMinleadingConstituent = false;
bool checkConstituentPt = true;
bool checkConstituentMinPt = (leadingConstituentPtMin > -98.0);
bool checkConstituentMaxPt = (leadingConstituentPtMax < 9998.0);
if (!checkConstituentMinPt && !checkConstituentMaxPt) {
checkConstituentPt = false;
}
if (checkConstituentPt) {
bool isMinLeadingConstituent = !checkConstituentMinPt;
bool isMaxLeadingConstituent = true;

for (const auto& constituent : jet.template tracks_as<T>()) {
if (constituent.pt() >= leadingConstituentPtMin) {
isMinleadingConstituent = true;
break;
double pt = constituent.pt();

if (checkConstituentMinPt && pt >= leadingConstituentPtMin) {
isMinLeadingConstituent = true;
}
if (checkConstituentMaxPt && pt > leadingConstituentPtMax) {
isMaxLeadingConstituent = false;
}
}
if (!isMinleadingConstituent) {
return false;
}
return isMinLeadingConstituent && isMaxLeadingConstituent;
}
return true;
}
Expand All @@ -355,7 +366,7 @@ struct JetChargedV2 {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
//=====================< evt pln [n=2->\Psi_2, n=3->\Psi_3] >=====================//
Expand Down Expand Up @@ -447,7 +458,7 @@ struct JetChargedV2 {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
double leadingJetPt = -1;
Expand All @@ -473,6 +484,10 @@ struct JetChargedV2 {
registry.fill(HIST("h_evtnum_NTrk"), evtnum, nTrk);
}

if (nTrk <= 0) {
return;
}

hPtsumSumptFit = new TH1F("h_ptsum_sumpt_fit", "h_ptsum_sumpt fit use", TMath::CeilNint(std::sqrt(nTrk)), 0., o2::constants::math::TwoPI);

if (jets.size() > 0) {
Expand Down Expand Up @@ -543,7 +558,7 @@ struct JetChargedV2 {
fFitModulationV2v3->FixParameter(4, ep3);
}

hPtsumSumptFit->Fit(fFitModulationV2v3, "V+", "ep", 0, o2::constants::math::TwoPI);
hPtsumSumptFit->Fit(fFitModulationV2v3, "Q", "ep", 0, o2::constants::math::TwoPI);

double temppara[5];
temppara[0] = fFitModulationV2v3->GetParameter(0);
Expand Down Expand Up @@ -593,6 +608,7 @@ struct JetChargedV2 {
registry.fill(HIST("h2_PvalueCDFCent_CombinFit"), collision.centrality(), cDF);
registry.fill(HIST("h2_Chi2Cent_CombinFit"), collision.centrality(), chiSqr / (static_cast<float>(nDF)));
registry.fill(HIST("h2_PChi2_CombinFit"), cDF, chiSqr / (static_cast<float>(nDF)));
registry.fill(HIST("Thn_PChi2_CombinFitCent"), collision.centrality(), cDF, chiSqr / (static_cast<float>(nDF)));
double evtcent = collision.centrality();
if (evtcent >= 0 && evtcent <= 5) {
registry.fill(HIST("h2_PChi2_CombinFitA"), cDF, chiSqr / (static_cast<float>(nDF)));
Expand Down Expand Up @@ -724,7 +740,7 @@ struct JetChargedV2 {
}
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet"), collision.centrality(), randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocal, rcPhiPsi2, 1.0);
}
hPtsumSumptFit->Reset();
delete hPtsumSumptFit;
evtnum += 1;
}
PROCESS_SWITCH(JetChargedV2, processSigmaPt, "Sigma pT and bkg as fcn of phi", true);
Expand All @@ -736,7 +752,7 @@ struct JetChargedV2 {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}

Expand Down Expand Up @@ -799,7 +815,7 @@ struct JetChargedV2 {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
for (auto const& track : tracks) {
Expand Down
Loading