Skip to content

Commit

Permalink
PWGEM/Dilepton: fix FIXED_WIDTH and VARIABLE_WIDTH in mixing bins (Al…
Browse files Browse the repository at this point in the history 
…iceO2Group#7366)
  • Loading branch information
@dsekihat @fchinu
dsekihat authored and fchinu committed Sep 18, 2024
1 parent be6028c commit 703458d
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 18 deletions.
74 changes: 65 additions & 9 deletions PWGEM/Dilepton/Core/Dilepton.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ struct Dilepton {
Configurable<uint64_t> ndiff_bc_mix{"ndiff_bc_mix", 5, "difference in global BC required in mixed events"};
ConfigurableAxis ConfVtxBins{"ConfVtxBins", {VARIABLE_WIDTH, -10.0f, -8.f, -6.f, -4.f, -2.f, 0.f, 2.f, 4.f, 6.f, 8.f, 10.f}, "Mixing bins - z-vertex"};
ConfigurableAxis ConfCentBins{"ConfCentBins", {VARIABLE_WIDTH, 0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f, 100.f, 999.f}, "Mixing bins - centrality"};
ConfigurableAxis ConfEPBins{"ConfEPBins", {VARIABLE_WIDTH, -M_PI / 2, -M_PI / 4, 0.0f, +M_PI / 4, +M_PI / 2}, "Mixing bins - event plane angle"};
ConfigurableAxis ConfEPBins{"ConfEPBins", {16, -M_PI / 2, +M_PI / 2}, "Mixing bins - event plane angle"};
ConfigurableAxis ConfOccupancyBins{"ConfOccupancyBins", {VARIABLE_WIDTH, -1, 1e+10}, "Mixing bins - occupancy"};
Configurable<std::string> cfg_swt_name{"cfg_swt_name", "fHighTrackMult", "desired software trigger name"}; // 1 trigger name per 1 task. fHighTrackMult, fHighFt0Mult
Configurable<int> cfgNtracksPV08Min{"cfgNtracksPV08Min", -1, "min. multNTracksPV"};
Expand Down Expand Up @@ -252,17 +252,73 @@ struct Dilepton {
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);

zvtx_bin_edges = std::vector<float>(ConfVtxBins.value.begin(), ConfVtxBins.value.end());
zvtx_bin_edges.erase(zvtx_bin_edges.begin());
if (ConfVtxBins.value[0] == VARIABLE_WIDTH) {
zvtx_bin_edges = std::vector<float>(ConfVtxBins.value.begin(), ConfVtxBins.value.end());
zvtx_bin_edges.erase(zvtx_bin_edges.begin());
for (auto& edge : zvtx_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: zvtx_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfVtxBins.value[0]);
float xmin = static_cast<float>(ConfVtxBins.value[1]);
float xmax = static_cast<float>(ConfVtxBins.value[2]);
zvtx_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
zvtx_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: zvtx_bin_edges[%d] = %f", i, zvtx_bin_edges[i]);
}
}

cent_bin_edges = std::vector<float>(ConfCentBins.value.begin(), ConfCentBins.value.end());
cent_bin_edges.erase(cent_bin_edges.begin());
if (ConfCentBins.value[0] == VARIABLE_WIDTH) {
cent_bin_edges = std::vector<float>(ConfCentBins.value.begin(), ConfCentBins.value.end());
cent_bin_edges.erase(cent_bin_edges.begin());
for (auto& edge : cent_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: cent_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfCentBins.value[0]);
float xmin = static_cast<float>(ConfCentBins.value[1]);
float xmax = static_cast<float>(ConfCentBins.value[2]);
cent_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
cent_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: cent_bin_edges[%d] = %f", i, cent_bin_edges[i]);
}
}

ep_bin_edges = std::vector<float>(ConfEPBins.value.begin(), ConfEPBins.value.end());
ep_bin_edges.erase(ep_bin_edges.begin());
if (ConfEPBins.value[0] == VARIABLE_WIDTH) {
ep_bin_edges = std::vector<float>(ConfEPBins.value.begin(), ConfEPBins.value.end());
ep_bin_edges.erase(ep_bin_edges.begin());
for (auto& edge : ep_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: ep_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfEPBins.value[0]);
float xmin = static_cast<float>(ConfEPBins.value[1]);
float xmax = static_cast<float>(ConfEPBins.value[2]);
ep_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
ep_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: ep_bin_edges[%d] = %f", i, ep_bin_edges[i]);
}
}

occ_bin_edges = std::vector<float>(ConfOccupancyBins.value.begin(), ConfOccupancyBins.value.end());
occ_bin_edges.erase(occ_bin_edges.begin());
if (ConfOccupancyBins.value[0] == VARIABLE_WIDTH) {
occ_bin_edges = std::vector<float>(ConfOccupancyBins.value.begin(), ConfOccupancyBins.value.end());
occ_bin_edges.erase(occ_bin_edges.begin());
for (auto& edge : occ_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: occ_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfOccupancyBins.value[0]);
float xmin = static_cast<float>(ConfOccupancyBins.value[1]);
float xmax = static_cast<float>(ConfOccupancyBins.value[2]);
occ_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
occ_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: occ_bin_edges[%d] = %f", i, occ_bin_edges[i]);
}
}

emh_pos = new TEMH(ndepth);
emh_neg = new TEMH(ndepth);
Expand Down
74 changes: 65 additions & 9 deletions PWGEM/Dilepton/Core/PhotonHBT.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ struct PhotonHBT {
Configurable<uint64_t> ndiff_bc_mix{"ndiff_bc_mix", 5, "difference in global BC required in mixed events"};
ConfigurableAxis ConfVtxBins{"ConfVtxBins", {VARIABLE_WIDTH, -10.0f, -8.f, -6.f, -4.f, -2.f, 0.f, 2.f, 4.f, 6.f, 8.f, 10.f}, "Mixing bins - z-vertex"};
ConfigurableAxis ConfCentBins{"ConfCentBins", {VARIABLE_WIDTH, 0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f, 100.f, 999.f}, "Mixing bins - centrality"};
ConfigurableAxis ConfEPBins{"ConfEPBins", {VARIABLE_WIDTH, -M_PI / 2, -M_PI / 4, 0.0f, +M_PI / 4, +M_PI / 2}, "Mixing bins - event plane angle"};
ConfigurableAxis ConfEPBins{"ConfEPBins", {16, -M_PI / 2, +M_PI / 2}, "Mixing bins - event plane angle"};
ConfigurableAxis ConfOccupancyBins{"ConfOccupancyBins", {VARIABLE_WIDTH, -1, 1e+10}, "Mixing bins - occupancy"};
Configurable<std::string> cfg_swt_name{"cfg_swt_name", "fHighTrackMult", "desired software trigger name"}; // 1 trigger name per 1 task. fHighTrackMult, fHighFt0Mult
Configurable<int> cfgNtracksPV08Min{"cfgNtracksPV08Min", -1, "min. multNTracksPV"};
Expand Down Expand Up @@ -260,17 +260,73 @@ struct PhotonHBT {

void init(InitContext& /*context*/)
{
zvtx_bin_edges = std::vector<float>(ConfVtxBins.value.begin(), ConfVtxBins.value.end());
zvtx_bin_edges.erase(zvtx_bin_edges.begin());
if (ConfVtxBins.value[0] == VARIABLE_WIDTH) {
zvtx_bin_edges = std::vector<float>(ConfVtxBins.value.begin(), ConfVtxBins.value.end());
zvtx_bin_edges.erase(zvtx_bin_edges.begin());
for (auto& edge : zvtx_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: zvtx_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfVtxBins.value[0]);
float xmin = static_cast<float>(ConfVtxBins.value[1]);
float xmax = static_cast<float>(ConfVtxBins.value[2]);
zvtx_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
zvtx_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: zvtx_bin_edges[%d] = %f", i, zvtx_bin_edges[i]);
}
}

cent_bin_edges = std::vector<float>(ConfCentBins.value.begin(), ConfCentBins.value.end());
cent_bin_edges.erase(cent_bin_edges.begin());
if (ConfCentBins.value[0] == VARIABLE_WIDTH) {
cent_bin_edges = std::vector<float>(ConfCentBins.value.begin(), ConfCentBins.value.end());
cent_bin_edges.erase(cent_bin_edges.begin());
for (auto& edge : cent_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: cent_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfCentBins.value[0]);
float xmin = static_cast<float>(ConfCentBins.value[1]);
float xmax = static_cast<float>(ConfCentBins.value[2]);
cent_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
cent_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: cent_bin_edges[%d] = %f", i, cent_bin_edges[i]);
}
}

ep_bin_edges = std::vector<float>(ConfEPBins.value.begin(), ConfEPBins.value.end());
ep_bin_edges.erase(ep_bin_edges.begin());
if (ConfEPBins.value[0] == VARIABLE_WIDTH) {
ep_bin_edges = std::vector<float>(ConfEPBins.value.begin(), ConfEPBins.value.end());
ep_bin_edges.erase(ep_bin_edges.begin());
for (auto& edge : ep_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: ep_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfEPBins.value[0]);
float xmin = static_cast<float>(ConfEPBins.value[1]);
float xmax = static_cast<float>(ConfEPBins.value[2]);
ep_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
ep_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: ep_bin_edges[%d] = %f", i, ep_bin_edges[i]);
}
}

occ_bin_edges = std::vector<float>(ConfOccupancyBins.value.begin(), ConfOccupancyBins.value.end());
occ_bin_edges.erase(occ_bin_edges.begin());
if (ConfOccupancyBins.value[0] == VARIABLE_WIDTH) {
occ_bin_edges = std::vector<float>(ConfOccupancyBins.value.begin(), ConfOccupancyBins.value.end());
occ_bin_edges.erase(occ_bin_edges.begin());
for (auto& edge : occ_bin_edges) {
LOGF(info, "VARIABLE_WIDTH: occ_bin_edges = %f", edge);
}
} else {
int nbins = static_cast<int>(ConfOccupancyBins.value[0]);
float xmin = static_cast<float>(ConfOccupancyBins.value[1]);
float xmax = static_cast<float>(ConfOccupancyBins.value[2]);
occ_bin_edges.resize(nbins + 1);
for (int i = 0; i < nbins + 1; i++) {
occ_bin_edges[i] = (xmax - xmin) / (nbins)*i + xmin;
LOGF(info, "FIXED_WIDTH: occ_bin_edges[%d] = %f", i, occ_bin_edges[i]);
}
}

emh1 = new MyEMH(ndepth);
emh2 = new MyEMH(ndepth);
Expand Down

0 comments on commit 703458d

Please sign in to comment.