corr English plural

Core/Examples/StandardSimulations.cpp

@@ -64,7 +64,7 @@ GISASSimulation* StandardSimulations::BasicGISAS()
 GISASSimulation* StandardSimulations::BasicGISAS00()
 {
     GISASSimulation* result = BasicGISAS();
-    result->instrument().setPolFilter(zplus, zplus, 1.0, 0.5);
+    result->instrument().setPolFilters(zplus, zplus, 1.0, 0.5);
     return result;
 }
 
@@ -73,7 +73,7 @@ GISASSimulation* StandardSimulations::BasicGISAS00()
 GISASSimulation* StandardSimulations::SpinflipGISAS()
 {
     GISASSimulation* result = BasicGISAS();
-    result->instrument().setPolFilter(zplus, zplus, -1.0, 0.5);
+    result->instrument().setPolFilters(zplus, zplus, -1.0, 0.5);
     return result;
 }
 
@@ -157,28 +157,28 @@ GISASSimulation* StandardSimulations::MiniGISASDetectorResolution()
 GISASSimulation* StandardSimulations::MiniGISASPolarizationPP()
 {
     GISASSimulation* result = MiniGISAS();
-    result->instrument().setPolFilter(zplus, zplus, 1.0, 0.5);
+    result->instrument().setPolFilters(zplus, zplus, 1.0, 0.5);
     return result;
 }
 
 GISASSimulation* StandardSimulations::MiniGISASPolarizationPM()
 {
     GISASSimulation* result = MiniGISAS();
-    result->instrument().setPolFilter(zplus, -zplus, 1.0, 0.5);
+    result->instrument().setPolFilters(zplus, -zplus, 1.0, 0.5);
     return result;
 }
 
 GISASSimulation* StandardSimulations::MiniGISASPolarizationMP()
 {
     GISASSimulation* result = MiniGISAS();
-    result->instrument().setPolFilter(-zplus, zplus, 1.0, 0.5);
+    result->instrument().setPolFilters(-zplus, zplus, 1.0, 0.5);
     return result;
 }
 
 GISASSimulation* StandardSimulations::MiniGISASPolarizationMM()
 {
     GISASSimulation* result = MiniGISAS();
-    result->instrument().setPolFilter(-zplus, -zplus, 1.0, 0.5);
+    result->instrument().setPolFilters(-zplus, -zplus, 1.0, 0.5);
     return result;
 }
 
@@ -208,7 +208,7 @@ GISASSimulation* StandardSimulations::MaxiGISAS()
 GISASSimulation* StandardSimulations::MaxiGISAS00()
 {
     GISASSimulation* result = MaxiGISAS();
-    result->instrument().setPolFilter(zplus, zplus, 1.0, 0.5);
+    result->instrument().setPolFilters(zplus, zplus, 1.0, 0.5);
     return result;
 }
 
@@ -461,56 +461,56 @@ SpecularSimulation* StandardSimulations::TOFRWithPointwiseResolution()
 SpecularSimulation* StandardSimulations::BasicSpecularPP()
 {
     auto* simulation = BasicSpecular();
-    simulation->instrument().setPolFilter(yplus, yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(yplus, yplus, 1.0, 0.5);
     return simulation;
 }
 
 SpecularSimulation* StandardSimulations::BasicSpecularPM()
 {
     auto* simulation = BasicSpecular();
-    simulation->instrument().setPolFilter(yplus, -yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(yplus, -yplus, 1.0, 0.5);
     return simulation;
 }
 
 SpecularSimulation* StandardSimulations::BasicSpecularMP()
 {
     auto* simulation = BasicSpecular();
-    simulation->instrument().setPolFilter(-yplus, yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(-yplus, yplus, 1.0, 0.5);
     return simulation;
 }
 
 SpecularSimulation* StandardSimulations::BasicSpecularMM()
 {
     auto* simulation = BasicSpecular();
-    simulation->instrument().setPolFilter(-yplus, -yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(-yplus, -yplus, 1.0, 0.5);
     return simulation;
 }
 
 SpecularSimulation* StandardSimulations::BasicSpecularQPP()
 {
     auto* simulation = BasicSpecularQ();
-    simulation->instrument().setPolFilter(yplus, yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(yplus, yplus, 1.0, 0.5);
     return simulation;
 }
 
 SpecularSimulation* StandardSimulations::BasicSpecularQPM()
 {
     auto* simulation = BasicSpecularQ();
-    simulation->instrument().setPolFilter(yplus, -yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(yplus, -yplus, 1.0, 0.5);
     return simulation;
 }
 
 SpecularSimulation* StandardSimulations::BasicSpecularQMP()
 {
     auto* simulation = BasicSpecularQ();
-    simulation->instrument().setPolFilter(-yplus, yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(-yplus, yplus, 1.0, 0.5);
     return simulation;
 }
 
 SpecularSimulation* StandardSimulations::BasicSpecularQMM()
 {
     auto* simulation = BasicSpecularQ();
-    simulation->instrument().setPolFilter(-yplus, -yplus, 1.0, 0.5);
+    simulation->instrument().setPolFilters(-yplus, -yplus, 1.0, 0.5);
     return simulation;
 }
 

Device/Instrument/Instrument.cpp

@@ -119,7 +119,7 @@ PolarizerPair Instrument::polarizerPair() const
     return {m_beam->getPolarization(), m_detector->analyzer().matrix()};
 }
 
-void Instrument::setPolFilter(const kvector_t& polarizer_dir, const kvector_t& analyzer_dir,
+void Instrument::setPolFilters(const kvector_t& polarizer_dir, const kvector_t& analyzer_dir,
                               double analyzer_efficiency, double analyzer_transmission)
 {
     m_beam->setPolarization(polarizer_dir);

Device/Instrument/Instrument.h

@@ -56,7 +56,7 @@ public:
     //! init detector with beam settings
     void initDetector();
 
-    void setPolFilter(const kvector_t& polarizer_dir, const kvector_t& analyzer_dir,
+    void setPolFilters(const kvector_t& polarizer_dir, const kvector_t& analyzer_dir,
                       double analyzer_efficiency, double analyzer_transmission);
     PolarizerPair polarizerPair() const;
 

Examples/scatter2d/PolarizedSANS.py

@@ -64,7 +64,7 @@ def get_simulation(sample):
 
     sim = ba.GISASSimulation(beam, sample, det)
 
-    sim.instrument().setPolFilter(kvector_t(0, 1, 0), kvector_t(0, -1, 0), 1, 0.5)
+    sim.instrument().setPolFilters(kvector_t(0, 1, 0), kvector_t(0, -1, 0), 1, 0.5)
 
     return sim
 

Tests/Functional/PyCore/polmagcylinders2.py

@@ -44,7 +44,7 @@ def getSimulationIntensity(polarizer_dir, efficiency):
     zplus = kvector_t(0, 0, 1)
     simulation.setBeamParameters(1*angstrom, 0.2*deg, 0)
 
-    simulation.instrument().setPolFilter(polarizer_dir, zplus, efficiency, 0.5)
+    simulation.instrument().setPolFilters(polarizer_dir, zplus, efficiency, 0.5)
 
     simulation.setSample(multi_layer)
     simulation.beam().setIntensity(1e9)

Tests/Unit/Core/SpecularSimulationTest.cpp

@@ -100,7 +100,7 @@ TEST_F(SpecularSimulationTest, SetAngularScan)
     AlphaScan scan4(1.0, 10, .0 * Units::deg, 2.0 * Units::deg);
     const auto polarizer_dir = kvector_t({0., 0., 0.876});
     const auto analyzer_dir = kvector_t({0., 0., 1.});
-    sim4.instrument().setPolFilter(polarizer_dir, analyzer_dir, 0.33, 0.22);
+    sim4.instrument().setPolFilters(polarizer_dir, analyzer_dir, 0.33, 0.22);
     sim4.setScan(scan4);
     EXPECT_THROW(sim4.setScan(scan4), std::runtime_error);
 
@@ -153,7 +153,7 @@ TEST_F(SpecularSimulationTest, SetQScan)
     QzScan scan3(10, 1.0, 10.0);
     const auto polarizer_dir = kvector_t({0., 0., 0.876});
     const auto analyzer_dir = kvector_t({0., 0., 1.});
-    sim3.instrument().setPolFilter(polarizer_dir, analyzer_dir, 0.33, 0.22);
+    sim3.instrument().setPolFilters(polarizer_dir, analyzer_dir, 0.33, 0.22);
     sim3.setScan(scan3);
 
     EXPECT_EQ(1.0, sim3.coordinateAxis()->lowerBound());