Skip to content

Commit

Permalink
Refs #5772 eliminated some boost imports
Browse files Browse the repository at this point in the history
  • Loading branch information
RuthFromDuluth committed Aug 20, 2012
1 parent a4c5edf commit 16b1ff1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Crystal/src/PeakIntegration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Integrate and calculate error of integration of each peak from single crystal da
#include "MantidKernel/VisibleWhenProperty.h"
#include "MantidKernel/EnabledWhenProperty.h"
#include "MantidAPI/MemoryManager.h"
#include <boost/thread.hpp>


namespace Mantid
{
Expand Down
14 changes: 7 additions & 7 deletions Code/Mantid/Framework/Crystal/test/IntegratePeakCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidKernel/Unit.h"
#include "MantidKernel/MersenneTwister.h"
//#include "MantidKernel/MersenneTwister.h"
#include "MantidAPI/IPeak.h"
#include <math.h>
#include <cstdlib>
#include <iostream>
#include <boost/thread.hpp>
#include <boost/ref.hpp>
//#include <boost/thread.hpp>
//#include <boost/ref.hpp>
#include <map>
#include "MantidKernel/Quat.h"
#include "MantidAPI/FrameworkManager.h"
Expand Down Expand Up @@ -291,7 +291,7 @@ class IntegratePeakCheck: public CxxTest::TestSuite
{
Mantid::API::FrameworkManager::Instance();
usePoisson = false;
m_randGen.setSeed(1234);
// m_randGen.setSeed(1234);
}
/*
int* ArryofIDs = new int[500];
Expand Down Expand Up @@ -719,7 +719,7 @@ ISAWIntensityError 59.4822 69.8998 78.9547 87.073 78.9547
{
boost::shared_ptr<Algorithm> loadPeaks = AlgorithmFactory::Instance().create("LoadIsawPeaks",1);
loadPeaks->initialize();
loadPeaks->setProperty("Filename","/usr2/DATA/Projects/TOPAZ/T5637_44/ISAW_EV_TESTS/IntPk.integrate"");
loadPeaks->setProperty("Filename","/usr2/DATA/Projects/TOPAZ/T5637_44/ISAW_EV_TESTS/IntPk.integrate");
loadPeaks->setPropertyValue("OutputWorkspace", "Peaks");
loadPeaks->execute();
loadPeaks->setPropertyValue("OutputWorkspace", "Peaks");
Expand Down Expand Up @@ -876,11 +876,11 @@ ISAWIntensityError 59.4822 69.8998 78.9547 87.073 78.9547

private:
bool usePoisson;
Mantid::Kernel::MersenneTwister m_randGen;
//Mantid::Kernel::MersenneTwister m_randGen;
double Poisson( double mean)
{
double T = exp(-mean);
double P = m_randGen.nextValue();
double P = 1;//m_randGen.nextValue();
int N=0;
double S =T;
// std::cout<< "Poisson "<< mean<<","<<P<<","<<T;
Expand Down

0 comments on commit 16b1ff1

Please sign in to comment.