Removed correlation lengths from LatticeParameters

Core/PythonAPI/src/Lattice2DIFParameters.pypp.cpp

@@ -21,8 +21,6 @@ void register_Lattice2DIFParameters_class(){
         Lattice2DIFParameters_exposer_t Lattice2DIFParameters_exposer = Lattice2DIFParameters_exposer_t( "Lattice2DIFParameters", bp::init< >() );
         bp::scope Lattice2DIFParameters_scope( Lattice2DIFParameters_exposer );
         Lattice2DIFParameters_exposer.def_readwrite( "m_angle", &Lattice2DIFParameters::m_angle );
-        Lattice2DIFParameters_exposer.def_readwrite( "m_corr_length_1", &Lattice2DIFParameters::m_corr_length_1 );
-        Lattice2DIFParameters_exposer.def_readwrite( "m_corr_length_2", &Lattice2DIFParameters::m_corr_length_2 );
         Lattice2DIFParameters_exposer.def_readwrite( "m_length_1", &Lattice2DIFParameters::m_length_1 );
         Lattice2DIFParameters_exposer.def_readwrite( "m_length_2", &Lattice2DIFParameters::m_length_2 );
         Lattice2DIFParameters_exposer.def_readwrite( "m_xi", &Lattice2DIFParameters::m_xi );

Core/Samples/inc/Lattice2DIFParameters.h

@@ -22,12 +22,11 @@ class Lattice2DIFParameters
 {
 public:
     Lattice2DIFParameters() : m_length_1(0), m_length_2(0), m_angle(0),
-        m_xi(0), m_corr_length_1(0), m_corr_length_2(0) { }
+        m_xi(0) { }
 
     double m_length_1, m_length_2;
     double m_angle;
     double m_xi;
-    double m_corr_length_1, m_corr_length_2;
 };
 
 #endif /* LATTICE2DIFPARAMETERS_H_ */

Core/Samples/src/InterferenceFunction2DLattice.cpp

@@ -109,8 +109,6 @@ void InterferenceFunction2DLattice::init_parameters()
     registerParameter("length_2", &m_lattice_params.m_length_2);
     registerParameter("angle", &m_lattice_params.m_angle);
     registerParameter("xi", &m_lattice_params.m_xi);
-    registerParameter("corr_length_1", &m_lattice_params.m_corr_length_1);
-    registerParameter("corr_length_2", &m_lattice_params.m_corr_length_2);
 }
 
 
@@ -136,13 +134,13 @@ void InterferenceFunction2DLattice::initialize_calc_factors(
         double coherence_length_x, double coherence_length_y)
 {
     // constant prefactor
-    //TODO: for non cauchy distributions: check if this still applies
+    //TODO: for non 2D distributions: check if this still applies
     m_prefactor = 2.0*M_PI*coherence_length_x*coherence_length_y;
 
     // number of reciprocal lattice points to use
     double qa_max, qb_max;
-    mp_pdf->transformToStarBasis(nmax/m_lattice_params.m_corr_length_1,
-            nmax/m_lattice_params.m_corr_length_2, m_lattice_params.m_angle,
+    mp_pdf->transformToStarBasis(nmax/coherence_length_x,
+            nmax/coherence_length_y, m_lattice_params.m_angle,
             m_lattice_params.m_length_1, m_lattice_params.m_length_2,
             qa_max, qb_max);
     m_na = (int)(std::abs(qa_max)+0.5);

Core/StandardSamples/IsGISAXS06Builder.cpp

@@ -36,9 +36,6 @@ ISample *IsGISAXS06Lattice1Builder::buildSample() const
     lattice_params.m_length_2 = 10.0*Units::nanometer; // L2
     lattice_params.m_angle = 90.0*Units::degree; // lattice angle
     lattice_params.m_xi = 0.0*Units::degree; // lattice orientation
-    // correlation lengths
-    lattice_params.m_corr_length_1 = 300.0*Units::nanometer/2.0/M_PI;
-    lattice_params.m_corr_length_2 = 100.0*Units::nanometer/2.0/M_PI;
 
     InterferenceFunction2DLattice *p_interference_function =
         new InterferenceFunction2DLattice(lattice_params);
@@ -88,8 +85,6 @@ ISample *IsGISAXS06Lattice2Builder::buildSample() const
     lattice_params.m_length_2 = 10.0*Units::nanometer; // L2
     lattice_params.m_angle = 90.0*Units::degree; // lattice angle
     lattice_params.m_xi = 0.0*Units::degree; // lattice orientation
-    lattice_params.m_corr_length_1 = 300.0*Units::nanometer/2.0/M_PI; // correlation length 1
-    lattice_params.m_corr_length_2 = 100.0*Units::nanometer/2.0/M_PI;  // correlation length 2
 
     InterferenceFunction2DLattice *p_interference_function =
         new InterferenceFunction2DLattice(lattice_params);
@@ -143,9 +138,6 @@ ISample *IsGISAXS06Lattice3Builder::buildSample() const
     lattice_params.m_length_2 = 10.0*Units::nanometer; // L2
     lattice_params.m_angle = 90.0*Units::degree; // lattice angle
     lattice_params.m_xi = 30.0*Units::degree; // lattice orientation
-    // correlation lengths:
-    lattice_params.m_corr_length_1 = 300.0*Units::nanometer/2.0/M_PI;
-    lattice_params.m_corr_length_2 = 100.0*Units::nanometer/2.0/M_PI;
 
     InterferenceFunction2DLattice *p_interference_function =
         new InterferenceFunction2DLattice(lattice_params);
@@ -207,8 +199,6 @@ ISample *IsGISAXS06Lattice4Builder::buildSample() const
     lattice_params.m_length_2 = 10.0*Units::nanometer; // L2
     lattice_params.m_angle = 90.0*Units::degree; // lattice angle
     lattice_params.m_xi = m_xi; // lattice orientation
-    lattice_params.m_corr_length_1 = 300.0*Units::nanometer/2.0/M_PI;
-    lattice_params.m_corr_length_2 = 100.0*Units::nanometer/2.0/M_PI;
 
     InterferenceFunction2DLattice *p_interference_function =
         new InterferenceFunction2DLattice(lattice_params);