transmit intensity in clone fcts; add test

Sim/Scan/AlphaScan.cpp

@@ -54,6 +54,7 @@ AlphaScan::AlphaScan(int nbins, double alpha_i_min, double alpha_i_max)
 AlphaScan* AlphaScan::clone() const
 {
     auto* result = new AlphaScan(*m_axis);
+    result->setIntensity(intensity());
     result->setFootprintFactor(m_footprint.get());
 
     if (m_lambda_distrib)

Sim/Scan/QzScan.cpp

@@ -56,6 +56,7 @@ QzScan::~QzScan() = default;
 QzScan* QzScan::clone() const
 {
     auto* result = new QzScan(*m_axis);
+    result->setIntensity(intensity());
     if (m_qz_distrib) {
         result->m_qz_distrib.reset(m_qz_distrib->clone());
         result->m_resol_width = m_resol_width;

Tests/SimFactory/MakeSimulations.cpp

@@ -359,9 +359,10 @@ ISpecularScan* test::makeSimulation::BasicSpecularScan(bool vsQ)
 }
 
 std::unique_ptr<SpecularSimulation> test::makeSimulation::BasicSpecular(const MultiLayer& sample,
-                                                                        bool vsQ)
+                                                                        bool vsQ, double intensity)
 {
     std::unique_ptr<ISpecularScan> scan(BasicSpecularScan(vsQ));
+    scan->setIntensity(intensity);
 
     auto result = std::make_unique<SpecularSimulation>(*scan, sample);
     result->options().setUseAvgMaterials(true);

Tests/SimFactory/MakeSimulations.h

@@ -57,7 +57,8 @@ std::unique_ptr<ScatteringSimulation> ExtraLongWavelengthGISAS(const MultiLayer&
 std::unique_ptr<OffspecSimulation> MiniOffspec(const MultiLayer& sample);
 
 ISpecularScan* BasicSpecularScan(bool vsQ);
-std::unique_ptr<SpecularSimulation> BasicSpecular(const MultiLayer& sample, bool vsQ);
+std::unique_ptr<SpecularSimulation> BasicSpecular(const MultiLayer& sample, bool vsQ,
+                                                  double intensity = 1.);
 std::unique_ptr<SpecularSimulation> BasicYPolarizedSpecular(const MultiLayer& sample,
                                                             const std::string& polCase, bool vsQ);
 std::unique_ptr<SpecularSimulation> SpecularWithGaussianBeam(const MultiLayer& sample);

Tests/Suite/Common/TestSuite.h

@@ -690,11 +690,12 @@ TEST(TESTNAME, SpecularWithSlicing3)
 }
 
 TEST(TESTNAME, InstrumentDefinitionComparison)
+// also tests persistent result for the intensity fudge parameter
 {
     auto* sample = ExemplarySamples::createPlainMultiLayerBySLD();
-    auto sim = test::makeSimulation::BasicSpecular(*sample, false);
+    auto sim = test::makeSimulation::BasicSpecular(*sample, false, 1.05);
     EXPECT_TRUE(runTest("InstrumentDefinitionComparison_0", *sim, 1e-10));
-    auto simQ = test::makeSimulation::BasicSpecular(*sample, true);
+    auto simQ = test::makeSimulation::BasicSpecular(*sample, true, .95);
     EXPECT_TRUE(runTest("InstrumentDefinitionComparison_Q", *simQ, 1e-10));
 }