From 409c7bddd41e436d3ebfe67759c8486a5a6ad40d Mon Sep 17 00:00:00 2001 From: Cornelius Feier-Riesen <cornelius.riesen@physik.uni-giessen.de> Date: Wed, 21 Jul 2021 10:30:22 +0200 Subject: [PATCH] Do small corrections on lmvm analysis and apply clang format --- .../dielectron/lmvm/CbmAnaDielectronTask.cxx | 23 +++++++++++++------ .../lmvm/CbmAnaDielectronTaskDrawAll.cxx | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx index 677a3686e2..4c18e2783c 100644 --- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx +++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx @@ -2666,13 +2666,22 @@ void CbmAnaDielectronTask::Finish() void CbmAnaDielectronTask::SetEnergyAndPlutoParticle(const string& energy, const string& particle) { // names of particles in common production differ from our names - if (particle == "rho0") particle == "inmed"; // or "inmed_had_epem"?? - else if (particle == "wdalitz") - particle == "omegadalitz"; - else if (particle == "w") - particle == "omegaepem"; - else if (particle == "qgp_epem") - particle == "qgp"; + if (particle == "rho0") { + this->SetEnergyAndPlutoParticle(energy, "inmed"); + return; + } + else if (particle == "wdalitz") { + this->SetEnergyAndPlutoParticle(energy, "omegadalitz"); + return; + } + else if (particle == "w") { + this->SetEnergyAndPlutoParticle(energy, "omegaepem"); + return; + } + else if (particle == "qgp_epem") { + this->SetEnergyAndPlutoParticle(energy, "qgp"); + return; + } // Au+Au centr old scaling factors /* if (energy == "8gev" || energy == "10gev") { diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx index 9fe8d94700..3b57bfeea1 100644 --- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx +++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx @@ -1711,7 +1711,7 @@ void CbmAnaDielectronTaskDrawAll::CalcCombBGHistos() else if (step == kPtCut) cock = (TH1D*) GetCoctailMinv(kPtCut); - cock->Rebin(nRebin); + if (cock != NULL) cock->Rebin(nRebin); fh_mean_combSignalNpm_minv[step] = (TH1D*) fh_mean_bg_minv[step]->Clone(); fh_mean_combSignalNpm_minv[step]->Add(cock); fh_mean_combSignalNpm_minv[step]->Add(fh_mean_combBg_minv[step], -1.); -- GitLab