Skip to content

[PWGLF,PWGMM] Fix casts #18391

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

Draft
vkucera wants to merge 1 commit into
base: master
Choose a base branch
from
+70 −68
Draft

[PWGLF,PWGMM] Fix casts #18391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion PWGMM/Lumi/Tasks/lumiStability.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ struct LumiStabilityTask {
const AxisSpec axisTime{1000, -10, 40};
const AxisSpec axisTimeFDD{1000, -20, 100};
const AxisSpec axisCountsTime{2, -0.5, 1.5};
const AxisSpec axisOrbits{static_cast<int>(nOrbits / nOrbitsPerTF), 0., static_cast<double>(nOrbits), ""};
const AxisSpec axisOrbits{(nOrbits / nOrbitsPerTF), 0., static_cast<double>(nOrbits), ""};
const AxisSpec axisTimeRate{static_cast<int>(static_cast<double>(43200) / (nOrbitsPerTF * 89e-6)), 0., 43200, ""}; // t in seconds. Histo for 12 hrs. Each bin contain one time frame (128/32 orbits for 2022/2023).
const AxisSpec timeAxis{1200, 0., 1200., "#bf{t-t_{SOF} (min)}"};

Expand Down
4 changes: 2 additions & 2 deletions PWGMM/Lumi/macros/merger.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ void merger()
tin->Branch("fVertexChi2", &fVertexChi2, "fVertexChi2/D");
tin->Branch("fNContrib", &fNContrib, "fNContrib/I");

while (TDirectoryFile* dir = (TDirectoryFile*)next()) {
tadd = (TTree*)fin->Get(Form("%s/O2eventinfo", dir->GetName()));
while (TDirectoryFile* dir = dynamic_cast<TDirectoryFile*>(next())) {
tadd = dynamic_cast<TTree*>(fin->Get(Form("%s/O2eventinfo", dir->GetName())));

tadd->SetBranchAddress("fTimeStamp", &fTimeStamp);

Expand Down
4 changes: 2 additions & 2 deletions PWGMM/Lumi/macros/non_fac.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void chi2(Int_t& npar, Double_t* gin, Double_t& f, Double_t* par, Int_t flag)
TMatrixD sigma(2, 2);
double results = 0.;

tin = (TTree*)fin->Get("EventInfo_merged");
tin = dynamic_cast<TTree*>(fin->Get("EventInfo_merged"));

tin->SetBranchAddress("fTimeStamp", &fTimeStamp);

Expand Down Expand Up @@ -132,7 +132,7 @@ void non_fac()
new TH1D(Form("hPreDistPos_%d_%d", i, 2), "", 1000, -100, 100);
}

tin = (TTree*)fin->Get("EventInfo_merged");
tin = dynamic_cast<TTree*>(fin->Get("EventInfo_merged"));

tin->SetBranchAddress("fTimeStamp", &fTimeStamp);

Expand Down
4 changes: 2 additions & 2 deletions PWGMM/Mult/TableProducer/ambiguousTrackPropagation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ struct AmbiguousTrackPropagation {
runNumber = bc.runNumber();

if (doprocessMFT || doprocessMFTReassoc || doprocessMFTReassoc3D) {
o2::field::MagneticField* field = static_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField());
o2::field::MagneticField* field = dynamic_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField());
bZ = field->getBz(CcenterMFT);
LOG(info) << "The field at the center of the MFT is bZ = " << bZ;
}
Expand Down Expand Up @@ -215,7 +215,7 @@ struct AmbiguousTrackPropagation {
if ((track.trackCutFlag() & CtrackSelectionITS) != CtrackSelectionITS) {
continue;
}
if ((track.detectorMap() & (uint8_t)o2::aod::track::TPC) == (uint8_t)o2::aod::track::TPC) {
if ((track.detectorMap() & static_cast<uint8_t>(o2::aod::track::TPC)) == static_cast<uint8_t>(o2::aod::track::TPC)) {
if ((track.trackCutFlag() & CtrackSelectionTPC) != CtrackSelectionTPC) {
continue;
}
Expand Down
24 changes: 13 additions & 11 deletions PWGMM/Mult/TableProducer/reducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,15 @@ struct Reducer {
// p[6] - normalization
// alpha = p[1]^2 / ( 1 + p[1]^2), relative weight, 0 < alpha < 1

return params->get((int)0, 6) *
(params->get((int)0, 1) * params->get((int)0, 1) / (1. + params->get((int)0, 1) * params->get((int)0, 1)) * // alpha
// v1 +
1. / (x * TMath::Beta(x, (1. + params->get((int)0, 3) * params->get((int)0, 3)))) * TMath::Power((params->get((int)0, 2) * params->get((int)0, 2)) / ((1. + params->get((int)0, 3) * params->get((int)0, 3)) + (params->get((int)0, 2) * params->get((int)0, 2))), x) * TMath::Power((1. + params->get((int)0, 3) * params->get((int)0, 3)) / ((1. + params->get((int)0, 3) * params->get((int)0, 3)) + (params->get((int)0, 2) * params->get((int)0, 2))), (1. + params->get((int)0, 3) * params->get((int)0, 3))) +
1. / (1 + params->get((int)0, 1) * params->get((int)0, 1)) * // 1 - alpha
// v2 );
1. / (x * TMath::Beta(x, (1. + params->get((int)0, 5) * params->get((int)0, 5)))) * TMath::Power((params->get((int)0, 4) * params->get((int)0, 4)) / ((1. + params->get((int)0, 5) * params->get((int)0, 5)) + (params->get((int)0, 4) * params->get((int)0, 4))), x) * TMath::Power((1. + params->get((int)0, 5) * params->get((int)0, 5)) / ((1. + params->get((int)0, 5) * params->get((int)0, 5)) + (params->get((int)0, 4) * params->get((int)0, 4))), (1. + params->get((int)0, 5) * params->get((int)0, 5))));
// NOLINTBEGIN(readability-redundant-casting)
return params->get(static_cast<int>(0), 6) *
(params->get(static_cast<int>(0), 1) * params->get(static_cast<int>(0), 1) / (1. + params->get(static_cast<int>(0), 1) * params->get(static_cast<int>(0), 1)) * // alpha
// v1 +
1. / (x * TMath::Beta(x, (1. + params->get(static_cast<int>(0), 3) * params->get(static_cast<int>(0), 3)))) * TMath::Power((params->get(static_cast<int>(0), 2) * params->get(static_cast<int>(0), 2)) / ((1. + params->get(static_cast<int>(0), 3) * params->get(static_cast<int>(0), 3)) + (params->get(static_cast<int>(0), 2) * params->get(static_cast<int>(0), 2))), x) * TMath::Power((1. + params->get(static_cast<int>(0), 3) * params->get(static_cast<int>(0), 3)) / ((1. + params->get(static_cast<int>(0), 3) * params->get(static_cast<int>(0), 3)) + (params->get(static_cast<int>(0), 2) * params->get(static_cast<int>(0), 2))), (1. + params->get(static_cast<int>(0), 3) * params->get(static_cast<int>(0), 3))) +
1. / (1 + params->get(static_cast<int>(0), 1) * params->get(static_cast<int>(0), 1)) * // 1 - alpha
// v2 );
1. / (x * TMath::Beta(x, (1. + params->get(static_cast<int>(0), 5) * params->get(static_cast<int>(0), 5)))) * TMath::Power((params->get(static_cast<int>(0), 4) * params->get(static_cast<int>(0), 4)) / ((1. + params->get(static_cast<int>(0), 5) * params->get(static_cast<int>(0), 5)) + (params->get(static_cast<int>(0), 4) * params->get(static_cast<int>(0), 4))), x) * TMath::Power((1. + params->get(static_cast<int>(0), 5) * params->get(static_cast<int>(0), 5)) / ((1. + params->get(static_cast<int>(0), 5) * params->get(static_cast<int>(0), 5)) + (params->get(static_cast<int>(0), 4) * params->get(static_cast<int>(0), 4))), (1. + params->get(static_cast<int>(0), 5) * params->get(static_cast<int>(0), 5))));
// NOLINTEND(readability-redundant-casting)
}

template <typename C>
Expand All @@ -121,8 +123,8 @@ struct Reducer {
void init(InitContext const&)
{
randomgen.seed(rd());
LOGP(debug, ">>> Starting with params: {}, {}, {}, {}, {}, {}, {}", params->get((int)0, int(0)), params->get((int)0, 1), params->get((int)0, 2),
params->get((int)0, 3), params->get((int)0, 4), params->get((int)0, 5), params->get((int)0, 6));
LOGP(debug, ">>> Starting with params: {}, {}, {}, {}, {}, {}, {}", params->get(static_cast<int>(0), static_cast<int>(0)), params->get(static_cast<int>(0), 1), params->get(static_cast<int>(0), 2),
params->get(static_cast<int>(0), 3), params->get(static_cast<int>(0), 4), params->get(static_cast<int>(0), 5), params->get(static_cast<int>(0), 6));
etabins = static_cast<std::vector<double>>(etaBins);
phibins = static_cast<std::vector<double>>(phiBins);
binned.resize((etabins.size() - 1) * (phibins.size() - 1));
Expand All @@ -147,11 +149,11 @@ struct Reducer {
{
weights.clear();
weights.resize(mccollisions.size());
std::fill(weights.begin(), weights.end(), (float)-1.);
std::fill(weights.begin(), weights.end(), static_cast<float>(-1.));
auto i = 0;
LOGP(debug, ">>> {} MC collisions for BC", mccollisions.size());
for (auto& mcc : mccollisions) {
auto value = (mcc.multMCNParticlesEta10() == 0) ? params->get((int)0, (int)0) : NormalizedDoubleNBD((double)mcc.multMCNParticlesEta10());
auto value = (mcc.multMCNParticlesEta10() == 0) ? params->get(static_cast<int>(0), static_cast<int>(0)) : NormalizedDoubleNBD(static_cast<double>(mcc.multMCNParticlesEta10())); // // NOLINT(readability-redundant-casting)
LOGP(debug, ">>> {} value for reduction (threshold {})", value, (float)reductionFactor);
if (value < reductionFactor) {
// if the fraction of events at this multiplicity is less than reduction factor, keep the event as is
Expand Down
50 changes: 25 additions & 25 deletions PWGMM/Mult/Tasks/dndeta-hi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ struct MultiplicityCounter {
}
for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) {
if (btrigc[itrigc])
registry.fill(HIST("hreczvtx"), Double_t(kDATA), Double_t(itrigc), z, cent);
registry.fill(HIST("hreczvtx"), static_cast<Double_t>(kDATA), static_cast<Double_t>(itrigc), z, cent);
}

for (auto& track : pertracks) {
Expand All @@ -378,8 +378,8 @@ struct MultiplicityCounter {

for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) {
if (btrigc[itrigc]) {
registry.fill(HIST("hphieta"), Double_t(kDATA), Double_t(itrigc), track.phi(), track.eta(), cent);
registry.fill(HIST("hrecdndeta"), Double_t(kDATA), Double_t(itrigc), z, track.eta(), cent, Double_t(kParDATA), track.phi());
registry.fill(HIST("hphieta"), static_cast<Double_t>(kDATA), static_cast<Double_t>(itrigc), track.phi(), track.eta(), cent);
registry.fill(HIST("hrecdndeta"), static_cast<Double_t>(kDATA), static_cast<Double_t>(itrigc), z, track.eta(), cent, static_cast<Double_t>(kParDATA), track.phi());
}
}
}
Expand Down Expand Up @@ -472,7 +472,7 @@ struct MultiplicityCounter {
}
for (auto ievtc = 1u; ievtc < kECend; ievtc++) {
if (bevtc[ievtc])
registry.fill(HIST("hgenzvtx"), Double_t(ievtc), genz, cent);
registry.fill(HIST("hgenzvtx"), static_cast<Double_t>(ievtc), genz, cent);
}
Int_t pid = 0;
std::vector<Double_t> particleetas;
Expand Down Expand Up @@ -502,14 +502,14 @@ struct MultiplicityCounter {
if (std::abs(p->Charge()) >= 3) {
for (auto ievtc = 1u; ievtc < kECend; ievtc++) {
if (bevtc[ievtc]) {
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kNoPtVar, particle.phi());
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), cent, static_cast<Double_t>(pid), kNoPtVar, particle.phi());
if (particle.pt() < 0.1) {
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtUp, particle.phi(), -10.0 * particle.pt() + 2);
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtDw, particle.phi(), 5.0 * particle.pt() + 0.5);
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), cent, static_cast<Double_t>(pid), kPtUp, particle.phi(), -10.0 * particle.pt() + 2);
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), cent, static_cast<Double_t>(pid), kPtDw, particle.phi(), 5.0 * particle.pt() + 0.5);

} else {
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtUp, particle.phi());
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtDw, particle.phi());
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), cent, static_cast<Double_t>(pid), kPtUp, particle.phi());
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), cent, static_cast<Double_t>(pid), kPtDw, particle.phi());
}
}
}
Expand Down Expand Up @@ -596,7 +596,7 @@ struct MultiplicityCounter {
for (auto ievtc = 1u; ievtc < kECend; ievtc++) {
for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) {
if (bevtc[ievtc] && btrigc[itrigc]) {
registry.fill(HIST("hreczvtx"), Double_t(ievtc), Double_t(itrigc), z, cent);
registry.fill(HIST("hreczvtx"), static_cast<Double_t>(ievtc), static_cast<Double_t>(itrigc), z, cent);
}
}
}
Expand Down Expand Up @@ -641,8 +641,8 @@ struct MultiplicityCounter {
for (auto ievtc = 1u; ievtc < kECend; ievtc++) {
for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) {
if (bevtc[ievtc] && btrigc[itrigc]) {
registry.fill(HIST("hrecdndeta"), Double_t(ievtc), Double_t(itrigc), z, particle.eta(), cent, Double_t(pid), particle.phi());
registry.fill(HIST("hphieta"), Double_t(ievtc), Double_t(itrigc), track.phi(), track.eta(), cent);
registry.fill(HIST("hrecdndeta"), static_cast<Double_t>(ievtc), static_cast<Double_t>(itrigc), z, particle.eta(), cent, static_cast<Double_t>(pid), particle.phi());
registry.fill(HIST("hphieta"), static_cast<Double_t>(ievtc), static_cast<Double_t>(itrigc), track.phi(), track.eta(), cent);
}
}
}
Expand All @@ -651,7 +651,7 @@ struct MultiplicityCounter {
for (auto ievtc = 1u; ievtc < kECend; ievtc++) {
for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) {
if (bevtc[ievtc] && btrigc[itrigc]) {
registry.fill(HIST("hrecdndeta"), Double_t(ievtc), Double_t(itrigc), z, track.eta(), cent, Double_t(kBkg), track.phi());
registry.fill(HIST("hrecdndeta"), static_cast<Double_t>(ievtc), static_cast<Double_t>(itrigc), z, track.eta(), cent, static_cast<Double_t>(kBkg), track.phi());
}
}
}
Expand Down Expand Up @@ -710,7 +710,7 @@ struct MultiplicityCounter {
}
for (auto ievtc = 1u; ievtc < kECend; ievtc++) {
if (bevtc[ievtc])
registry.fill(HIST("hgenzvtx"), Double_t(ievtc), genz, -1.0);
registry.fill(HIST("hgenzvtx"), static_cast<Double_t>(ievtc), genz, -1.0);
}
Int_t pid = 0;
for (auto& particle : mcParticles) {
Expand Down Expand Up @@ -739,14 +739,14 @@ struct MultiplicityCounter {
if (std::abs(p->Charge()) >= 3) {
for (auto ievtc = 1u; ievtc < kECend; ievtc++) {
if (bevtc[ievtc]) {
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kNoPtVar, particle.phi());
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), -1.0, static_cast<Double_t>(pid), kNoPtVar, particle.phi());
if (particle.pt() < 0.1) {
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtUp, particle.phi(), 2.0);
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtDw, particle.phi(), 0.5);
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), -1.0, static_cast<Double_t>(pid), kPtUp, particle.phi(), 2.0);
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), -1.0, static_cast<Double_t>(pid), kPtDw, particle.phi(), 0.5);

} else {
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtUp, particle.phi());
registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtDw, particle.phi());
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), -1.0, static_cast<Double_t>(pid), kPtUp, particle.phi());
registry.fill(HIST("hgendndeta"), static_cast<Double_t>(ievtc), genz, particle.eta(), -1.0, static_cast<Double_t>(pid), kPtDw, particle.phi());
}
}
}
Expand Down Expand Up @@ -797,9 +797,9 @@ struct MultiplicityCounter {

if (fabs(v0.eta()) < 0.5)
registry.fill(HIST("hv0k0s"), v0.mK0Short());
registry.fill(HIST("hv0mass"), cent, Double_t(kK0short), v0.eta(), Double_t(v0.mK0Short()));
registry.fill(HIST("hv0mass"), cent, Double_t(kLambda), v0.eta(), Double_t(v0.mLambda()));
registry.fill(HIST("hv0mass"), cent, Double_t(kAntilambda), v0.eta(), Double_t(v0.mAntiLambda()));
registry.fill(HIST("hv0mass"), cent, static_cast<Double_t>(kK0short), v0.eta(), static_cast<Double_t>(v0.mK0Short()));
registry.fill(HIST("hv0mass"), cent, static_cast<Double_t>(kLambda), v0.eta(), static_cast<Double_t>(v0.mLambda()));
registry.fill(HIST("hv0mass"), cent, static_cast<Double_t>(kAntilambda), v0.eta(), static_cast<Double_t>(v0.mAntiLambda()));
}
}
}
Expand Down Expand Up @@ -840,9 +840,9 @@ struct MultiplicityCounter {
abs(pTrack.eta()) < etadau &&
abs(nTrack.eta()) < etadau) {

registry.fill(HIST("hv0mass"), cent, Double_t(kK0short), v0.eta(), Double_t(v0.mK0Short()));
registry.fill(HIST("hv0mass"), cent, Double_t(kLambda), v0.eta(), Double_t(v0.mLambda()));
registry.fill(HIST("hv0mass"), cent, Double_t(kAntilambda), v0.eta(), Double_t(v0.mAntiLambda()));
registry.fill(HIST("hv0mass"), cent, static_cast<Double_t>(kK0short), v0.eta(), static_cast<Double_t>(v0.mK0Short()));
registry.fill(HIST("hv0mass"), cent, static_cast<Double_t>(kLambda), v0.eta(), static_cast<Double_t>(v0.mLambda()));
registry.fill(HIST("hv0mass"), cent, static_cast<Double_t>(kAntilambda), v0.eta(), static_cast<Double_t>(v0.mAntiLambda()));
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions PWGMM/Mult/Tasks/dndeta-mft.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ struct PseudorapidityDensityMFT {

expressions::Filter trackSelectionCentral =
((aod::track::trackCutFlag & trackSelectionITS) == trackSelectionITS) &&
ifnode((aod::track::v001::detectorMap & (uint8_t)o2::aod::track::TPC) ==
(uint8_t)o2::aod::track::TPC,
ifnode((aod::track::v001::detectorMap & static_cast<uint8_t>(o2::aod::track::TPC)) ==
static_cast<uint8_t>(o2::aod::track::TPC),
(aod::track::trackCutFlag & trackSelectionTPC) ==
trackSelectionTPC,
true) &&
Expand Down Expand Up @@ -552,8 +552,8 @@ struct PseudorapidityDensityMFT {
using Particles = soa::Filtered<aod::McParticles>;
expressions::Filter primaries =
(aod::mcparticle::flags &
(uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) ==
(uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary;
static_cast<uint8_t>(o2::aod::mcparticle::enums::PhysicalPrimary)) ==
static_cast<uint8_t>(o2::aod::mcparticle::enums::PhysicalPrimary);
Partition<Particles> mcSample = nabs(aod::mcparticle::eta) < 1.1f;
Partition<Particles> mcSampleCentral =
nabs(aod::mcparticle::eta) < estimatorEta;
Expand Down
Loading
Loading