diff --git a/auto/Examples/fit/specular/PolarizedSpinAsymmetryFit.py b/auto/Examples/fit/specular/PolarizedSpinAsymmetryFit.py index 748cbdeced353ad420075bf1bcd646723234beac..5d7cff180c619151042766a1a0fe5233872108c0 100755 --- a/auto/Examples/fit/specular/PolarizedSpinAsymmetryFit.py +++ b/auto/Examples/fit/specular/PolarizedSpinAsymmetryFit.py @@ -93,12 +93,12 @@ if __name__ == '__main__': fit_objective.setObjectiveMetric("chi2") fit_objective.initPrint(10) - fit_objective.addSimulationAndData( + fit_objective.addFitPair( lambda P: get_Simulation_pp(data_pp.npXcenters(), P), - data_pp.npArray(), data_pp.npErrors(), 1) - fit_objective.addSimulationAndData( + data_pp, 1) + fit_objective.addFitPair( lambda P: get_Simulation_mm(data_mm.npXcenters(), P), - data_mm.npArray(), data_mm.npErrors(), 1) + data_mm, 1) P = ba.Parameters() for name, p in startParams.items(): diff --git a/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetryFit.py b/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetryFit.py index 35f0e997e35826d5350e6ebb123eb43328cdaddb..6c3a68be5210699ff3056b4610c3a7b12f31ad95 100755 --- a/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetryFit.py +++ b/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetryFit.py @@ -93,12 +93,12 @@ if __name__ == '__main__': fit_objective.setObjectiveMetric("chi2") fit_objective.initPrint(10) - fit_objective.addSimulationAndData( + fit_objective.addFitPair( lambda P: get_Simulation_pp(data_pp.npXcenters(), P), - data_pp.npArray(), data_pp.npErrors(), 1) - fit_objective.addSimulationAndData( + data_pp, 1) + fit_objective.addFitPair( lambda P: get_Simulation_mm(data_mm.npXcenters(), P), - data_mm.npArray(), data_mm.npErrors(), 1) + data_mm, 1) P = ba.Parameters() for name, p in startParams.items(): diff --git a/rawEx/fit/specular/PolarizedSpinAsymmetryFit.py b/rawEx/fit/specular/PolarizedSpinAsymmetryFit.py index d2ffb214079656b344eaa9e407e27e8cac68e20d..e10a8827c42083aedb8139073726a31919fb7593 100755 --- a/rawEx/fit/specular/PolarizedSpinAsymmetryFit.py +++ b/rawEx/fit/specular/PolarizedSpinAsymmetryFit.py @@ -93,12 +93,12 @@ if __name__ == '__main__': fit_objective.setObjectiveMetric("chi2") fit_objective.initPrint(10) - fit_objective.addSimulationAndData( + fit_objective.addFitPair( lambda P: get_Simulation_pp(data_pp.npXcenters(), P), - data_pp.npArray(), data_pp.npErrors(), 1) - fit_objective.addSimulationAndData( + data_pp, 1) + fit_objective.addFitPair( lambda P: get_Simulation_mm(data_mm.npXcenters(), P), - data_mm.npArray(), data_mm.npErrors(), 1) + data_mm, 1) P = ba.Parameters() for name, p in startParams.items():