From b3ee2d9f88bf4d635001e046cd0cdf29332ac1a5 Mon Sep 17 00:00:00 2001 From: Tommaso Tedeschi Date: Fri, 24 Apr 2026 12:04:44 +0200 Subject: [PATCH 1/2] fix ci --- src/cmsstyle.C | 31 ++++++++++++++++--------------- src/cmsstyle.H | 10 ++++++---- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/cmsstyle.C b/src/cmsstyle.C index d4eece5..7498a8d 100644 --- a/src/cmsstyle.C +++ b/src/cmsstyle.C @@ -30,6 +30,7 @@ #include #include #include +#include // Globals from ROOT @@ -178,12 +179,12 @@ void SetEnergy (Double_t energy, const std::string &unit) { if (energy==0) cms_energy=unit; else { - if (fabs(energy-13)<0.001) cms_energy="13 "; - else if (fabs(energy-13.6)<0.001) cms_energy="13.6 "; - else if (fabs(energy-7) < 0.001) cms_energy="7"; - else if (fabs(energy-0.9) < 0.001) cms_energy="0.9"; - else if (fabs(energy - 5.02) < 0.001) cms_energy="5.02"; - else if (fabs(energy - 2.4) < 0.001) cms_energy="2.4"; + if (std::fabs(energy-13)<0.001) cms_energy="13 "; + else if (std::fabs(energy-13.6)<0.001) cms_energy="13.6 "; + else if (std::fabs(energy-7) < 0.001) cms_energy="7"; + else if (std::fabs(energy-0.9) < 0.001) cms_energy="0.9"; + else if (std::fabs(energy - 5.02) < 0.001) cms_energy="5.02"; + else if (std::fabs(energy - 2.4) < 0.001) cms_energy="2.4"; else { std::cerr<<"ERROR: Unsupported value of the energy... use manual setting of the cms_energy value"<GetRightMargin() * 0.95; - if (isnan(X2)) X2 = 1 - canv->GetRightMargin() * 0.70; - if (isnan(Y1)) Y1 = canv->GetBottomMargin(); - if (isnan(Y2)) Y2 = 1 - canv->GetTopMargin(); + if (std::isnan(X1)) X1 = 1 - canv->GetRightMargin() * 0.95; + if (std::isnan(X2)) X2 = 1 - canv->GetRightMargin() * 0.70; + if (std::isnan(Y1)) Y1 = canv->GetBottomMargin(); + if (std::isnan(Y2)) Y2 = 1 - canv->GetTopMargin(); } std::vector vars({&TPave::SetX1,&TPave::SetX2,&TPave::SetY1,&TPave::SetY2}); if (isNDC) vars = {&TPave::SetX1NDC,&TPave::SetX2NDC,&TPave::SetY1NDC,&TPave::SetY2NDC}; // Changing the coordinates! - if (isnan(X1)) (palette->*vars[0])(X1); - if (isnan(X2)) (palette->*vars[1])(X2); - if (isnan(Y1)) (palette->*vars[2])(Y1); - if (isnan(Y2)) (palette->*vars[3])(Y2); + if (!std::isnan(X1)) (palette->*vars[0])(X1); + if (!std::isnan(X2)) (palette->*vars[1])(X2); + if (!std::isnan(Y1)) (palette->*vars[2])(Y1); + if (!std::isnan(Y2)) (palette->*vars[3])(Y2); } // ---------------------------------------------------------------------- diff --git a/src/cmsstyle.H b/src/cmsstyle.H index 2ec6093..5196ce8 100644 --- a/src/cmsstyle.H +++ b/src/cmsstyle.H @@ -28,6 +28,8 @@ #include #include #include +#include +#include namespace cmsstyle { @@ -451,10 +453,10 @@ void SetAlternative2DColor (TH2 *hist=nullptr, TStyle *style=nullptr, Double_t a /// void UpdatePalettePosition (TH2 *hist, TPad *canv=nullptr, - Double_t X1=NAN, - Double_t X2=NAN, - Double_t Y1=NAN, - Double_t Y2=NAN, + Double_t X1=std::numeric_limits::quiet_NaN(), + Double_t X2=std::numeric_limits::quiet_NaN(), + Double_t Y1=std::numeric_limits::quiet_NaN(), + Double_t Y2=std::numeric_limits::quiet_NaN(), Bool_t isNDC=true); // /////////////////////////////////////////////// From 2e99988c9e8f241bae3df579ada916993443e267 Mon Sep 17 00:00:00 2001 From: Tommaso Tedeschi Date: Mon, 27 Apr 2026 11:36:44 +0200 Subject: [PATCH 2/2] fix typo --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2b215c4..7367075 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,10 @@ _scram-venv_) that step is no longer needed, but the working directory should be used always in the virtual enviroment (that should be already setup when doing the commonly required _cmsenv_ command. -Remark that if you have a local installacion of cmsstyle, it may collide with +Remark that if you have a local installation of cmsstyle, it may collide with the virtual environment, so you may want to do -```export PYTHONNOUSERSITE=True +``` +export PYTHONNOUSERSITE=True ``` to prevent the conflicts.