Skip to content
Snippets Groups Projects
Commit f01f6574 authored by pospelov's avatar pospelov
Browse files

New meso fit configuration

parent d6e160fd
No related branches found
No related tags found
No related merge requests found
...@@ -70,6 +70,7 @@ public: ...@@ -70,6 +70,7 @@ public:
void fitsuite_config1(); void fitsuite_config1();
void fitsuite_config2(); void fitsuite_config2();
void fitsuite_config3(); void fitsuite_config3();
void fitsuite_config4();
private: private:
void initializeRealData(); void initializeRealData();
......
...@@ -129,6 +129,9 @@ void TestMesoCrystal2::fitsuite_setup(int nconfig) ...@@ -129,6 +129,9 @@ void TestMesoCrystal2::fitsuite_setup(int nconfig)
case 3: case 3:
fitsuite_config3(); fitsuite_config3();
break; break;
case 4:
fitsuite_config4();
break;
default: default:
throw LogicErrorException("TestMesoCrystal2::fitsuite_setup() -> Error! Can't setup FitSuite"); throw LogicErrorException("TestMesoCrystal2::fitsuite_setup() -> Error! Can't setup FitSuite");
break; break;
...@@ -185,14 +188,23 @@ void TestMesoCrystal2::fitsuite_config3() ...@@ -185,14 +188,23 @@ void TestMesoCrystal2::fitsuite_config3()
strategy_all->release_all(); strategy_all->release_all();
m_fitSuite->addFitStrategy(strategy_all); m_fitSuite->addFitStrategy(strategy_all);
// const double minima[]={0.042, 0.004};
// const double maxima[]={0.052, 0.03};
Mask *mask1 = OutputDataFunctions::CreateRectangularMask(*m_real_data, 0.041, 0.003, 0.051, 0.03); Mask *mask1 = OutputDataFunctions::CreateRectangularMask(*m_real_data, 0.041, 0.003, 0.051, 0.03);
m_real_data->setMask(*mask1); m_real_data->setMask(*mask1);
} }
void TestMesoCrystal2::fitsuite_config4()
{
fitsuite_config3();
for(FitSuiteStrategies::iterator it = m_fitSuite->getFitStrategies()->begin(); it!= m_fitSuite->getFitStrategies()->end(); ++it) {
FitSuiteStrategyAdjustParameters *strategy = dynamic_cast<FitSuiteStrategyAdjustParameters *>( (*it) );
assert(strategy);
strategy->setPreserveOriginalValues(false);
}
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// FitSuite configuration #2 // FitSuite configuration #2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment