Skip to content

Commit

Permalink
Refs #5861 all chunks
Browse files Browse the repository at this point in the history
  • Loading branch information
VickieLynch committed Oct 30, 2012
1 parent a3a5b96 commit ede5894
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Code/Mantid/Framework/Algorithms/src/SmoothData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ void SmoothData::exec()
const int vecSize = static_cast<int>(inputWorkspace->blocksize());
if ( npts >= vecSize )
{
std::cout << npts <<" "<<vecSize<<"\n";
g_log.error("The number of averaging points requested is larger than the spectrum length");
throw std::out_of_range("The number of averaging points requested is larger than the spectrum length");
}
Expand All @@ -98,6 +99,7 @@ void SmoothData::exec()
npts = nptsGroup[group];
if ( npts >= vecSize )
{
std::cout << i<<" "<<npts <<" "<<vecSize<<"\n";
g_log.error("The number of averaging points requested is larger than the spectrum length");
throw std::out_of_range("The number of averaging points requested is larger than the spectrum length");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def _loadEventNeXusData(self, runnumber, extension, **kwargs):
name = "%s_%d" % (self._instrument, runnumber)
filename = name + extension

alg = LoadEventNexus(Filename=filename, OutputWorkspace=name, TotalChunks=6, ChunkNumber=6, **kwargs)
alg = LoadEventNexus(Filename=filename, OutputWorkspace=name, **kwargs)
wksp = alg.workspace()
# For NOMAD data before Aug 2012, use the updated geometry
if str(wksp.getInstrument().getValidFromDate()) == "1900-01-31T23:59:59":
Expand Down

0 comments on commit ede5894

Please sign in to comment.