Skip to content

Fix NDPluginStats dimension assignment #542

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
OCopping wants to merge 1 commit into from
Closed

Fix NDPluginStats dimension assignment #542

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
11 changes: 6 additions & 5 deletions ADApp/pluginSrc/NDPluginStats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ void NDPluginStats::processCallbacks(NDArray *pArray)
double bgdCounts, avgBgd;
NDArray *pBgdArray=NULL;
int computeStatistics, computeCentroid, computeProfiles, computeHistogram;
size_t sizeX=0, sizeY=0;
size_t sizeX=0, sizeY=0, colorSize=0;
int i;
int itemp;
NDArrayInfo arrayInfo;
Expand All @@ -440,7 +440,6 @@ void NDPluginStats::processCallbacks(NDArray *pArray)
/* Call the base class method */
NDPluginDriver::beginProcessCallbacks(pArray);

pArray->getInfo(&arrayInfo);
getIntegerParam(NDPluginStatsComputeStatistics, &computeStatistics);
getIntegerParam(NDPluginStatsComputeCentroid, &computeCentroid);
getIntegerParam(NDPluginStatsComputeProfiles, &computeProfiles);
Expand All @@ -453,10 +452,12 @@ void NDPluginStats::processCallbacks(NDArray *pArray)
getDoubleParam (NDPluginStatsHistMax, &pStats->histMax);
getDoubleParam (NDPluginStatsCentroidThreshold, &pStats->centroidThreshold);

if (pArray->ndims > 0) sizeX = pArray->dims[0].size;
if (pArray->ndims == 1) sizeY = 1;
if (pArray->ndims > 1) sizeY = pArray->dims[1].size;
/* Get information about the array */
pArray->getInfo(&arrayInfo);

sizeX = arrayInfo.xDim;
sizeY = arrayInfo.yDim;
colorSize = arrayInfo.colorDim;

if (computeCentroid || computeProfiles) {
pStats->profileSizeX = sizeX;
Expand Down
Loading