Skip to content

Fix for failing CI/CD job and condition inversion #75

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

Merged
ttedeschi merged 2 commits into from
Apr 29, 2026
Merged

Fix for failing CI/CD job and condition inversion #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ee2d9
fix ci
ttedeschi Apr 24, 2026
2e99988
fix typo
ttedeschi Apr 27, 2026
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
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
31 changes: 16 additions & 15 deletions src/cmsstyle.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <algorithm>
#include <cstdlib>
#include <iomanip>
#include <cmath>

// Globals from ROOT

Expand Down Expand Up @@ -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"<<std::endl;
cms_energy="???? ";
Expand Down Expand Up @@ -420,7 +421,7 @@ void CMS_lumi (TPad *ppad, Int_t iPosX, Double_t scaleLumi)
Double_t relExtraDY = 1.2;

Bool_t outOfFrame = (int(iPosX / 10) == 0);
Int_t alignX_ = max(int(iPosX / 10), 1);
Int_t alignX_ = std::max(int(iPosX / 10), 1);
Int_t alignY_ = (iPosX==0)?1:3;
Int_t align_ = 10 * alignX_ + alignY_;

Expand Down Expand Up @@ -847,20 +848,20 @@ void UpdatePalettePosition (TH2 *hist,
// values are provided!
TH1 *hframe = GetCmsCanvasHist(canv);

if (isnan(X1)) X1 = 1 - canv->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<void (TPave::*)(Double_t)> 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);
}

// ----------------------------------------------------------------------
Expand Down
10 changes: 6 additions & 4 deletions src/cmsstyle.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <utility>
#include <map>
#include <vector>
#include <cmath>
#include <limits>

namespace cmsstyle {

Expand Down Expand Up @@ -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<Double_t>::quiet_NaN(),
Double_t X2=std::numeric_limits<Double_t>::quiet_NaN(),
Double_t Y1=std::numeric_limits<Double_t>::quiet_NaN(),
Double_t Y2=std::numeric_limits<Double_t>::quiet_NaN(),
Bool_t isNDC=true);

// ///////////////////////////////////////////////
Expand Down