Skip to content

Commit

Permalink
Refs #9099 add bin to output workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
VickieLynch committed Feb 27, 2014
1 parent 890a51a commit 35a12d6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
Expand Up @@ -67,7 +67,7 @@ void ConvolveWorkspaces::exec()
// Cache a few things for later use
const size_t numHists = ws1->getNumberHistograms();
const size_t numBins = ws1->blocksize();
Workspace2D_sptr outputWS = boost::dynamic_pointer_cast<Workspace2D>(WorkspaceFactory::Instance().create(ws1,numHists,numBins,numBins-1));
Workspace2D_sptr outputWS = boost::dynamic_pointer_cast<Workspace2D>(WorkspaceFactory::Instance().create(ws1,numHists,numBins+1,numBins));

// First check that the workspace are the same size
if ( numHists != ws2->getNumberHistograms() )
Expand All @@ -76,7 +76,7 @@ void ConvolveWorkspaces::exec()
}

prog = new Progress(this, 0.0, 1.0, numHists);
// Now check the data itself
// Now convolve the histograms
PARALLEL_FOR3(ws1, ws2, outputWS)
for ( int l = 0; l < static_cast<int>(numHists); ++l )
{
Expand Down

0 comments on commit 35a12d6

Please sign in to comment.