diff --git a/auto/Examples/scatter2d/Resolution.py b/auto/Examples/scatter2d/Resolution.py
index a58f9fc8d66a38f12fc32cd601aecc819d462a55..6c8c5256f95cb2a87003e96798deeec2aef246ff 100755
--- a/auto/Examples/scatter2d/Resolution.py
+++ b/auto/Examples/scatter2d/Resolution.py
@@ -30,8 +30,7 @@ if __name__ == '__main__':
     # Detector
     nx = 142
     ny = 200
-    detector = ba.FlatDetector(nx, ny, 107, 140, beam, ba.FlatDetector.X,
-                               2000, 0, -140/2)
+    detector = ba.Detector2D(nx, -1.5*deg, 1.5*deg, ny, 0, 3*deg)
 
     results = []
 
@@ -41,17 +40,17 @@ if __name__ == '__main__':
     results.append(result)
 
     detector.setResolutionFunction(
-        ba.ResolutionFunction2DGaussian(5, 1))
+        ba.ResolutionFunction2DGaussian(0.2*deg, 0.01*deg))
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     result = simulation.simulate()
-    result.setTitle("resolution 5, 1")
+    result.setTitle("resolution 0.2deg, 0.01deg")
     results.append(result)
 
     detector.setResolutionFunction(
-        ba.ResolutionFunction2DGaussian(5, 5))
+        ba.ResolutionFunction2DGaussian(0.2*deg, 0.2*deg))
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     result = simulation.simulate()
-    result.setTitle("resolution 5, 5")
+    result.setTitle("resolution 0.2deg, 0.2deg")
     results.append(result)
 
     bp.make_plot_row(results)
diff --git a/auto/MiniExamples/scatter2d/Resolution.py b/auto/MiniExamples/scatter2d/Resolution.py
index 211f62a3d92a7f0b712f54e9b6a4c500aa3fa9c5..696a3464f923c489146b1867ce2aaaaa083502de 100755
--- a/auto/MiniExamples/scatter2d/Resolution.py
+++ b/auto/MiniExamples/scatter2d/Resolution.py
@@ -30,8 +30,7 @@ if __name__ == '__main__':
     # Detector
     nx = 7
     ny = 11
-    detector = ba.FlatDetector(nx, ny, 107, 140, beam, ba.FlatDetector.X,
-                               2000, 0, -140/2)
+    detector = ba.Detector2D(nx, -1.5*deg, 1.5*deg, ny, 0, 3*deg)
 
     results = []
 
@@ -41,17 +40,17 @@ if __name__ == '__main__':
     results.append(result)
 
     detector.setResolutionFunction(
-        ba.ResolutionFunction2DGaussian(5, 1))
+        ba.ResolutionFunction2DGaussian(0.2*deg, 0.01*deg))
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     result = simulation.simulate()
-    result.setTitle("resolution 5, 1")
+    result.setTitle("resolution 0.2deg, 0.01deg")
     results.append(result)
 
     detector.setResolutionFunction(
-        ba.ResolutionFunction2DGaussian(5, 5))
+        ba.ResolutionFunction2DGaussian(0.2*deg, 0.2*deg))
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     result = simulation.simulate()
-    result.setTitle("resolution 5, 5")
+    result.setTitle("resolution 0.2deg, 0.2deg")
     results.append(result)
 
     bp.make_plot_row(results)
diff --git a/rawEx/scatter2d/Resolution.py b/rawEx/scatter2d/Resolution.py
index 400c40c5ff6d5dd898f02f237800b50db8d76cf7..9477e7ea4f2c9efa9516a394087b02560d335abb 100755
--- a/rawEx/scatter2d/Resolution.py
+++ b/rawEx/scatter2d/Resolution.py
@@ -30,8 +30,7 @@ if __name__ == '__main__':
     # Detector
     nx = <%= sm ?  7 : 142 %>
     ny = <%= sm ? 11 : 200 %>
-    detector = ba.FlatDetector(nx, ny, 107, 140, beam, ba.FlatDetector.X,
-                               2000, 0, -140/2)
+    detector = ba.Detector2D(nx, -1.5*deg, 1.5*deg, ny, 0, 3*deg)
 
     results = []
 
@@ -41,17 +40,17 @@ if __name__ == '__main__':
     results.append(result)
 
     detector.setResolutionFunction(
-        ba.ResolutionFunction2DGaussian(5, 1))
+        ba.ResolutionFunction2DGaussian(0.2*deg, 0.01*deg))
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     result = simulation.simulate()
-    result.setTitle("resolution 5, 1")
+    result.setTitle("resolution 0.2deg, 0.01deg")
     results.append(result)
 
     detector.setResolutionFunction(
-        ba.ResolutionFunction2DGaussian(5, 5))
+        ba.ResolutionFunction2DGaussian(0.2*deg, 0.2*deg))
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     result = simulation.simulate()
-    result.setTitle("resolution 5, 5")
+    result.setTitle("resolution 0.2deg, 0.2deg")
     results.append(result)
 
     bp.make_plot_row(results)