Merge branch 'PythonAPI' into develop

Core/FormFactors/inc/IFormFactor.h

@@ -65,9 +65,9 @@ class IFormFactor : public ISample
         std::vector<IFormFactor *>& form_factors,
         std::vector<double>& probabilities,
         size_t nbr_samples) const {
-        (void)form_factors;   // to prevent unused-variable warning
-        (void)probabilities;  // to prevent unused-variable warning
-        (void)nbr_samples;    // to prevent unused-variable warning
+        (void)form_factors;
+        (void)probabilities;
+        (void)nbr_samples;
     }
 };
 
@@ -80,14 +80,12 @@ inline double IFormFactor::getVolume() const
 
 inline double IFormFactor::getHeight() const
 {
-    double result = std::pow(getVolume(), 1.0/3.0);
-    return result;
+    return std::pow(getVolume(), 1.0/3.0);
 }
 
 inline double IFormFactor::getRadius() const
 {
-    double result = std::sqrt(getVolume()/getHeight()/M_PI);
-    return result;
+    return std::sqrt(getVolume()/getHeight()/M_PI);
 }
 
 #endif // IFORMFACTOR_H

Core/Geometry/inc/ITransform3D.h

@@ -15,6 +15,7 @@
 #ifndef GEOMETRY_ITRANSFROM3D_H
 #define GEOMETRY_ITRANSFROM3D_H
 
+#include "Types.h"
 #include "BasicVector3D.h"
 #include <boost/shared_ptr.hpp>
 
@@ -51,6 +52,13 @@ class ITransform3D {
 
 };
 
+
+//class PTransform3DWrapper {
+//public:
+
+//    PTransform3D
+//};
+
 }  // namespace Geometry
 
 #endif /* GEOMETRY_ITRANSFROM3D_H */

Core/PythonAPI/inc/Beam.pypp.h

+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
+#ifndef Beam_hpp__pyplusplus_wrapper
+#define Beam_hpp__pyplusplus_wrapper
+
+void register_Beam_class();
+
+#endif//Beam_hpp__pyplusplus_wrapper

Core/PythonAPI/inc/Bin1D.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef Bin1D_hpp__pyplusplus_wrapper
 #define Bin1D_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/Bin1DCVector.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef Bin1DCVector_hpp__pyplusplus_wrapper
 #define Bin1DCVector_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/Crystal.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef Crystal_hpp__pyplusplus_wrapper
 #define Crystal_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/Detector.pypp.h

+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
+#ifndef Detector_hpp__pyplusplus_wrapper
+#define Detector_hpp__pyplusplus_wrapper
+
+void register_Detector_class();
+
+#endif//Detector_hpp__pyplusplus_wrapper

Core/PythonAPI/inc/DiffuseDWBASimulation.pypp.h

-// This file has been generated by Py++.
-
-#ifndef DiffuseDWBASimulation_hpp__pyplusplus_wrapper
-#define DiffuseDWBASimulation_hpp__pyplusplus_wrapper
-
-void register_DiffuseDWBASimulation_class();
-
-#endif//DiffuseDWBASimulation_hpp__pyplusplus_wrapper

Core/PythonAPI/inc/DiffuseParticleInfo.pypp.h

-// This file has been generated by Py++.
-
-#ifndef DiffuseParticleInfo_hpp__pyplusplus_wrapper
-#define DiffuseParticleInfo_hpp__pyplusplus_wrapper
-
-void register_DiffuseParticleInfo_class();
-
-#endif//DiffuseParticleInfo_hpp__pyplusplus_wrapper

Core/PythonAPI/inc/FTDistribution2DCauchy.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef FTDistribution2DCauchy_hpp__pyplusplus_wrapper
 #define FTDistribution2DCauchy_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/FormFactorBox.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef FormFactorBox_hpp__pyplusplus_wrapper
 #define FormFactorBox_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/FormFactorCone.pypp.h

+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
+#ifndef FormFactorCone_hpp__pyplusplus_wrapper
+#define FormFactorCone_hpp__pyplusplus_wrapper
+
+void register_FormFactorCone_class();
+
+#endif//FormFactorCone_hpp__pyplusplus_wrapper

Core/PythonAPI/inc/FormFactorCrystal.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef FormFactorCrystal_hpp__pyplusplus_wrapper
 #define FormFactorCrystal_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/FormFactorCylinder.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef FormFactorCylinder_hpp__pyplusplus_wrapper
 #define FormFactorCylinder_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/FormFactorDecoratorDebyeWaller.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef FormFactorDecoratorDebyeWaller_hpp__pyplusplus_wrapper
 #define FormFactorDecoratorDebyeWaller_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/FormFactorEllipsoid.pypp.h

+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
+#ifndef FormFactorEllipsoid_hpp__pyplusplus_wrapper
+#define FormFactorEllipsoid_hpp__pyplusplus_wrapper
+
+void register_FormFactorEllipsoid_class();
+
+#endif//FormFactorEllipsoid_hpp__pyplusplus_wrapper

Core/PythonAPI/inc/FormFactorFullSphere.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef FormFactorFullSphere_hpp__pyplusplus_wrapper
 #define FormFactorFullSphere_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/FormFactorFullSpheroid.pypp.h

+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
+#ifndef FormFactorFullSpheroid_hpp__pyplusplus_wrapper
+#define FormFactorFullSpheroid_hpp__pyplusplus_wrapper
+
+void register_FormFactorFullSpheroid_class();
+
+#endif//FormFactorFullSpheroid_hpp__pyplusplus_wrapper

Core/PythonAPI/inc/FormFactorGauss.pypp.h

 // This file has been generated by Py++.
 
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
 #ifndef FormFactorGauss_hpp__pyplusplus_wrapper
 #define FormFactorGauss_hpp__pyplusplus_wrapper
 

Core/PythonAPI/inc/FormFactorHemiSpheroid.pypp.h

+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence 
+//! @brief automatically generated boost::python code for PythonCoreAPI  
+
+#ifndef FormFactorHemiSpheroid_hpp__pyplusplus_wrapper
+#define FormFactorHemiSpheroid_hpp__pyplusplus_wrapper
+
+void register_FormFactorHemiSpheroid_class();
+
+#endif//FormFactorHemiSpheroid_hpp__pyplusplus_wrapper