Skip to content

[hist] fine-grained autorange feature for TH2/3 #20598

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

Closed
ferdymercury wants to merge 1 commit into from
Closed

[hist] fine-grained autorange feature for TH2/3 #20598

Show file tree
Hide file tree
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
35 changes: 25 additions & 10 deletions hist/hist/src/TH2.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,35 +260,50 @@ Int_t TH2::BufferEmpty(Int_t action)
fBuffer = buffer;
}

if (CanExtendAllAxes() || fXaxis.GetXmax() <= fXaxis.GetXmin() || fYaxis.GetXmax() <= fYaxis.GetXmin()) {
const bool xbinAuto = fXaxis.GetXmax() <= fXaxis.GetXmin();
Double_t xmin = fBuffer[2];
Double_t xmax = xmin;
if (CanExtendAllAxes() || xbinAuto) {
//find min, max of entries in buffer
Double_t xmin = fBuffer[2];
Double_t xmax = xmin;
Double_t ymin = fBuffer[3];
Double_t ymax = ymin;
for (Int_t i=1;i<nbentries;i++) {
Double_t x = fBuffer[3*i+2];
if (x < xmin) xmin = x;
if (x > xmax) xmax = x;
}
if (xbinAuto) {
THLimitsFinder::GetLimitsFinder()->FindGoodLimits(this,xmin,xmax);
} else {
fBuffer = nullptr;
Int_t keep = fBufferSize; fBufferSize = 0;
if (xmin < fXaxis.GetXmin()) ExtendAxis(xmin,&fXaxis);
if (xmax >= fXaxis.GetXmax()) ExtendAxis(xmax,&fXaxis);
fBuffer = buffer;
fBufferSize = keep;
}
}
const bool ybinAuto = fYaxis.GetXmax() <= fYaxis.GetXmin();
Double_t ymin = fBuffer[3];
Double_t ymax = ymin;
if (CanExtendAllAxes() || ybinAuto) {
//find min, max of entries in buffer
for (Int_t i=1;i<nbentries;i++) {
Double_t y = fBuffer[3*i+3];
if (y < ymin) ymin = y;
if (y > ymax) ymax = y;
}
if (fXaxis.GetXmax() <= fXaxis.GetXmin() || fYaxis.GetXmax() <= fYaxis.GetXmin()) {
if (ybinAuto) {
THLimitsFinder::GetLimitsFinder()->FindGoodLimits(this,xmin,xmax,ymin,ymax);
} else {
fBuffer = nullptr;
Int_t keep = fBufferSize; fBufferSize = 0;
if (xmin < fXaxis.GetXmin()) ExtendAxis(xmin,&fXaxis);
if (xmax >= fXaxis.GetXmax()) ExtendAxis(xmax,&fXaxis);
if (ymin < fYaxis.GetXmin()) ExtendAxis(ymin,&fYaxis);
if (ymax >= fYaxis.GetXmax()) ExtendAxis(ymax,&fYaxis);
fBuffer = buffer;
fBufferSize = keep;
}
}

fBuffer = nullptr;
buffer = fBuffer; fBuffer = nullptr;
for (Int_t i=0;i<nbentries;i++) {
Fill(buffer[3*i+2],buffer[3*i+3],buffer[3*i+1]);
}
Expand Down
100 changes: 64 additions & 36 deletions hist/hist/src/TH3.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,43 +241,71 @@ Int_t TH3::BufferEmpty(Int_t action)
Reset("ICES");
fBuffer = buffer;
}
if (CanExtendAllAxes() || fXaxis.GetXmax() <= fXaxis.GetXmin() ||
fYaxis.GetXmax() <= fYaxis.GetXmin() ||
fZaxis.GetXmax() <= fZaxis.GetXmin()) {
//find min, max of entries in buffer
Double_t xmin = fBuffer[2];
Double_t xmax = xmin;
Double_t ymin = fBuffer[3];
Double_t ymax = ymin;
Double_t zmin = fBuffer[4];
Double_t zmax = zmin;
for (Int_t i=1;i<nbentries;i++) {
Double_t x = fBuffer[4*i+2];
if (x < xmin) xmin = x;
if (x > xmax) xmax = x;
Double_t y = fBuffer[4*i+3];
if (y < ymin) ymin = y;
if (y > ymax) ymax = y;
Double_t z = fBuffer[4*i+4];
if (z < zmin) zmin = z;
if (z > zmax) zmax = z;
}
if (fXaxis.GetXmax() <= fXaxis.GetXmin() || fYaxis.GetXmax() <= fYaxis.GetXmin() || fZaxis.GetXmax() <= fZaxis.GetXmin()) {
THLimitsFinder::GetLimitsFinder()->FindGoodLimits(this,xmin,xmax,ymin,ymax,zmin,zmax);
} else {
fBuffer = nullptr;
Int_t keep = fBufferSize; fBufferSize = 0;
if (xmin < fXaxis.GetXmin()) ExtendAxis(xmin,&fXaxis);
if (xmax >= fXaxis.GetXmax()) ExtendAxis(xmax,&fXaxis);
if (ymin < fYaxis.GetXmin()) ExtendAxis(ymin,&fYaxis);
if (ymax >= fYaxis.GetXmax()) ExtendAxis(ymax,&fYaxis);
if (zmin < fZaxis.GetXmin()) ExtendAxis(zmin,&fZaxis);
if (zmax >= fZaxis.GetXmax()) ExtendAxis(zmax,&fZaxis);
fBuffer = buffer;
fBufferSize = keep;
}
const bool xbinAuto = fXaxis.GetXmax() <= fXaxis.GetXmin();
Double_t xmin = fBuffer[2];
Double_t xmax = xmin;
if (CanExtendAllAxes() || xbinAuto) {
//find min, max of entries in buffer
for (Int_t i=1;i<nbentries;i++) {
Double_t x = fBuffer[4*i+2];
if (x < xmin) xmin = x;
if (x > xmax) xmax = x;
}
if (xbinAuto) {
THLimitsFinder::GetLimitsFinder()->FindGoodLimits(this,xmin,xmax);
} else {
fBuffer = nullptr;
Int_t keep = fBufferSize; fBufferSize = 0;
if (xmin < fXaxis.GetXmin()) ExtendAxis(xmin,&fXaxis);
if (xmax >= fXaxis.GetXmax()) ExtendAxis(xmax,&fXaxis);
fBuffer = buffer;
fBufferSize = keep;
}
}
const bool ybinAuto = fYaxis.GetXmax() <= fYaxis.GetXmin();
Double_t ymin = fBuffer[3];
Double_t ymax = ymin;
if (CanExtendAllAxes() || ybinAuto) {
//find min, max of entries in buffer
for (Int_t i=1;i<nbentries;i++) {
Double_t y = fBuffer[4*i+3];
if (y < ymin) ymin = y;
if (y > ymax) ymax = y;
}
if (ybinAuto) {
THLimitsFinder::GetLimitsFinder()->FindGoodLimits(this,xmin,xmax,ymin,ymax);
} else {
fBuffer = nullptr;
Int_t keep = fBufferSize; fBufferSize = 0;
if (ymin < fYaxis.GetXmin()) ExtendAxis(ymin,&fYaxis);
if (ymax >= fYaxis.GetXmax()) ExtendAxis(ymax,&fYaxis);
fBuffer = buffer;
fBufferSize = keep;
}
}
const bool zbinAuto = fZaxis.GetXmax() <= fZaxis.GetXmin();
Double_t zmin = fBuffer[4];
Double_t zmax = zmin;
if (CanExtendAllAxes() || zbinAuto) {
//find min, max of entries in buffer
for (Int_t i=1;i<nbentries;i++) {
Double_t z = fBuffer[4*i+4];
if (z < zmin) zmin = z;
if (z > zmax) zmax = z;
}
if (zbinAuto) {
THLimitsFinder::GetLimitsFinder()->FindGoodLimits(this,xmin,xmax,ymin,ymax,zmin,zmax);
} else {
fBuffer = nullptr;
Int_t keep = fBufferSize; fBufferSize = 0;
if (zmin < fZaxis.GetXmin()) ExtendAxis(zmin,&fZaxis);
if (zmax >= fZaxis.GetXmax()) ExtendAxis(zmax,&fZaxis);
fBuffer = buffer;
fBufferSize = keep;
}
}
fBuffer = nullptr;

buffer = fBuffer; fBuffer = nullptr;

for (Int_t i=0;i<nbentries;i++) {
Fill(buffer[4*i+2],buffer[4*i+3],buffer[4*i+4],buffer[4*i+1]);
Expand Down
Loading