Added beam intensity to polarized intensity

App/src/TestPolarizedDWBA.cpp

@@ -38,15 +38,18 @@ void TestPolarizedDWBA::execute()
     // calculate scattered intesity from sample
     Simulation simulation(mp_options);
     simulation.setDetectorParameters(
-        10,-1.0*Units::degree, 1.0*Units::degree, 10,
+        100, -1.0*Units::degree, 1.0*Units::degree, 100,
         0.0*Units::degree, 2.0*Units::degree, true);
     simulation.setBeamParameters(
         1.0*Units::angstrom, 0.2*Units::degree, 0.0*Units::degree);
+    simulation.setBeamIntensity(8e12);
 
     // Run simulation
     simulation.setSample(*mp_sample);
     simulation.runSimulation();
 
+    simulation.normalize();
+
 //    IsGISAXSTools::drawOutputData(*simulation.getOutputData(), "c1_polDWBA",
 //            "Polarized DWBA", "CONT4 Z", "Polarized DWBA");
 //

Core/Algorithms/inc/Instrument.h

@@ -76,7 +76,8 @@ class BA_CORE_API_ Instrument : public IParameterized
     virtual std::string addParametersToExternalPool(std::string path, ParameterPool *external_pool, int copy_number=-1) const;
 
     //! normalize a detector image
-    void normalize(OutputData<double> *p_intensity) const;
+    void normalize(OutputData<double> *p_intensity,
+            OutputData<Eigen::Matrix2d> *p_polarized_intensity = 0) const;
 
  protected:
     //! Registers some class members for later access via parameter pool

Core/Algorithms/src/Instrument.cpp

@@ -89,11 +89,16 @@ std::string Instrument::addParametersToExternalPool(
     return new_path;
 }
 
-void Instrument::normalize(OutputData<double> *p_intensity) const
+void Instrument::normalize(OutputData<double> *p_intensity,
+        OutputData<Eigen::Matrix2d> *p_polarized_intensity) const
 {
     // normalize by intensity, if strictly positive
     if (getIntensity()>0.0) {
         p_intensity->scaleAll(getIntensity());
+        if (p_polarized_intensity) {
+            p_polarized_intensity->scaleAll(
+                    Eigen::Matrix2d::Identity() * getIntensity());
+        }
     }
     kvector_t realpart(getBeam().getCentralK().x().real(),
                    getBeam().getCentralK().y().real(),

Core/Algorithms/src/Simulation.cpp

@@ -227,7 +227,7 @@ void Simulation::runSimulationElement(size_t index)
 void Simulation::normalize()
 {
     if (!m_is_normalized) {
-        m_instrument.normalize(&m_intensity_map);
+        m_instrument.normalize(&m_intensity_map, &m_polarization_output);
         m_is_normalized = true;
     }
 }