Skip to content

Commit

Permalink
refs #9937 Typos in MergeMDFiles
Browse files Browse the repository at this point in the history
  • Loading branch information
abuts committed Jul 17, 2014
1 parent 6a4b083 commit 36d9193
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Code/Mantid/Framework/MDAlgorithms/src/MergeMDFiles.cpp
Expand Up @@ -149,13 +149,13 @@ namespace MDAlgorithms
g_log.notice() << totalEvents << " events in " << m_Filenames.size() << " files." << std::endl;
}

/** Task that loads all of the events from correspondend boxes of all files
/** Task that loads all of the events from corresponded boxes of all files
* that is being merged into a particular box in the output workspace.
*/

uint64_t MergeMDFiles::loadEventsFromSubBoxes(API::IMDNode *TargetBox)
{
/// get rid of the events and averages which are in the memory erroneously (from clonning)
/// get rid of the events and averages which are in the memory erroneously (from cloning)
TargetBox->clear();

uint64_t nBoxEvents(0);
Expand Down Expand Up @@ -255,7 +255,7 @@ namespace MDAlgorithms
if(DiskBuf)
{
if(box->getDataInMemorySize()>0)
{ // data position has been already precalculated
{ // data position has been already pre-calculated
box->getISaveable()->save();
box->clearDataFromMemory();
//Kernel::ISaveable *Saver = box->getISaveable();
Expand Down Expand Up @@ -315,7 +315,7 @@ namespace MDAlgorithms
if (!outputFile.empty())
{
g_log.notice() << "Starting SaveMD to update the file back-end." << std::endl;
// create or open WS group and put there additional information about WS and its dimesnions
// create or open WS group and put there additional information about WS and its dimensions
boost::scoped_ptr< ::NeXus::File> file(MDBoxFlatTree::createOrOpenMDWSgroup(outputFile,m_nDims,m_MDEventType,false));
this->progress(0.94, "Saving ws history and dimensions");
MDBoxFlatTree::saveWSGenericInfo(file.get(),m_OutIWS);
Expand All @@ -326,7 +326,7 @@ namespace MDAlgorithms
file->closeGroup();
file->close();
// -------------- Save Box Structure -------------------------------------
// OK, we've filled these big arrays of data representing flat box structrre. Save them.
// OK, we've filled these big arrays of data representing flat box structure. Save them.
progress(0.91, "Writing Box Data");
prog->resetNumSteps(8, 0.92, 1.00);

Expand All @@ -347,7 +347,7 @@ namespace MDAlgorithms
void MergeMDFiles::exec()
{
// clear disk buffer which can remain from previous runs
// the existance/ usage of the buffer idicates if the algorithm works with file based or memory based target workspaces;
// the existence/ usage of the buffer indicates if the algorithm works with file based or memory based target workspaces;
// pDiskBuffer = NULL;
MultipleFileProperty * multiFileProp = dynamic_cast<MultipleFileProperty*>(getPointerToProperty("Filenames"));
m_Filenames = MultipleFileProperty::flattenFileNames(multiFileProp->operator()());
Expand Down

0 comments on commit 36d9193

Please sign in to comment.