Repairing build for JCNS

Core/Samples/inc/Layer.h

@@ -44,7 +44,8 @@ class Layer : public ICompositeSample
 
     virtual ~Layer() {}
 
-    virtual Layer *clone() const { return new Layer(*this); }
+    //virtual Layer *clone() const { return new Layer(*this); }
+    virtual Layer *clone() const { return new Layer(mp_material, m_thickness); }
 
     //! Sets layer thickness in Angstrom.
     virtual void setThickness(double thickness);
@@ -76,7 +77,7 @@ class Layer : public ICompositeSample
     virtual LayerDWBASimulation *createDWBASimulation() const { return 0; }
 
  protected:
-    Layer(const Layer& other)
+    Layer(const Layer& other) : ICompositeSample()
     {
         mp_material = other.mp_material;
         m_thickness = other.m_thickness;

Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.cpp

@@ -111,7 +111,8 @@ void FunctionalTests::IsGISAXS03::runBA_Size()
     Particle nano_particle(n_particle, p_ff_cylinder);
     // radius of nanoparticles will be sampled with gaussian probability
     int nbins(100), nfwhm(2);
-    StochasticSampledParameter par(StochasticDoubleGaussian(radius, sigma), nbins, nfwhm);
+    StochasticDoubleGaussian double_gaussian(radius, sigma);
+    StochasticSampledParameter par(double_gaussian, nbins, nfwhm);
     ParticleBuilder builder;
     builder.setPrototype(nano_particle,"/Particle/FormFactorCylinder/radius", par);
     builder.plantParticles(particle_decoration);

shared.pri

@@ -177,7 +177,6 @@ CONFIG(BORNAGAIN_ROOT) {
 # -----------------------------------------------------------------------------
 CONFIG  += BORNAGAIN_PYTHON
 CONFIG(BORNAGAIN_PYTHON) {
-  # TODO - implement check for existance of numpy/arrayobject.h
   # user wants to compile python module
   WhichPython=$$system(which python)
   isEmpty(WhichPython) {
@@ -200,6 +199,7 @@ CONFIG(BORNAGAIN_PYTHON) {
 
     # we need to know the location of numpy
     pythonnumpy=$$system("python -c 'import sys; import numpy; sys.stdout.write(numpy.get_include())'")
+    !exists($$pythonnumpy/numpy/arrayobject.h): error("Can't find numpy/arrayobject.h in $$pythonnumpy, you have to install python-numpy-devel")
     INCLUDEPATH += $$pythonnumpy
   }
 }