From 144e9229a8d8c5743dd38ab0f98fbe2c64c3557e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 9 Jul 2024 13:07:00 +0200
Subject: [PATCH] revert Detector2Dfw calls
---
Tests/Py/Fit/fitobjective_api.py | 2 +-
Tests/Py/Functional/PyFuTestInfrastructure.py | 2 +-
auto/Examples/offspec/OffspecResolved.py | 2 +-
auto/MiniExamples/offspec/OffspecResolved.py | 2 +-
rawEx/offspec/OffspecResolved.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Tests/Py/Fit/fitobjective_api.py b/Tests/Py/Fit/fitobjective_api.py
index 82e0a88f586..ae04ca2b99f 100644
--- a/Tests/Py/Fit/fitobjective_api.py
+++ b/Tests/Py/Fit/fitobjective_api.py
@@ -15,7 +15,7 @@ class SimulationBuilder:
self.m_nrow = 3
self.m_ncol = 4
self.beam = ba.Beam(1., 1., 0)
- self.detector = ba.Detector2Dfw(4*deg, 3*deg, self.m_ncol, self.m_nrow, 0, 1.5*deg)
+ self.detector = ba.Detector2D(self.m_ncol, -2*deg, 2*deg, self.m_nrow, 0., 3*deg)
def size(self):
return self.m_nrow * self.m_ncol
diff --git a/Tests/Py/Functional/PyFuTestInfrastructure.py b/Tests/Py/Functional/PyFuTestInfrastructure.py
index eb482603159..92205b1f335 100644
--- a/Tests/Py/Functional/PyFuTestInfrastructure.py
+++ b/Tests/Py/Functional/PyFuTestInfrastructure.py
@@ -8,7 +8,7 @@ from bornagain import deg #, ba_plot as bp
def get_simulation_MiniGISAS(sample, n=25):
beam = ba.Beam(1, 0.1, 0.2 * deg)
- detector = ba.Detector2Dfw(4*deg, 2*deg, n, n, 0, 1*deg)
+ detector = ba.Detector2D(n, -2*deg, 2*deg, n, 0, 2*deg)
return ba.ScatteringSimulation(beam, sample, detector)
def run_simulation_MiniGISAS(sample):
diff --git a/auto/Examples/offspec/OffspecResolved.py b/auto/Examples/offspec/OffspecResolved.py
index 6cf20b17bd5..d15e0f7fa47 100755
--- a/auto/Examples/offspec/OffspecResolved.py
+++ b/auto/Examples/offspec/OffspecResolved.py
@@ -44,7 +44,7 @@ def get_sample():
def simulate(sample):
beam = ba.Beam(1e9, 0.1 * nm, 1.0 * deg)
- detector = ba.Detector2Dfw(4*deg, 0.06*deg, 501, 1, 0, 1*deg)
+ detector = ba.Detector2D(501, -2*deg, 2*deg, 1, 0.94*deg, 1.06*deg)
sim = ba.ScatteringSimulation(beam, sample, detector)
return sim.simulate().flat()
diff --git a/auto/MiniExamples/offspec/OffspecResolved.py b/auto/MiniExamples/offspec/OffspecResolved.py
index 6cf20b17bd5..d15e0f7fa47 100755
--- a/auto/MiniExamples/offspec/OffspecResolved.py
+++ b/auto/MiniExamples/offspec/OffspecResolved.py
@@ -44,7 +44,7 @@ def get_sample():
def simulate(sample):
beam = ba.Beam(1e9, 0.1 * nm, 1.0 * deg)
- detector = ba.Detector2Dfw(4*deg, 0.06*deg, 501, 1, 0, 1*deg)
+ detector = ba.Detector2D(501, -2*deg, 2*deg, 1, 0.94*deg, 1.06*deg)
sim = ba.ScatteringSimulation(beam, sample, detector)
return sim.simulate().flat()
diff --git a/rawEx/offspec/OffspecResolved.py b/rawEx/offspec/OffspecResolved.py
index 6cf20b17bd5..d15e0f7fa47 100755
--- a/rawEx/offspec/OffspecResolved.py
+++ b/rawEx/offspec/OffspecResolved.py
@@ -44,7 +44,7 @@ def get_sample():
def simulate(sample):
beam = ba.Beam(1e9, 0.1 * nm, 1.0 * deg)
- detector = ba.Detector2Dfw(4*deg, 0.06*deg, 501, 1, 0, 1*deg)
+ detector = ba.Detector2D(501, -2*deg, 2*deg, 1, 0.94*deg, 1.06*deg)
sim = ba.ScatteringSimulation(beam, sample, detector)
return sim.simulate().flat()
--
GitLab