convert fit2d

auto/Examples/fit/scatter2d/fit2d.py

@@ -28,18 +28,19 @@ def get_simulation(P):
     return simulation
 
 
-def data():
+def fake_data():
     """
     Generating "experimental" data by running simulation with default parameters.
     """
     simulation = get_simulation({'radius': 5 * nm})
     result = simulation.simulate()
-    return result.npArray()
+    return result
 
 
 if __name__ == '__main__':
+    data = fake_data()
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, data())
+    fit_objective.addFitPair(get_simulation, data)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()

auto/MiniExamples/fit/scatter2d/fit2d.py

@@ -28,18 +28,19 @@ def get_simulation(P):
     return simulation
 
 
-def data():
+def fake_data():
     """
     Generating "experimental" data by running simulation with default parameters.
     """
     simulation = get_simulation({'radius': 5 * nm})
     result = simulation.simulate()
-    return result.npArray()
+    return result
 
 
 if __name__ == '__main__':
+    data = fake_data()
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, data())
+    fit_objective.addFitPair(get_simulation, data)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()

rawEx/fit/scatter2d/fit2d.py

@@ -28,18 +28,19 @@ def get_simulation(P):
     return simulation
 
 
-def data():
+def fake_data():
     """
     Generating "experimental" data by running simulation with default parameters.
     """
     simulation = get_simulation({'radius': 5 * nm})
     result = simulation.simulate()
-    return result.npArray()
+    return result
 
 
 if __name__ == '__main__':
+    data = fake_data()
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, data())
+    fit_objective.addFitPair(get_simulation, data)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()