Skip to content

[Tutorial,PWGCF,PWGEM,PWGLF,PWGUD] Fix casts #18394

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
+25 −25
Draft

[Tutorial,PWGCF,PWGEM,PWGLF,PWGUD] Fix casts #18394

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 Tutorials/ML/applyMlSelection.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ struct applyMlSelection {
void init(InitContext const&)
{
// Add histograms vs pT (only for selected candidates)
auto vbins = (std::vector<double>)binsPtMl;
auto vbins = std::vector<double>(binsPtMl);
registry.add("hMassAfterSelVsPt", "Ds candidates;inv. mass (KK#pi) (GeV/#it{c}^{2});entries", {HistType::kTH2F, {{100, 1.77, 2.17}, {vbins, "#it{p}_{T} (GeV/#it{c})"}}});
registry.add("hPromptScoreAfterSelVsPt", "Prompt score after selection;BDT first score;entries", {HistType::kTH2F, {{100, 0., 1.}, {vbins, "#it{p}_{T} (GeV/#it{c})"}}});

Expand Down
4 changes: 2 additions & 2 deletions Tutorials/OpenData/flowAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ struct flow_base {

HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};

Filter collisionFilter = (aod::collision::flags & (uint16_t)aod::collision::CollisionFlagsRun2::Run2VertexerTracks) == (uint16_t)aod::collision::CollisionFlagsRun2::Run2VertexerTracks;
Filter trackFilter = ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true));
Filter collisionFilter = (aod::collision::flags & static_cast<uint16_t>(aod::collision::CollisionFlagsRun2::Run2VertexerTracks)) == static_cast<uint16_t>(aod::collision::CollisionFlagsRun2::Run2VertexerTracks);
Filter trackFilter = ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == static_cast<uint8_t>(true)));

void fillAPt(double trackpt, double cent, double vn, double sinHarm, double cosHarm)
{
Expand Down
8 changes: 4 additions & 4 deletions Tutorials/PWGCF/EventPlane/src/spectatorPlaneTutorial.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct SpectatorPlaneTutorial {
float dcaZMax = 2.0;

Filter collisionFilter = nabs(aod::collision::posZ) < vtxZ;
Filter trackFilter = nabs(aod::track::eta) < etaMax && aod::track::pt > ptMin&& aod::track::pt < ptMax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && nabs(aod::track::dcaXY) < dcaXYMax&& nabs(aod::track::dcaZ) < dcaZMax;
Filter trackFilter = nabs(aod::track::eta) < etaMax && aod::track::pt > ptMin&& aod::track::pt < ptMax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == static_cast<uint8_t>(true))) && nabs(aod::track::dcaXY) < dcaXYMax&& nabs(aod::track::dcaZ) < dcaZMax;
using GeneralCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs>;
using UnfilteredTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>;

Expand Down Expand Up @@ -182,9 +182,9 @@ struct SpectatorPlaneTutorial {
// Get QQ-correlations from CCDB
if (cfgCCDBdir_QQ.value.empty() == false) {
TList* list = ccdb->getForTimeStamp<TList>(cfgCCDBdir_QQ.value, bc.timestamp());
TProfile* qAqCX = reinterpret_cast<TProfile*>(list->FindObject("qAqCX"));
TProfile* qAqCY = reinterpret_cast<TProfile*>(list->FindObject("qAqCY"));
TProfile* qAqCXY = reinterpret_cast<TProfile*>(list->FindObject("qAqCXY"));
TProfile* qAqCX = dynamic_cast<TProfile*>(list->FindObject("qAqCX"));
TProfile* qAqCY = dynamic_cast<TProfile*>(list->FindObject("qAqCY"));
TProfile* qAqCXY = dynamic_cast<TProfile*>(list->FindObject("qAqCXY"));
// The sum is qAqCXY
corrQQx = qAqCX->GetBinContent(centrality);
corrQQy = qAqCY->GetBinContent(centrality);
Expand Down
4 changes: 2 additions & 2 deletions Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ struct CFTutorialTask3 {

// Partitions for particle 1 and particle 2
// add PID selection to partition definition
Partition<FilteredFDParts> PartsOne = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartOne) == ConfCutPartOne);
Partition<FilteredFDParts> PartsTwo = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartTwo) == ConfCutPartTwo);
Partition<FilteredFDParts> PartsOne = (aod::femtodreamparticle::partType == static_cast<uint8_t>(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartOne) == ConfCutPartOne);
Partition<FilteredFDParts> PartsTwo = (aod::femtodreamparticle::partType == static_cast<uint8_t>(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartTwo) == ConfCutPartTwo);

HistogramRegistry HistRegistry{"FemtoTutorial", {}, OutputObjHandlingPolicy::AnalysisObject};

Expand Down
4 changes: 2 additions & 2 deletions Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ struct CFTutorialTask4 {
Configurable<float> ConfPIDThresholdPartTwo{"ConfPIDThresholdPartTwo", 0.75, "Particle 2 - Momentum threshold for TPC to TPCTOF PID"};

/// Partitions for particle 1 and particle 2
Partition<FilteredFDParts> PartsOne = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartOne) == ConfCutPartOne);
Partition<FilteredFDParts> PartsTwo = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartTwo) == ConfCutPartTwo);
Partition<FilteredFDParts> PartsOne = (aod::femtodreamparticle::partType == static_cast<uint8_t>(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartOne) == ConfCutPartOne);
Partition<FilteredFDParts> PartsTwo = (aod::femtodreamparticle::partType == static_cast<uint8_t>(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartTwo) == ConfCutPartTwo);

HistogramRegistry HistRegistry{"FemtoTutorial", {}, OutputObjHandlingPolicy::AnalysisObject};

Expand Down
4 changes: 2 additions & 2 deletions Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ struct CFTutorialTask5 {
Configurable<float> ConfPIDThresholdPartTwo{"ConfPIDThresholdPartTwo", 0.75, "Particle 2 - Momentum threshold for TPC to TPCTOF PID"};

/// Partitions for particle 1 and particle 2
Partition<FilteredFDParts> PartsOne = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartOne) == ConfCutPartOne) && ifnode(aod::femtodreamparticle::pt < ConfPIDThresholdPartOne, ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCPartOne), ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCTOFPartOne));
Partition<FilteredFDParts> PartsOne = (aod::femtodreamparticle::partType == static_cast<uint8_t>(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartOne) == ConfCutPartOne) && ifnode(aod::femtodreamparticle::pt < ConfPIDThresholdPartOne, ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCPartOne), ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCTOFPartOne));

Partition<FilteredFDParts> PartsTwo = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartTwo) == ConfCutPartTwo) && ifnode(aod::femtodreamparticle::pt < ConfPIDThresholdPartTwo, ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCPartTwo), ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCTOFPartTwo));
Partition<FilteredFDParts> PartsTwo = (aod::femtodreamparticle::partType == static_cast<uint8_t>(aod::femtodreamparticle::ParticleType::kTrack)) && ((aod::femtodreamparticle::cut & ConfCutPartTwo) == ConfCutPartTwo) && ifnode(aod::femtodreamparticle::pt < ConfPIDThresholdPartTwo, ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCPartTwo), ncheckbit(aod::femtodreamparticle::pidcut, ConfPIDTPCTOFPartTwo));

HistogramRegistry HistRegistry{"FemtoTutorial", {}, OutputObjHandlingPolicy::AnalysisObject};

Expand Down
2 changes: 1 addition & 1 deletion Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct GfwTutorial {
ConfigurableAxis axisMultiplicity{"axisMultiplicity", {VARIABLE_WIDTH, 0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90}, "centrality axis for histograms"};

Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true)) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls);
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == static_cast<uint8_t>(true))) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls);

// Connect to ccdb
Service<ccdb::BasicCCDBManager> ccdb;
Expand Down
6 changes: 3 additions & 3 deletions Tutorials/PWGEM/Cocktail/plotLFCocktail.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ void loadHistos(TFile* file, TH1F* hists[], const TString& name_extra, int rebin
int nEvents)
{
for (int i = 0; i < nHists; i++) {
hists[i] = (TH1F*)file->GetDirectory("em-lmee-lf-cocktail")
->Get(TString("mee") + name_extra + histNames[i]);
hists[i] = dynamic_cast<TH1F*>(file->GetDirectory("em-lmee-lf-cocktail")
->Get(TString("mee") + name_extra + histNames[i]));
hists[i]->Rebin(rebin);
hists[i]->Scale(1. / nEvents);
hists[i]->SetTitle(histLegends[i]);
Expand All @@ -48,7 +48,7 @@ void plotLFCocktail(const TString& filename = "AnalysisResults.root", int rebin
TFile* file = TFile::Open(filename.Data());

TH1I* hNEvents =
(TH1I*)file->GetDirectory("em-lmee-lf-cocktail")->Get("NEvents");
dynamic_cast<TH1I*>(file->GetDirectory("em-lmee-lf-cocktail")->Get("NEvents"));
int nEvents = hNEvents->GetBinContent(1);

loadHistos(file, mee, "", rebin, nEvents);
Expand Down
4 changes: 2 additions & 2 deletions Tutorials/PWGLF/Resonance/resonancesCombine.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ struct ResonanceCombine {
double massKa = o2::constants::physics::MassKPlus;

EventPlaneHelper helperEP;
int evtPlRefAId = static_cast<int>(cfgEvtPl / 10000);
int evtPlRefBId = static_cast<int>((cfgEvtPl - evtPlRefAId * 10000) / 100);
int evtPlRefAId = (cfgEvtPl / 10000);
int evtPlRefBId = ((cfgEvtPl - evtPlRefAId * 10000) / 100);
int evtPlDetId = cfgEvtPl - evtPlRefAId * 10000 - evtPlRefBId * 100;

void init(o2::framework::InitContext&)
Expand Down
2 changes: 1 addition & 1 deletion Tutorials/PWGUD/UDTutorial_02b.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct UDTutorial02b {

void init(InitContext&)
{
anaPars = (DGAnaparHolder)DGPars;
anaPars = DGAnaparHolder(DGPars);
pidsel.init(anaPars);
if (verbose) {
LOGF(info, "<UDTutorial02>");
Expand Down
6 changes: 3 additions & 3 deletions Tutorials/src/configurableObjects.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ struct ConfigurableObjectDemo {
LOGF(info, "max_eta: %f; min_clusters: %d", (float)trackcuts.max_eta, (int)trackcuts.min_clusters);
LOGF(info, "Cut1 bins: %s; Cut2 bins: %s", printArray(cut->getBins()), printArray(mutable_cut->getBins()));
LOGF(info, "Cut1 labels: %s; Cut2 labels: %s", printArray(cut->getLabels()), printArray(mutable_cut->getLabels()));
auto vec = (std::vector<int>)array;
auto vec = std::vector<int>(array);
LOGF(info, "Array: %s", printArray(vec).c_str());
auto dvec = (std::vector<double>)darray;
auto dvec = std::vector<double>(darray);
LOGF(info, "Double array: %s", printArray(dvec).c_str());
auto fvec = (std::vector<float>)farray;
auto fvec = std::vector<float>(farray);
LOGF(info, "Float array: %s", printArray(fvec).c_str());
LOGF(info, "Matrix: %s", printMatrix((Array2D<float>)vmatrix));
LOGF(info, "Labeled float array:\n %s\n %s\n %s", printArray(vla->getLabelsRows()), printArray(vla->getLabelsCols()), printMatrix(vla->getData()));
Expand Down
2 changes: 1 addition & 1 deletion Tutorials/src/extendedTables.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ struct SpawnDynamicColumns {

void init(InitContext&)
{
cextable.projectors[0] = (float)factor * aod::track::p * aod::track::p;
cextable.projectors[0] = factor.value * aod::track::p * aod::track::p;
}

void process(aod::Tracks const& tracks)
Expand Down
2 changes: 1 addition & 1 deletion Tutorials/src/reweighting.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct CreateWeights {

void init(InitContext&)
{
auto path = (std::string)onnxModel;
auto path = std::string(onnxModel);
/// create session
onnxSession = std::make_shared<Ort::Session>(env, path.c_str(), sessionOptions);
/// adjust input shape to use row-by-row model application
Expand Down
Loading