Skip to content

Several small bugfixes (mostly histogram binning and filling) #6748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgrosseo merged 16 commits into from
Jul 27, 2021
Merged

Several small bugfixes (mostly histogram binning and filling) #6748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5f345e0
cleanup in order to prepare for bigger modifications
akalweit Jun 15, 2021
c98b25c
adding task on efficiency
akalweit Jul 15, 2021
9e2d31e
smaller updates and adding efficiency task
akalweit Jul 15, 2021
76538a9
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
akalweit Jul 15, 2021
8f92fa7
several updates to complete version of analysis task
akalweit Jul 16, 2021
b016254
updates to prepare for pilot testbeam challenge and MC testing
akalweit Jul 20, 2021
9d0f839
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
akalweit Jul 20, 2021
5f05493
format change
akalweit Jul 20, 2021
0844bbd
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
akalweit Jul 21, 2021
18cd57e
small improvements spotted by continous integration
akalweit Jul 21, 2021
f99ad23
forgotten brace
akalweit Jul 21, 2021
d7852c6
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
akalweit Jul 21, 2021
883c51e
harmonize bins
akalweit Jul 25, 2021
e664232
several small bugfixes
akalweit Jul 26, 2021
029aae7
conflict resolving
akalweit Jul 26, 2021
1f6cc5f
typo fix
akalweit Jul 26, 2021
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
8 changes: 4 additions & 4 deletions Analysis/Tasks/PWGLF/NucleiSpectraEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)

#include "Framework/runDataProcessing.h" // important to declare after the options

struct NucleiSpectraEfficienctyVtx {
OutputObj<TH1F> histVertexTrueZ{TH1F("histVertexTrueZ", "MC true z position of z-vertex; vertex z (cm)", 100, -20., 20.)};
struct NucleiSpectraEfficiencyVtx {
OutputObj<TH1F> histVertexTrueZ{TH1F("histVertexTrueZ", "MC true z position of z-vertex; vertex z (cm)", 200, -20., 20.)};

void process(aod::McCollision const& mcCollision)
{
Expand Down Expand Up @@ -103,7 +103,7 @@ struct NucleiSpectraEfficiencyRec {
AxisSpec ptAxis = {ptBinning, "#it{p}_{T} (GeV/#it{c})"};
AxisSpec centAxis = {centBinning, "V0M (%)"};
//
spectra.add("histRecVtxZ", "collision z position", HistType::kTH1F, {{600, -20., +20., "z position (cm)"}});
spectra.add("histRecVtxZ", "collision z position", HistType::kTH1F, {{200, -20., +20., "z position (cm)"}});
spectra.add("histRecPt", "reconstructed particles", HistType::kTH1F, {ptAxis});
spectra.add("histTpcSignal", "Specific energy loss", HistType::kTH2F, {{600, -6., 6., "#it{p} (GeV/#it{c})"}, {1400, 0, 1400, "d#it{E} / d#it{X} (a. u.)"}});
spectra.add("histTpcNsigma", "n-sigma TPC", HistType::kTH2F, {ptAxis, {200, -100., +100., "n#sigma_{He} (a. u.)"}});
Expand Down Expand Up @@ -167,7 +167,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
WorkflowSpec workflow{};
//
if (vertex) {
workflow.push_back(adaptAnalysisTask<NucleiSpectraEfficienctyVtx>(cfgc, TaskName{"nuclei-efficiency-vtx"}));
workflow.push_back(adaptAnalysisTask<NucleiSpectraEfficiencyVtx>(cfgc, TaskName{"nuclei-efficiency-vtx"}));
}
if (gen) {
workflow.push_back(adaptAnalysisTask<NucleiSpectraEfficiencyGen>(cfgc, TaskName{"nuclei-efficiency-gen"}));
Expand Down
11 changes: 7 additions & 4 deletions Analysis/Tasks/PWGLF/NucleiSpectraTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ struct NucleiSpectraTask {

void init(o2::framework::InitContext&)
{
std::vector<double> ptBinning = {0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 2.0, 2.2, 2.4, 2.8, 3.2, 3.6, 4., 5.};
std::vector<double> ptBinning = {0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6,
1.8, 2.0, 2.2, 2.4, 2.8, 3.2, 3.6, 4., 5., 6., 8., 10., 12., 14.};
std::vector<double> centBinning = {0., 1., 5., 10., 20., 30., 40., 50., 70., 100.};

AxisSpec ptAxis = {ptBinning, "#it{p}_{T} (GeV/#it{c})"};
AxisSpec centAxis = {centBinning, "V0M (%)"};

spectra.add("histRecVtxZData", "collision z position", HistType::kTH1F, {{600, -20., +20., "z position (cm)"}});
spectra.add("histRecVtxZData", "collision z position", HistType::kTH1F, {{200, -20., +20., "z position (cm)"}});
spectra.add("histKeepEventData", "skimming histogram", HistType::kTH1F, {{2, -0.5, +1.5, "true: keep event, false: reject event"}});
spectra.add("histTpcSignalData", "Specific energy loss", HistType::kTH2F, {{600, -6., 6., "#it{p} (GeV/#it{c})"}, {1400, 0, 1400, "d#it{E} / d#it{X} (a. u.)"}});
spectra.add("histTofSignalData", "TOF signal", HistType::kTH2F, {{600, -6., 6., "#it{p} (GeV/#it{c})"}, {500, 0.0, 1.0, "#beta (TOF)"}});
Expand Down Expand Up @@ -94,14 +95,16 @@ struct NucleiSpectraTask {
nSigmaHe3 += 94.222101 * TMath::Exp(-0.905203 * track.tpcInnerParam());
//
spectra.fill(HIST("histTpcSignalData"), track.tpcInnerParam() * track.sign(), track.tpcSignal());
spectra.fill(HIST("histTpcNsigmaData"), track.tpcInnerParam(), nSigmaHe3);
if (track.sign() < 0) {
spectra.fill(HIST("histTpcNsigmaData"), track.pt() * 2.0, nSigmaHe3);
}
//
// check offline-trigger (skimming) condidition
//
if (nSigmaHe3 > nsigmacutLow && nSigmaHe3 < nsigmacutHigh) {
keepEvent = kTRUE;
if (track.sign() < 0) {
spectra.fill(HIST("histDcaVsPtData"), track.pt(), track.dcaXY());
spectra.fill(HIST("histDcaVsPtData"), track.pt() * 2.0, track.dcaXY());
}
//
// store tracks for invariant mass calculation
Expand Down