Skip to content
Draft
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions PWGLF/DataModel/LFStrangenessTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ enum EventSelectionFlags {
kNsel // counter
};

DECLARE_SOA_COLUMN(TotalNbrOfCollisions, totalNbrOfCollisions, int); //! total number of analysed collisions
DECLARE_SOA_COLUMN(TotalNbrOfSelCollisions, totalNbrOfSelCollisions, int); //! total number of selected collisions
DECLARE_SOA_COLUMN(TotalNbrOfCollisions, totalNbrOfCollisions, int); //! total number of analysed collisions
DECLARE_SOA_COLUMN(TotalNbrOfSelCollisions, totalNbrOfSelCollisions, int); //! total number of selected collisions
DECLARE_SOA_COLUMN(TotalIsTriggerTVXCollisions, totalIsTriggerTVXCollisions, int); //! N selected collisions after applying IsTriggerTVX
DECLARE_SOA_COLUMN(TotalNoITSROFBorderCollisions, totalNoITSROFBorderCollisions, int); //! N selected collisions after applying IsTriggerTVX, NoITSROF
DECLARE_SOA_COLUMN(TotalNoTFBorderCollisions, totalNoTFBorderCollisions, int); //! N selected collisions after applying IsTriggerTVX, NoITSROF, NoTF
Expand Down
12 changes: 6 additions & 6 deletions PWGLF/TableProducer/Common/lfTPCPID.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ struct bbParams {
void setValues(TList* l)
{
const char* bbname = Form("BBParameter_%s", name.c_str());
TH1F* h = static_cast<TH1F*>(l->FindObject(bbname));
TH1F* h = dynamic_cast<TH1F*>(l->FindObject(bbname));
if (!h) {
l->ls();
LOG(fatal) << "bbParams `" << name << "` :: did not find BetheBloch parametrization " << bbname << " in the input list";
Expand Down Expand Up @@ -237,9 +237,9 @@ struct bbParams {
} else {
TString cn = obj->ClassName();
if (cn.Contains("TF1")) {
postCorrectionFun = static_cast<TF1*>(l->FindObject(obj->GetName()));
postCorrectionFun = dynamic_cast<TF1*>(l->FindObject(obj->GetName()));
} else if (cn.Contains("TGraph")) {
postCorrection = static_cast<TGraph*>(l->FindObject(obj->GetName()));
postCorrection = dynamic_cast<TGraph*>(l->FindObject(obj->GetName()));
} else {
LOG(fatal) << "Cannot hanlde class " << cn << " for post calib object " << objname;
}
Expand All @@ -255,9 +255,9 @@ struct bbParams {
} else {
TString cn = obj->ClassName();
if (cn.Contains("TF1")) {
postCorrectionFunSigma = static_cast<TF1*>(l->FindObject(obj->GetName()));
postCorrectionFunSigma = dynamic_cast<TF1*>(l->FindObject(obj->GetName()));
} else if (cn.Contains("TGraph")) {
postCorrectionSigma = static_cast<TGraph*>(l->FindObject(obj->GetName()));
postCorrectionSigma = dynamic_cast<TGraph*>(l->FindObject(obj->GetName()));
} else {
LOG(fatal) << "Cannot hanlde class " << cn << " for post calib sigma object " << objname;
}
Expand Down Expand Up @@ -349,7 +349,7 @@ struct bbParams {
if (!f->IsOpen()) {
LOG(fatal) << "The input file " << f->GetName() << " is not open";
}
TList* l = static_cast<TList*>(f->Get("ccdb_object"));
TList* l = dynamic_cast<TList*>(f->Get("ccdb_object"));
if (!l) {
f->ls();
LOG(fatal) << "The input file " << post << " does not contain the TList ccdb_object";
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1407,7 +1407,7 @@ struct he3HadronFemto {
he3Hadcand.flags |= Flags::kMixedPair;
}

LOG(info) << "He3 flags: " << int(he3Hadcand.flagsHe3) << ", Hadron flags: " << int(he3Hadcand.flagsHad) << ", Pair flags: " << int(he3Hadcand.flags);
LOG(info) << "He3 flags: " << static_cast<int>(he3Hadcand.flagsHe3) << ", Hadron flags: " << static_cast<int>(he3Hadcand.flagsHad) << ", Pair flags: " << static_cast<int>(he3Hadcand.flags);
if (!settingFillPrimariesMc && (he3Hadcand.flags == Flags::kBothPrimaries)) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ struct HyperNucleus {
}
return vec;
};
const char* motherName() { return name.Contains("->") ? ((TString)name(0, name.First("-"))).Data() : name.Data(); }
const char* daughterNames() { return name.Contains("->") ? ((TString)name(name.First("-") + 2, name.Length())).Data() : ""; }
const char* motherName() { return name.Contains("->") ? (TString(name(0, name.First("-")))).Data() : name.Data(); }
const char* daughterNames() { return name.Contains("->") ? (TString(name(name.First("-") + 2, name.Length()))).Data() : ""; }
}; // struct HyperNucleus

struct DaughterKf {
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/TableProducer/Nuspex/nucleiSpectra.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ struct nucleiSpectra {
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);

const AxisSpec centAxis{cfgCentralityBins, fmt::format("{} percentile", (std::string)nuclei::centDetectorNames[cfgCentralityEstimator])};
const AxisSpec centAxis{cfgCentralityBins, fmt::format("{} percentile", std::string(nuclei::centDetectorNames[cfgCentralityEstimator]))};
const AxisSpec nSigmaAxes[2]{{cfgNsigmaTPCbins, "n#sigma_{TPC}"}, {cfgNsigmaTOFbins, "n#sigma_{TOF}"}};
const AxisSpec tofMassAxis{cfgTOFmassBins, "TOF mass - PDG mass"};
const AxisSpec ptResAxis{cfgMomResBins, "#Delta#it{p}_{T}/#it{p}_{T}"};
Expand Down Expand Up @@ -1181,7 +1181,7 @@ struct nucleiSpectra {
track.itsChi2NCl() > cfgTrackCut.ITSchi2ClusMax) {
continue;
}
double expBethe{common::BetheBlochAleph(static_cast<double>(track.tpcInnerParam() * 2. / o2::constants::physics::MassHelium3), cfgBetheBlochParams->get(4, 0u), cfgBetheBlochParams->get(4, 1u), cfgBetheBlochParams->get(4, 2u), cfgBetheBlochParams->get(4, 3u), cfgBetheBlochParams->get(4, 4u))};
double expBethe{common::BetheBlochAleph((track.tpcInnerParam() * 2. / o2::constants::physics::MassHelium3), cfgBetheBlochParams->get(4, 0u), cfgBetheBlochParams->get(4, 1u), cfgBetheBlochParams->get(4, 2u), cfgBetheBlochParams->get(4, 3u), cfgBetheBlochParams->get(4, 4u))};
double expSigma{expBethe * cfgBetheBlochParams->get(4, 5u)};
double nSigmaTPC{(track.tpcSignal() - expBethe) / expSigma};
int iC = track.signed1Pt() > 0;
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ struct threebodymcfinder {
void init(InitContext&)
{
// initialize histograms
const AxisSpec axisNTimesCollRecoed{(int)10, -0.5f, +9.5f, ""};
const AxisSpec axisPt{(int)100, +0.0f, +10.0f, "p_{T} (GeV/c)"};
const AxisSpec axisNTimesCollRecoed{10, -0.5f, +9.5f, ""};
const AxisSpec axisPt{100, +0.0f, +10.0f, "p_{T} (GeV/c)"};

histos.add("hNTimesCollRecoed", "hNTimesCollRecoed", kTH1F, {axisNTimesCollRecoed});
histos.add("hNDaughters", "hNDaughters", kTH1F, {axisNTimesCollRecoed});
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/TableProducer/QC/flowQC.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ struct flowQC {
const AxisSpec centFT0mAxis{cfgCentralityBins, "FT0M percentile"};
const AxisSpec centFV0aAxis{cfgCentralityBins, "FV0A percentile"};

const AxisSpec centAxis{cfgCentralityBins, fmt::format("{} percentile", (std::string)centDetectorNames[cfgCentralityEstimator])};
const AxisSpec centAxis{cfgCentralityBins, fmt::format("{} percentile", std::string(centDetectorNames[cfgCentralityEstimator]))};

const char* qLabel = cfgQuadraticResponse ? "Q^{2}" : "Q";

Expand Down
8 changes: 4 additions & 4 deletions PWGLF/TableProducer/Resonances/cksspinalignment.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,8 @@ struct cksspinalignment {

auto postrack = v0.template posTrack_as<FullTrackCandidates>();
auto negtrack = v0.template negTrack_as<FullTrackCandidates>();
const auto posId = static_cast<int64_t>(postrack.globalIndex());
const auto negId = static_cast<int64_t>(negtrack.globalIndex());
const auto posId = postrack.globalIndex();
const auto negId = negtrack.globalIndex();

ROOT::Math::PxPyPzMVector pionPos(v0.pxpos(), v0.pypos(), v0.pzpos(), o2::constants::physics::MassPionCharged);
ROOT::Math::PxPyPzMVector pionNeg(v0.pxneg(), v0.pyneg(), v0.pzneg(), o2::constants::physics::MassPionCharged);
Expand All @@ -485,8 +485,8 @@ struct cksspinalignment {
static_cast<float>(k0s.M()),
static_cast<float>(v0.v0cosPA()),
static_cast<float>(v0.v0radius()),
static_cast<float>(std::abs(v0.dcapostopv())),
static_cast<float>(std::abs(v0.dcanegtopv())),
std::abs(v0.dcapostopv()),
std::abs(v0.dcanegtopv()),
// static_cast<float>(std::abs(v0.dcaV0daughters())),
// lifetime,
posId,
Expand Down
64 changes: 32 additions & 32 deletions PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ struct ResonanceInitializer {

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;

// MC Resonance parent filter
Expand Down Expand Up @@ -793,18 +793,18 @@ struct ResonanceInitializer {
v0.py(),
v0.pz(),
childIDs,
(int8_t)(v0.template posTrack_as<TrackType>().tpcNSigmaPi() * 10),
(int8_t)(v0.template posTrack_as<TrackType>().tpcNSigmaKa() * 10),
(int8_t)(v0.template posTrack_as<TrackType>().tpcNSigmaPr() * 10),
(int8_t)(v0.template negTrack_as<TrackType>().tpcNSigmaPi() * 10),
(int8_t)(v0.template negTrack_as<TrackType>().tpcNSigmaKa() * 10),
(int8_t)(v0.template negTrack_as<TrackType>().tpcNSigmaPr() * 10),
(int8_t)(v0.template negTrack_as<TrackType>().tofNSigmaPi() * 10),
(int8_t)(v0.template negTrack_as<TrackType>().tofNSigmaKa() * 10),
(int8_t)(v0.template negTrack_as<TrackType>().tofNSigmaPr() * 10),
(int8_t)(v0.template posTrack_as<TrackType>().tofNSigmaPi() * 10),
(int8_t)(v0.template posTrack_as<TrackType>().tofNSigmaKa() * 10),
(int8_t)(v0.template posTrack_as<TrackType>().tofNSigmaPr() * 10),
static_cast<int8_t>(v0.template posTrack_as<TrackType>().tpcNSigmaPi() * 10),
static_cast<int8_t>(v0.template posTrack_as<TrackType>().tpcNSigmaKa() * 10),
static_cast<int8_t>(v0.template posTrack_as<TrackType>().tpcNSigmaPr() * 10),
static_cast<int8_t>(v0.template negTrack_as<TrackType>().tpcNSigmaPi() * 10),
static_cast<int8_t>(v0.template negTrack_as<TrackType>().tpcNSigmaKa() * 10),
static_cast<int8_t>(v0.template negTrack_as<TrackType>().tpcNSigmaPr() * 10),
static_cast<int8_t>(v0.template negTrack_as<TrackType>().tofNSigmaPi() * 10),
static_cast<int8_t>(v0.template negTrack_as<TrackType>().tofNSigmaKa() * 10),
static_cast<int8_t>(v0.template negTrack_as<TrackType>().tofNSigmaPr() * 10),
static_cast<int8_t>(v0.template posTrack_as<TrackType>().tofNSigmaPi() * 10),
static_cast<int8_t>(v0.template posTrack_as<TrackType>().tofNSigmaKa() * 10),
static_cast<int8_t>(v0.template posTrack_as<TrackType>().tofNSigmaPr() * 10),
v0.v0cosPA(),
v0.dcaV0daughters(),
v0.dcapostopv(),
Expand Down Expand Up @@ -845,24 +845,24 @@ struct ResonanceInitializer {
casc.py(),
casc.pz(),
childIDs,
(int8_t)(casc.template posTrack_as<TrackType>().tpcNSigmaPi() * 10),
(int8_t)(casc.template posTrack_as<TrackType>().tpcNSigmaKa() * 10),
(int8_t)(casc.template posTrack_as<TrackType>().tpcNSigmaPr() * 10),
(int8_t)(casc.template negTrack_as<TrackType>().tpcNSigmaPi() * 10),
(int8_t)(casc.template negTrack_as<TrackType>().tpcNSigmaKa() * 10),
(int8_t)(casc.template negTrack_as<TrackType>().tpcNSigmaPr() * 10),
(int8_t)(casc.template bachelor_as<TrackType>().tpcNSigmaPi() * 10),
(int8_t)(casc.template bachelor_as<TrackType>().tpcNSigmaKa() * 10),
(int8_t)(casc.template bachelor_as<TrackType>().tpcNSigmaPr() * 10),
(int8_t)(casc.template posTrack_as<TrackType>().tofNSigmaPi() * 10),
(int8_t)(casc.template posTrack_as<TrackType>().tofNSigmaKa() * 10),
(int8_t)(casc.template posTrack_as<TrackType>().tofNSigmaPr() * 10),
(int8_t)(casc.template negTrack_as<TrackType>().tofNSigmaPi() * 10),
(int8_t)(casc.template negTrack_as<TrackType>().tofNSigmaKa() * 10),
(int8_t)(casc.template negTrack_as<TrackType>().tofNSigmaPr() * 10),
(int8_t)(casc.template bachelor_as<TrackType>().tofNSigmaPi() * 10),
(int8_t)(casc.template bachelor_as<TrackType>().tofNSigmaKa() * 10),
(int8_t)(casc.template bachelor_as<TrackType>().tofNSigmaPr() * 10),
static_cast<int8_t>(casc.template posTrack_as<TrackType>().tpcNSigmaPi() * 10),
static_cast<int8_t>(casc.template posTrack_as<TrackType>().tpcNSigmaKa() * 10),
static_cast<int8_t>(casc.template posTrack_as<TrackType>().tpcNSigmaPr() * 10),
static_cast<int8_t>(casc.template negTrack_as<TrackType>().tpcNSigmaPi() * 10),
static_cast<int8_t>(casc.template negTrack_as<TrackType>().tpcNSigmaKa() * 10),
static_cast<int8_t>(casc.template negTrack_as<TrackType>().tpcNSigmaPr() * 10),
static_cast<int8_t>(casc.template bachelor_as<TrackType>().tpcNSigmaPi() * 10),
static_cast<int8_t>(casc.template bachelor_as<TrackType>().tpcNSigmaKa() * 10),
static_cast<int8_t>(casc.template bachelor_as<TrackType>().tpcNSigmaPr() * 10),
static_cast<int8_t>(casc.template posTrack_as<TrackType>().tofNSigmaPi() * 10),
static_cast<int8_t>(casc.template posTrack_as<TrackType>().tofNSigmaKa() * 10),
static_cast<int8_t>(casc.template posTrack_as<TrackType>().tofNSigmaPr() * 10),
static_cast<int8_t>(casc.template negTrack_as<TrackType>().tofNSigmaPi() * 10),
static_cast<int8_t>(casc.template negTrack_as<TrackType>().tofNSigmaKa() * 10),
static_cast<int8_t>(casc.template negTrack_as<TrackType>().tofNSigmaPr() * 10),
static_cast<int8_t>(casc.template bachelor_as<TrackType>().tofNSigmaPi() * 10),
static_cast<int8_t>(casc.template bachelor_as<TrackType>().tofNSigmaKa() * 10),
static_cast<int8_t>(casc.template bachelor_as<TrackType>().tofNSigmaPr() * 10),
casc.v0cosPA(collision.posX(), collision.posY(), collision.posZ()),
casc.casccosPA(collision.posX(), collision.posY(), collision.posZ()),
casc.dcaV0daughters(),
Expand Down
Loading
Loading