diff --git a/App/inc/TestMesoCrystal2.h b/App/inc/TestMesoCrystal2.h index 5e3d73907967d5d07d40e4ecccbca8643c343a9d..e8bc459a2494bd15ff8ae5a814c519cdc102f049 100644 --- a/App/inc/TestMesoCrystal2.h +++ b/App/inc/TestMesoCrystal2.h @@ -70,6 +70,7 @@ public: void fitsuite_config1(); void fitsuite_config2(); void fitsuite_config3(); + void fitsuite_config4(); private: void initializeRealData(); diff --git a/App/src/TestMesoCrystal2.cpp b/App/src/TestMesoCrystal2.cpp index bcdafa034a88a4b00f406168d87161dd4e0311b5..8c4441b9d59f8d528662595f9baebae67d7dc2f9 100644 --- a/App/src/TestMesoCrystal2.cpp +++ b/App/src/TestMesoCrystal2.cpp @@ -129,6 +129,9 @@ void TestMesoCrystal2::fitsuite_setup(int nconfig) case 3: fitsuite_config3(); break; + case 4: + fitsuite_config4(); + break; default: throw LogicErrorException("TestMesoCrystal2::fitsuite_setup() -> Error! Can't setup FitSuite"); break; @@ -185,14 +188,23 @@ void TestMesoCrystal2::fitsuite_config3() strategy_all->release_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); 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