Skip to content

[636][hist] extend LIST option to support CONT1 CONT2 CONT3 #20971

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
dpiparo merged 1 commit into from
Jan 21, 2026
Merged

[636][hist] extend LIST option to support CONT1 CONT2 CONT3 #20971

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
32 changes: 23 additions & 9 deletions hist/histpainter/src/THistPainter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6045,7 +6045,7 @@ void THistPainter::PaintContour(Option_t *option)
TList *list = nullptr;
TGraph *graph = nullptr;
std::vector<Int_t> np;
if (Hoption.Contour == 1) {
if (Hoption.Contour == 1 || (Hoption.List && (Hoption.Contour == 11 || Hoption.Contour == 12 || Hoption.Contour == 13))) {
np.resize(ncontour);
for (i=0;i<ncontour;i++)
np[i] = 0;
Expand Down Expand Up @@ -6170,7 +6170,8 @@ void THistPainter::PaintContour(Option_t *option)
if (Hoption.Contour != 1) {
fH->TAttLine::Modify();
gPad->PaintPolyLine(2,xarr.data()+ix-1,yarr.data()+ix-1);
continue;
if ((Hoption.Contour != 11 && Hoption.Contour != 12 && Hoption.Contour != 13) || !Hoption.List)
continue;
}

ipoly = itarr[ix-1];
Expand All @@ -6192,7 +6193,10 @@ void THistPainter::PaintContour(Option_t *option)
Int_t first = ncontour;
std::vector<Int_t> polysort;
Int_t contListNb;
if (Hoption.Contour != 1) goto theEND;
if (Hoption.Contour != 1) {
if (!Hoption.List || (Hoption.Contour != 11 && Hoption.Contour != 12 && Hoption.Contour != 13))
goto theEND;
}

//The 2 points line generated above are now sorted/merged to generate
//a list of consecutive points.
Expand All @@ -6211,9 +6215,9 @@ void THistPainter::PaintContour(Option_t *option)
k = 0;
for (ipoly=first-1;ipoly>=0;ipoly--) {polysort[k] = ipoly; k++;}
for (ipoly=first;ipoly<ncontour;ipoly++) {polysort[k] = ipoly; k++;}
// we can now draw sorted contours
// if Contour==1 we can now draw sorted contours, otherwise (11,12,13) just store
contListNb = 0;
fH->SetFillStyle(1001);
if (Hoption.Contour == 1) fH->SetFillStyle(1001);
for (k=0;k<ncontour;k++) {
ipoly = polysort[k];
if (Hoption.List) list = (TList*)contours->At(contListNb);
Expand Down Expand Up @@ -6252,12 +6256,22 @@ void THistPainter::PaintContour(Option_t *option)
}
theColor = Int_t((ipoly+0.99)*Float_t(ncolors)/Float_t(ndivz));
icol = gStyle->GetColorPalette(theColor);
if (ndivz > 1) fH->SetFillColor(icol);
fH->TAttFill::Modify();
gPad->PaintFillArea(iplus-iminus+1,xp.data()+iminus,yp.data()+iminus);
if (Hoption.Contour == 1) {
if (ndivz > 1) fH->SetFillColor(icol);
fH->TAttFill::Modify();
gPad->PaintFillArea(iplus-iminus+1,xp.data()+iminus,yp.data()+iminus);
}
if (Hoption.List) {
graph = new TGraph(iplus-iminus+1,xp.data()+iminus,yp.data()+iminus);
graph->SetFillColor(icol);
if (Hoption.Contour == 1)
graph->SetFillColor(icol);
else if (Hoption.Contour == 11)
graph->SetLineColor(icol);
else if (Hoption.Contour == 12) {
mode = icol%5;
if (mode == 0) mode = 5;
graph->SetLineStyle(mode);
}
graph->SetLineWidth(fH->GetLineWidth());
list->Add(graph);
}
Expand Down
Loading