rename oldstyle c'tor -> Detector2Dfw

Device/Detector/Detector2D.cpp

@@ -33,11 +33,11 @@ Detector2D::Detector2D(size_t n_phi, double phi_min, double phi_max, size_t n_al
     ASSERT(-pi / 2 < axis(1).min() && axis(1).max() < +pi / 2);
 }
 
-Detector2D::Detector2D(double phi_span, double alpha_span, size_t n_phi, size_t n_alpha,
-                       double phi_center, double alpha_center)
-    : Detector2D(n_phi, phi_center - phi_span / 2, phi_center + phi_span / 2,
-                 n_alpha, alpha_center - alpha_span / 2, alpha_center + alpha_span / 2)
+Detector2D* Detector2Dfw(double phi_span, double alpha_span, size_t n_phi, size_t n_alpha,
+                         double phi_center, double alpha_center)
 {
+    return new Detector2D(n_phi, phi_center - phi_span / 2, phi_center + phi_span / 2,
+                          n_alpha, alpha_center - alpha_span / 2, alpha_center + alpha_span / 2);
 }
 
 Detector2D* Detector2D::clone() const

Device/Detector/Detector2D.h

@@ -23,9 +23,6 @@ class Detector2D : public IDetector {
 public:
     explicit Detector2D(size_t n_phi, double phi_min, double phi_max, size_t n_alpha,
                         double alpha_min, double alpha_max);
-    // TODO rm (unwise API change between v21 and v22)
-    explicit Detector2D(double phi_span, double alpha_span, size_t n_phi, size_t n_alpha,
-                        double phi_center, double alpha_center);
 
     ~Detector2D() override = default;
 
@@ -41,4 +38,8 @@ public:
     size_t indexOfSpecular(const Beam& beam) const override;
 };
 
+//! Creates detector with fixed widths. TODO rm (unwise API change between v21 and v22)
+Detector2D* Detector2Dfw(double phi_span, double alpha_span, size_t n_phi, size_t n_alpha,
+                         double phi_center, double alpha_center);
+
 #endif // BORNAGAIN_DEVICE_DETECTOR_DETECTOR2D_H

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.Detector2D(4*deg, 3*deg, self.m_ncol, self.m_nrow, 0, 1.5*deg)
+        self.detector = ba.Detector2Dfw(4*deg, 3*deg, self.m_ncol, self.m_nrow, 0, 1.5*deg)
 
     def size(self):
         return self.m_nrow * self.m_ncol

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.Detector2D(4*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(4*deg, 2*deg, n, n, 0, 1*deg)
     return ba.ScatteringSimulation(beam, sample, detector)
 
 def run_simulation_MiniGISAS(sample):

Wrap/Python/src/bornagain/std_simulations.py

@@ -11,5 +11,5 @@ def sas(sample, n):
     Incident beam is almost horizontal.
     """
     beam = ba.Beam(1, 1*angstrom, 1e-8*deg)
-    det = ba.Detector2D(9*deg, 9*deg, n, n, 0, 0)
+    det = ba.Detector2Dfw(9*deg, 9*deg, n, n, 0, 0)
     return ba.ScatteringSimulation(beam, sample, det)

auto/Examples/fit/scatter2d/consecutive_fitting.py

@@ -45,7 +45,7 @@ def get_simulation(P):
     """
     beam = ba.Beam(1e8, 1*angstrom, 0.2*deg)
     n = 100 # bp.simargs['n']
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 1*deg, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 1*deg, 1*deg)
     return ba.ScatteringSimulation(beam, get_sample(P), detector)
 
 

auto/Examples/fit/scatter2d/expfit_galaxi.py

@@ -96,7 +96,7 @@ def create_detector(beam):
     """
     nx = pilatus_npx
     ny = pilatus_npy
-    return ba.Detector2D(3.4*deg, 1.84*deg, nx, ny, 0, 0.32*deg)
+    return ba.Detector2Dfw(3.4*deg, 1.84*deg, nx, ny, 0, 0.32*deg)
 
 
 def create_simulation(P):

auto/Examples/fit/scatter2d/fit2d.py

@@ -22,7 +22,7 @@ def get_simulation(P):
 
     n = 100
     beam = ba.Beam(1, 0.1*nm, 0.2*deg)
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 0, 1*deg)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
 
     return simulation

auto/Examples/fit/scatter2d/gisas_model1.py

@@ -33,7 +33,7 @@ def get_sample(P):
 def get_simulation(P):
     beam = ba.Beam(10**P['lg(intensity)'], 0.1*nm, 0.2*deg)
     n = 100 # bp.simargs['n']
-    det = ba.Detector2D(3*deg, 3*deg, n, n, 0, 1.5*deg)
+    det = ba.Detector2Dfw(3*deg, 3*deg, n, n, 0, 1.5*deg)
     sample = get_sample(P)
 
     simulation = ba.ScatteringSimulation(beam, sample, det)

auto/Examples/fit/scatter2d/minimizer_settings.py

@@ -47,7 +47,7 @@ def get_simulation(P):
     """
     beam = ba.Beam(1e8, 1*angstrom, 0.2*deg)
     n = 100 # bp.simargs['n']
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 0, 1*deg)
     return ba.ScatteringSimulation(beam, get_sample(P), detector)
 
 

auto/Examples/fit/scatter2d/model1_cylinders.py

@@ -37,7 +37,7 @@ def get_simulation(P):
     n = 100
     beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
     sample = get_sample(P)
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 0, 1*deg)
 
     return ba.ScatteringSimulation(beam, sample, detector)
 

auto/Examples/fit/scatter2d/model2_hexlattice.py

@@ -41,7 +41,7 @@ def get_simulation(P):
     """
     n = 100
     beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 0, 1*deg)
     sample = get_sample(P)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
 

auto/Examples/fit/scatter2d/multiple_datasets.py

@@ -45,7 +45,7 @@ def get_simulation(P):
 
     beam = ba.Beam(1e8, 0.1*nm, incident_angle)
     n = 100
-    detector = ba.Detector2D(3*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(3*deg, 2*deg, n, n, 0, 1*deg)
     return ba.ScatteringSimulation(beam, get_sample(P), detector)
 
 

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.Detector2D(4*deg, 0.06*deg, 501, 1, 0, 1*deg)
+    detector = ba.Detector2Dfw(4*deg, 0.06*deg, 501, 1, 0, 1*deg)
 
     sim = ba.ScatteringSimulation(beam, sample, detector)
     return sim.simulate().flat()

auto/Examples/scatter2d/ApproximationDA.py

@@ -53,7 +53,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 1*deg, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 1*deg, 1*deg)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 

auto/Examples/scatter2d/ApproximationLMA.py

@@ -60,7 +60,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 1*deg, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 1*deg, 1*deg)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 

auto/Examples/scatter2d/ApproximationSSCA.py

@@ -54,7 +54,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 1*deg, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 1*deg, 1*deg)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 

auto/Examples/scatter2d/BeamDivergence.py

@@ -14,7 +14,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 100
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 1*deg, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 1*deg, 1*deg)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     distr_1 = ba.DistributionLogNormal(0.1*nm, 0.1, 5, 2)
     simulation.addParameterDistribution(

auto/Examples/scatter2d/BiMaterialCylinders.py

@@ -57,7 +57,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 100
-    detector = ba.Detector2D(2*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(2*deg, 2*deg, n, n, 0, 1*deg)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 

auto/Examples/scatter2d/BoxesWithSpecularPeak.py

@@ -48,7 +48,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 101
-    detector = ba.Detector2D(4*deg, 2*deg, n, n, 0, 1*deg)
+    detector = ba.Detector2Dfw(4*deg, 2*deg, n, n, 0, 1*deg)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     simulation.options().setIncludeSpecular(True)