Skip to content

Commit

Permalink
refs #6841 fixing build (directly on development)
Browse files Browse the repository at this point in the history
  • Loading branch information
abuts committed Apr 8, 2013
1 parent acd77d4 commit 7a345a9
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions Code/Mantid/Framework/MDAlgorithms/src/MergeMD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,18 +167,18 @@ namespace MDAlgorithms
// Perform the initial box splitting
out->splitBox();

// copy experiment infos
uint16_t nExperiments(0);
if(m_workspaces.size()>std::numeric_limits<uint16_t>::max())
throw std::invalid_argument("currently we can not combine more then 65535 experiments");
else
nExperiments = static_cast<uint16_t>(m_workspaces.size());

for (uint16_t i=0; i < nExperiments; i++)
{
API::ExperimentInfo_sptr ei = API::ExperimentInfo_sptr(m_workspaces[i]->getExperimentInfo(i)->cloneExperimentInfo());
out->addExperimentInfo(ei);
}
//// copy experiment infos
// uint16_t nExperiments(0);
// if(m_workspaces.size()>std::numeric_limits<uint16_t>::max())
// throw std::invalid_argument("currently we can not combine more then 65535 experiments");
// else
// nExperiments = static_cast<uint16_t>(m_workspaces.size());

// for (uint16_t i=0; i < nExperiments; i++)
// {
// API::ExperimentInfo_sptr ei = API::ExperimentInfo_sptr(m_workspaces[i]->getExperimentInfo(i)->cloneExperimentInfo());
// out->addExperimentInfo(ei);
// }

}

Expand Down

0 comments on commit 7a345a9

Please sign in to comment.