Removed normalization of unused polarized intensity

Core/Algorithms/inc/Detector.h

@@ -90,11 +90,8 @@ public:
     virtual std::string addParametersToExternalPool(std::string path, ParameterPool *external_pool,
                                                     int copy_number = -1) const;
 
-#ifndef GCCXML_SKIP_THIS
     //! Normalize intensity data with detector cell sizes.
-    void normalize(OutputData<double> *p_data, OutputData<Eigen::Matrix2d> *p_polarized_data,
-                   double sin_alpha_i) const;
-#endif
+    void normalize(OutputData<double> *p_data, double sin_alpha_i) const;
 
 protected:
     virtual void print(std::ostream &ostr) const;

Core/Algorithms/inc/Instrument.h

@@ -107,8 +107,7 @@ public:
 
 #ifndef GCCXML_SKIP_THIS
     //! normalize a detector image
-    void normalize(OutputData<double> *p_intensity,
-                   OutputData<Eigen::Matrix2d> *p_polarized_intensity = 0) const;
+    void normalize(OutputData<double> *p_intensity) const;
 #endif
 
 protected:

Core/Algorithms/src/Detector.cpp

@@ -147,8 +147,7 @@ std::string Detector::addParametersToExternalPool(std::string path, ParameterPoo
     return new_path;
 }
 
-void Detector::normalize(OutputData<double> *p_data, OutputData<Eigen::Matrix2d> *p_polarized_data,
-                         double sin_alpha_i) const
+void Detector::normalize(OutputData<double> *p_data, double sin_alpha_i) const
 {
     // if shapes do not match, do nothing
     if (!dataShapeMatches(p_data))
@@ -168,17 +167,9 @@ void Detector::normalize(OutputData<double> *p_data, OutputData<Eigen::Matrix2d>
     // This normalization assumes that the intensity map contains
     // total differential scattering cross sections
     // (as opposed to the usual cross section per scattering particle)
-    OutputData<Eigen::Matrix2d>::iterator it_pol;
-    if (p_polarized_data) {
-        it_pol = p_polarized_data->begin();
-    }
     for (OutputData<double>::iterator it = p_data->begin(); it != p_data->end(); ++it) {
         double factor = getSolidAngle(p_data, it.getIndex()) / sin_alpha_i;
         (*it) *= factor;
-        if (p_polarized_data) {
-            (*it_pol) *= factor;
-            ++it_pol;
-        }
     }
 }
 

Core/Algorithms/src/GISASSimulation.cpp

@@ -91,9 +91,14 @@ GISASSimulation *GISASSimulation::clone() const
 void GISASSimulation::prepareSimulation()
 {
     if(!m_instrument.getDetectorDimension()) {
-        throw LogicErrorException("Simulation::prepareSimulation() "
+        throw LogicErrorException("GISASSimulation::prepareSimulation() "
                 "-> Error. The detector was not configured.");
     }
+    if (getWavelength() <= 0.0) {
+        throw ClassInitializationException(
+                "GISASSimulation::prepareSimulation() "
+                "-> Error. Incoming wavelength <= 0.");
+    }
     Simulation::prepareSimulation();
 }
 

Core/Algorithms/src/Instrument.cpp

@@ -114,16 +114,11 @@ std::string Instrument::addParametersToExternalPool(
     return new_path;
 }
 
-void Instrument::normalize(OutputData<double> *p_intensity,
-        OutputData<Eigen::Matrix2d> *p_polarized_intensity) const
+void Instrument::normalize(OutputData<double> *p_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(),
@@ -131,7 +126,7 @@ void Instrument::normalize(OutputData<double> *p_intensity,
 
     // normalize by detector cell sizes
     double sin_alpha_i = std::abs(realpart.cosTheta());
-    m_detector.normalize(p_intensity, p_polarized_intensity, sin_alpha_i);
+    m_detector.normalize(p_intensity, sin_alpha_i);
 }
 
 void Instrument::setDetectorResolutionFunction(