gitDiff.txt

juan, 08 May 2019 16:55

Download (45.9 KB)

 
1
diff --git a/Core/Basics/BornAgainNamespace.h b/Core/Basics/BornAgainNamespace.h
2
index 416f3e8..9734b0f 100644
3
--- a/Core/Basics/BornAgainNamespace.h
4
+++ b/Core/Basics/BornAgainNamespace.h
5
@@ -253,9 +253,26 @@ const std::string BackgroundValue = "BackgroundValue";
6
 const std::string BeamToSampleWidthRatio = "BeamToSampleWidthRatio";
7
 
8
 const std::string UnitsRad = "rad";
9
+const std::string UnitsDeg = "deg";
10
 const std::string UnitsNm = "nm";
11
 const std::string UnitsNm2 = "nm^2";
12
 const std::string UnitsNone = "";
13
+
14
+const std::string NmInSqBrackets = "[" + UnitsNm + "]";
15
+const std::string DegInSqBrackets = "[" + UnitsDeg + "]";
16
+
17
+const std::string LengthInNm = Length + NmInSqBrackets;
18
+const std::string WidthInNm = Width + NmInSqBrackets;
19
+const std::string HeightInNm = Height + NmInSqBrackets;
20
+const std::string DeltaHeightInNm = DeltaHeight + NmInSqBrackets;
21
+const std::string BaseEdgeInNm = BaseEdge + NmInSqBrackets;
22
+const std::string EdgeInNm = Edge + NmInSqBrackets;
23
+const std::string RadiusInNm = Radius + NmInSqBrackets;
24
+const std::string RadiusXInNm = RadiusX + NmInSqBrackets;
25
+const std::string RadiusYInNm = RadiusY + NmInSqBrackets;
26
+const std::string AsymmetryLengthInNm = AsymmetryLength + NmInSqBrackets;
27
+const std::string RemovedLengthInNm = RemovedLength + NmInSqBrackets;
28
+const std::string AlphaInDeg = Alpha + DegInSqBrackets;
29
 }
30
 
31
 #endif // BORNAGAINNAMESPACE_H
32
diff --git a/Core/HardParticle/FormFactorAnisoPyramid.cpp b/Core/HardParticle/FormFactorAnisoPyramid.cpp
33
index 738eed6..b167f6f 100644
34
--- a/Core/HardParticle/FormFactorAnisoPyramid.cpp
35
+++ b/Core/HardParticle/FormFactorAnisoPyramid.cpp
36
@@ -44,10 +44,10 @@ FormFactorAnisoPyramid::FormFactorAnisoPyramid(
37
     , m_alpha(alpha)
38
 {
39
     setName(BornAgain::FFAnisoPyramidType);
40
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
41
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
42
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
43
-    registerParameter(BornAgain::Alpha, &m_alpha).setUnit(BornAgain::UnitsRad)
44
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
45
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
46
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
47
+    registerParameter(BornAgain::AlphaInDeg, &m_alpha).setUnit(BornAgain::UnitsRad)
48
         .setLimited(0., M_PI_2);
49
     onChange();
50
 }
51
diff --git a/Core/HardParticle/FormFactorBox.cpp b/Core/HardParticle/FormFactorBox.cpp
52
index 75d7aa4..fe57dce 100644
53
--- a/Core/HardParticle/FormFactorBox.cpp
54
+++ b/Core/HardParticle/FormFactorBox.cpp
55
@@ -26,9 +26,9 @@ FormFactorBox::FormFactorBox(double length, double width, double height)
56
     : m_length(length), m_width(width), m_height(height)
57
 {
58
     setName(BornAgain::FFBoxType);
59
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
60
-    registerParameter(BornAgain::Width,  &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
61
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
62
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
63
+    registerParameter(BornAgain::WidthInNm,  &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
64
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
65
     onChange();
66
 }
67
 
68
diff --git a/Core/HardParticle/FormFactorCone.cpp b/Core/HardParticle/FormFactorCone.cpp
69
index c69a817..2b02fec 100644
70
--- a/Core/HardParticle/FormFactorCone.cpp
71
+++ b/Core/HardParticle/FormFactorCone.cpp
72
@@ -41,9 +41,9 @@ FormFactorCone::FormFactorCone(double radius, double height, double alpha)
73
         ostr << "Check for 'height <= radius*tan(alpha)' failed.";
74
         throw Exceptions::ClassInitializationException(ostr.str());
75
     }
76
-    registerParameter(BornAgain::Radius, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
77
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
78
-    registerParameter(BornAgain::Alpha, &m_alpha).setUnit(BornAgain::UnitsRad)
79
+    registerParameter(BornAgain::RadiusInNm, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
80
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
81
+    registerParameter(BornAgain::AlphaInDeg, &m_alpha).setUnit(BornAgain::UnitsRad)
82
         .setLimited(0., M_PI_2);
83
 
84
     mP_integrator = make_integrator_complex(this, &FormFactorCone::Integrand);
85
diff --git a/Core/HardParticle/FormFactorCone6.cpp b/Core/HardParticle/FormFactorCone6.cpp
86
index 35bc5bd..6e64c34 100644
87
--- a/Core/HardParticle/FormFactorCone6.cpp
88
+++ b/Core/HardParticle/FormFactorCone6.cpp
89
@@ -43,11 +43,11 @@ FormFactorCone6::FormFactorCone6(double base_edge, double height, double alpha)
90
     , m_alpha(alpha)
91
 {
92
     setName(BornAgain::FFCone6Type);
93
-    registerParameter(BornAgain::BaseEdge, &m_base_edge).setUnit(BornAgain::UnitsNm)
94
+    registerParameter(BornAgain::BaseEdgeInNm, &m_base_edge).setUnit(BornAgain::UnitsNm)
95
         .setNonnegative();
96
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm)
97
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm)
98
         .setNonnegative();
99
-    registerParameter(BornAgain::Alpha, &m_alpha).setUnit(BornAgain::UnitsRad)
100
+    registerParameter(BornAgain::AlphaInDeg, &m_alpha).setUnit(BornAgain::UnitsRad)
101
         .setLimited(0., M_PI_2);
102
     onChange();
103
 }
104
diff --git a/Core/HardParticle/FormFactorCuboctahedron.cpp b/Core/HardParticle/FormFactorCuboctahedron.cpp
105
index 2514fef..3fde9ee 100644
106
--- a/Core/HardParticle/FormFactorCuboctahedron.cpp
107
+++ b/Core/HardParticle/FormFactorCuboctahedron.cpp
108
@@ -50,13 +50,13 @@ FormFactorCuboctahedron::FormFactorCuboctahedron(
109
     , m_alpha(alpha)
110
 {
111
     setName(BornAgain::FFCuboctahedronType);
112
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm)
113
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm)
114
         .setNonnegative();
115
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm)
116
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm)
117
         .setNonnegative();
118
     registerParameter(BornAgain::HeightRatio, &m_height_ratio).setUnit(BornAgain::UnitsNm)
119
         .setNonnegative();
120
-    registerParameter(BornAgain::Alpha, &m_alpha).setUnit(BornAgain::UnitsRad)
121
+    registerParameter(BornAgain::AlphaInDeg, &m_alpha).setUnit(BornAgain::UnitsRad)
122
         .setLimited(0., M_PI_2);
123
     onChange();
124
 }
125
diff --git a/Core/HardParticle/FormFactorCylinder.cpp b/Core/HardParticle/FormFactorCylinder.cpp
126
index 0de0290..2c1d316 100644
127
--- a/Core/HardParticle/FormFactorCylinder.cpp
128
+++ b/Core/HardParticle/FormFactorCylinder.cpp
129
@@ -26,8 +26,8 @@ FormFactorCylinder::FormFactorCylinder(double radius, double height)
130
     : m_radius(radius), m_height(height)
131
 {
132
     setName(BornAgain::FFCylinderType);
133
-    registerParameter(BornAgain::Radius, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
134
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
135
+    registerParameter(BornAgain::RadiusInNm, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
136
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
137
     onChange();
138
 }
139
 
140
diff --git a/Core/HardParticle/FormFactorDodecahedron.cpp b/Core/HardParticle/FormFactorDodecahedron.cpp
141
index 9fe3901..2d452c8 100644
142
--- a/Core/HardParticle/FormFactorDodecahedron.cpp
143
+++ b/Core/HardParticle/FormFactorDodecahedron.cpp
144
@@ -45,7 +45,7 @@ FormFactorDodecahedron::FormFactorDodecahedron(double edge)
145
     , m_edge(edge)
146
 {
147
     setName(BornAgain::FFDodecahedronType);
148
-    registerParameter(BornAgain::Edge, &m_edge).setUnit(BornAgain::UnitsNm).setNonnegative();
149
+    registerParameter(BornAgain::EdgeInNm, &m_edge).setUnit(BornAgain::UnitsNm).setNonnegative();
150
     onChange();
151
 }
152
 
153
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
154
index 3afe0da..892cecf 100644
155
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
156
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
157
@@ -28,11 +28,11 @@ FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(
158
     : m_radius_x(radius_x), m_radius_y(radius_y), m_height(height)
159
 {
160
     setName(BornAgain::FFEllipsoidalCylinderType);
161
-    registerParameter(BornAgain::RadiusX, &m_radius_x).setUnit(BornAgain::UnitsNm)
162
+    registerParameter(BornAgain::RadiusXInNm, &m_radius_x).setUnit(BornAgain::UnitsNm)
163
         .setNonnegative();
164
-    registerParameter(BornAgain::RadiusY, & m_radius_y).setUnit(BornAgain::UnitsNm)
165
+    registerParameter(BornAgain::RadiusYInNm, & m_radius_y).setUnit(BornAgain::UnitsNm)
166
         .setNonnegative();
167
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm)
168
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm)
169
         .setNonnegative();
170
     onChange();
171
 }
172
diff --git a/Core/HardParticle/FormFactorFullSphere.cpp b/Core/HardParticle/FormFactorFullSphere.cpp
173
index d0af46d..d8ecec1 100644
174
--- a/Core/HardParticle/FormFactorFullSphere.cpp
175
+++ b/Core/HardParticle/FormFactorFullSphere.cpp
176
@@ -27,7 +27,7 @@ FormFactorFullSphere::FormFactorFullSphere(double radius, bool position_at_cente
177
     : m_radius(radius), m_position_at_center(position_at_center)
178
 {
179
     setName(BornAgain::FFFullSphereType);
180
-    registerParameter(BornAgain::Radius, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
181
+    registerParameter(BornAgain::RadiusInNm, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
182
     onChange();
183
 }
184
 
185
diff --git a/Core/HardParticle/FormFactorFullSpheroid.cpp b/Core/HardParticle/FormFactorFullSpheroid.cpp
186
index 2395b9d..43f84f9 100644
187
--- a/Core/HardParticle/FormFactorFullSpheroid.cpp
188
+++ b/Core/HardParticle/FormFactorFullSpheroid.cpp
189
@@ -28,8 +28,8 @@ FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height )
190
     : m_radius(radius), m_height(height)
191
 {
192
     setName(BornAgain::FFFullSpheroidType);
193
-    registerParameter(BornAgain::Radius, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
194
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
195
+    registerParameter(BornAgain::RadiusInNm, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
196
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
197
     mP_integrator = make_integrator_complex(this, &FormFactorFullSpheroid::Integrand);
198
     onChange();
199
 }
200
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.cpp b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
201
index 477d77a..3fae837 100644
202
--- a/Core/HardParticle/FormFactorHemiEllipsoid.cpp
203
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
204
@@ -28,11 +28,11 @@ FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double radius_x, double radius_
205
     : m_radius_x(radius_x), m_radius_y(radius_y), m_height(height)
206
 {
207
     setName(BornAgain::FFHemiEllipsoidType);
208
-    registerParameter(BornAgain::RadiusX, &m_radius_x).setUnit(BornAgain::UnitsNm)
209
+    registerParameter(BornAgain::RadiusXInNm, &m_radius_x).setUnit(BornAgain::UnitsNm)
210
         .setNonnegative();
211
-    registerParameter(BornAgain::RadiusY, & m_radius_y).setUnit(BornAgain::UnitsNm)
212
+    registerParameter(BornAgain::RadiusYInNm, & m_radius_y).setUnit(BornAgain::UnitsNm)
213
         .setNonnegative();
214
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm)
215
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm)
216
         .setNonnegative();
217
     mP_integrator = make_integrator_complex(this, &FormFactorHemiEllipsoid::Integrand);
218
     onChange();
219
diff --git a/Core/HardParticle/FormFactorIcosahedron.cpp b/Core/HardParticle/FormFactorIcosahedron.cpp
220
index ae2b3a2..459b2c4 100644
221
--- a/Core/HardParticle/FormFactorIcosahedron.cpp
222
+++ b/Core/HardParticle/FormFactorIcosahedron.cpp
223
@@ -55,7 +55,7 @@ FormFactorIcosahedron::FormFactorIcosahedron(double edge)
224
     , m_edge(edge)
225
 {
226
     setName(BornAgain::FFIcosahedronType);
227
-    registerParameter(BornAgain::Edge, &m_edge).setUnit(BornAgain::UnitsNm).setNonnegative();
228
+    registerParameter(BornAgain::EdgeInNm, &m_edge).setUnit(BornAgain::UnitsNm).setNonnegative();
229
     onChange();
230
 }
231
 
232
diff --git a/Core/HardParticle/FormFactorLongBox.cpp b/Core/HardParticle/FormFactorLongBox.cpp
233
index ed32b36..132aaff 100644
234
--- a/Core/HardParticle/FormFactorLongBox.cpp
235
+++ b/Core/HardParticle/FormFactorLongBox.cpp
236
@@ -22,9 +22,9 @@ FormFactorLongBox::FormFactorLongBox(double length, double width, double height)
237
     : m_length(length), m_width(width), m_height(height)
238
 {
239
     setName(BornAgain::FFLongBoxType);
240
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
241
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
242
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
243
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
244
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
245
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
246
     onChange();
247
 }
248
 
249
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.cpp b/Core/HardParticle/FormFactorLongBoxGauss.cpp
250
index 07dde84..809a098 100644
251
--- a/Core/HardParticle/FormFactorLongBoxGauss.cpp
252
+++ b/Core/HardParticle/FormFactorLongBoxGauss.cpp
253
@@ -22,9 +22,9 @@ FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, doub
254
     : m_length(length), m_width(width), m_height(height)
255
 {
256
     setName(BornAgain::FFLongBoxGaussType);
257
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
258
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
259
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
260
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
261
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
262
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
263
     onChange();
264
 }
265
 
266
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.cpp b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
267
index 9119dc1..02519f6 100644
268
--- a/Core/HardParticle/FormFactorLongBoxLorentz.cpp
269
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
270
@@ -22,9 +22,9 @@ FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width,
271
     : m_length(length), m_width(width), m_height(height)
272
 {
273
     setName(BornAgain::FFLongBoxLorentzType);
274
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
275
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
276
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
277
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
278
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
279
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
280
     onChange();
281
 }
282
 
283
diff --git a/Core/HardParticle/FormFactorLongRipple1Gauss.cpp b/Core/HardParticle/FormFactorLongRipple1Gauss.cpp
284
index f2b0182..7d9a68d 100644
285
--- a/Core/HardParticle/FormFactorLongRipple1Gauss.cpp
286
+++ b/Core/HardParticle/FormFactorLongRipple1Gauss.cpp
287
@@ -26,9 +26,9 @@ FormFactorLongRipple1Gauss::FormFactorLongRipple1Gauss(double length, double wid
288
 {
289
     setName(BornAgain::FFLongRipple1GaussType);
290
     check_initialization();
291
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
292
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
293
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
294
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
295
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
296
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
297
     mP_integrator = make_integrator_complex(this, &FormFactorLongRipple1Gauss::Integrand);
298
     onChange();
299
 }
300
diff --git a/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp b/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp
301
index acb239d..2d951a9 100644
302
--- a/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp
303
+++ b/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp
304
@@ -26,9 +26,9 @@ FormFactorLongRipple1Lorentz::FormFactorLongRipple1Lorentz(
305
 {
306
     setName(BornAgain::FFLongRipple1LorentzType);
307
     check_initialization();
308
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
309
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
310
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
311
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
312
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
313
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
314
     mP_integrator = make_integrator_complex(this, &FormFactorLongRipple1Lorentz::Integrand);
315
     onChange();
316
 }
317
diff --git a/Core/HardParticle/FormFactorLongRipple2Gauss.cpp b/Core/HardParticle/FormFactorLongRipple2Gauss.cpp
318
index beab178..77ce880 100644
319
--- a/Core/HardParticle/FormFactorLongRipple2Gauss.cpp
320
+++ b/Core/HardParticle/FormFactorLongRipple2Gauss.cpp
321
@@ -27,10 +27,10 @@ FormFactorLongRipple2Gauss::FormFactorLongRipple2Gauss(
322
 {
323
     setName(BornAgain::FFLongRipple2GaussType);
324
     check_initialization();
325
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
326
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
327
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
328
-    registerParameter(BornAgain::AsymmetryLength, &m_d).setUnit(BornAgain::UnitsNm);
329
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
330
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
331
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
332
+    registerParameter(BornAgain::AsymmetryLengthInNm, &m_d).setUnit(BornAgain::UnitsNm);
333
     onChange();
334
 }
335
 
336
diff --git a/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp b/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp
337
index 492eb1a..471783e 100644
338
--- a/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp
339
+++ b/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp
340
@@ -27,10 +27,10 @@ FormFactorLongRipple2Lorentz::FormFactorLongRipple2Lorentz(
341
     : m_length(length), m_width(width), m_height(height), m_d(asymetry)
342
 {
343
     setName(BornAgain::FFLongRipple2LorentzType);
344
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
345
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
346
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
347
-    registerParameter(BornAgain::AsymmetryLength, &m_d).setUnit(BornAgain::UnitsNm);
348
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
349
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
350
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
351
+    registerParameter(BornAgain::AsymmetryLengthInNm, &m_d).setUnit(BornAgain::UnitsNm);
352
     onChange();
353
 }
354
 
355
diff --git a/Core/HardParticle/FormFactorPrism3.cpp b/Core/HardParticle/FormFactorPrism3.cpp
356
index 49d8448..9d717f4 100644
357
--- a/Core/HardParticle/FormFactorPrism3.cpp
358
+++ b/Core/HardParticle/FormFactorPrism3.cpp
359
@@ -25,9 +25,9 @@ FormFactorPrism3::FormFactorPrism3(double base_edge, double height)
360
     : FormFactorPolygonalPrism( height ), m_base_edge( base_edge )
361
 {
362
     setName(BornAgain::FFPrism3Type);
363
-    registerParameter(BornAgain::BaseEdge, &m_base_edge).setUnit(BornAgain::UnitsNm)
364
+    registerParameter(BornAgain::BaseEdgeInNm, &m_base_edge).setUnit(BornAgain::UnitsNm)
365
         .setNonnegative();
366
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm)
367
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm)
368
         .setNonnegative();
369
     onChange();
370
 }
371
diff --git a/Core/HardParticle/FormFactorPrism6.cpp b/Core/HardParticle/FormFactorPrism6.cpp
372
index eda881b..cfbfe4d 100644
373
--- a/Core/HardParticle/FormFactorPrism6.cpp
374
+++ b/Core/HardParticle/FormFactorPrism6.cpp
375
@@ -25,9 +25,9 @@ FormFactorPrism6::FormFactorPrism6(double base_edge, double height)
376
     , m_base_edge(base_edge)
377
 {
378
     setName(BornAgain::FFPrism6Type);
379
-    registerParameter(BornAgain::BaseEdge, &m_base_edge).setUnit(BornAgain::UnitsNm)
380
+    registerParameter(BornAgain::BaseEdgeInNm, &m_base_edge).setUnit(BornAgain::UnitsNm)
381
         .setNonnegative();
382
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm)
383
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm)
384
         .setNonnegative();
385
     onChange();
386
 }
387
diff --git a/Core/HardParticle/FormFactorPyramid.cpp b/Core/HardParticle/FormFactorPyramid.cpp
388
index 370853d..27c024e 100644
389
--- a/Core/HardParticle/FormFactorPyramid.cpp
390
+++ b/Core/HardParticle/FormFactorPyramid.cpp
391
@@ -41,10 +41,10 @@ FormFactorPyramid::FormFactorPyramid(double base_edge, double height, double alp
392
     , m_alpha(alpha)
393
 {
394
     setName(BornAgain::FFPyramidType);
395
-    registerParameter(BornAgain::BaseEdge, &m_base_edge).setUnit(BornAgain::UnitsNm)
396
+    registerParameter(BornAgain::BaseEdgeInNm, &m_base_edge).setUnit(BornAgain::UnitsNm)
397
         .setNonnegative();
398
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
399
-    registerParameter(BornAgain::Alpha, & m_alpha).setUnit(BornAgain::UnitsRad)
400
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
401
+    registerParameter(BornAgain::AlphaInDeg, & m_alpha).setUnit(BornAgain::UnitsRad)
402
         .setLimited(0., M_PI);
403
     onChange();
404
 }
405
diff --git a/Core/HardParticle/FormFactorRipple1.cpp b/Core/HardParticle/FormFactorRipple1.cpp
406
index 8b1b2dc..3f3cc28 100644
407
--- a/Core/HardParticle/FormFactorRipple1.cpp
408
+++ b/Core/HardParticle/FormFactorRipple1.cpp
409
@@ -30,9 +30,9 @@ FormFactorRipple1::FormFactorRipple1(double length, double width, double height)
410
 {
411
     setName(BornAgain::FFRipple1Type);
412
     check_initialization();
413
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
414
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
415
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
416
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
417
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
418
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
419
     mP_integrator = make_integrator_complex(this, &FormFactorRipple1::Integrand);
420
     onChange();
421
 }
422
diff --git a/Core/HardParticle/FormFactorRipple2.cpp b/Core/HardParticle/FormFactorRipple2.cpp
423
index f8c2ad9..39f11ea 100644
424
--- a/Core/HardParticle/FormFactorRipple2.cpp
425
+++ b/Core/HardParticle/FormFactorRipple2.cpp
426
@@ -29,10 +29,10 @@ FormFactorRipple2::FormFactorRipple2(double length, double width, double height,
427
 {
428
     setName(BornAgain::FFRipple2Type);
429
     check_initialization();
430
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
431
-    registerParameter(BornAgain::Width, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
432
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
433
-    registerParameter(BornAgain::AsymmetryLength, &m_d).setUnit(BornAgain::UnitsNm);
434
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm).setNonnegative();
435
+    registerParameter(BornAgain::WidthInNm, &m_width).setUnit(BornAgain::UnitsNm).setNonnegative();
436
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
437
+    registerParameter(BornAgain::AsymmetryLengthInNm, &m_d).setUnit(BornAgain::UnitsNm);
438
     onChange();
439
 }
440
 
441
diff --git a/Core/HardParticle/FormFactorTetrahedron.cpp b/Core/HardParticle/FormFactorTetrahedron.cpp
442
index 16b9ef8..dbd9d25 100644
443
--- a/Core/HardParticle/FormFactorTetrahedron.cpp
444
+++ b/Core/HardParticle/FormFactorTetrahedron.cpp
445
@@ -41,11 +41,11 @@ FormFactorTetrahedron::FormFactorTetrahedron(double base_edge, double height, do
446
     , m_alpha(alpha)
447
 {
448
     setName(BornAgain::FFTetrahedronType);
449
-    registerParameter(BornAgain::BaseEdge, &m_base_edge).setUnit(BornAgain::UnitsNm)
450
+    registerParameter(BornAgain::BaseEdgeInNm, &m_base_edge).setUnit(BornAgain::UnitsNm)
451
         .setNonnegative();
452
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm)
453
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm)
454
         .setNonnegative();
455
-    registerParameter(BornAgain::Alpha, &m_alpha).setUnit(BornAgain::UnitsRad)
456
+    registerParameter(BornAgain::AlphaInDeg, &m_alpha).setUnit(BornAgain::UnitsRad)
457
         .setLimited(0., M_PI_2);
458
     onChange();
459
 }
460
diff --git a/Core/HardParticle/FormFactorTriangle.cpp b/Core/HardParticle/FormFactorTriangle.cpp
461
index 85b6595..a40e7da 100644
462
--- a/Core/HardParticle/FormFactorTriangle.cpp
463
+++ b/Core/HardParticle/FormFactorTriangle.cpp
464
@@ -23,7 +23,7 @@ FormFactorTriangle::FormFactorTriangle(const double base_edge)
465
     : m_base_edge( base_edge )
466
 {
467
     setName("Triangle");
468
-    registerParameter(BornAgain::BaseEdge, &m_base_edge).setUnit(BornAgain::UnitsNm)
469
+    registerParameter(BornAgain::BaseEdgeInNm, &m_base_edge).setUnit(BornAgain::UnitsNm)
470
         .setNonnegative();
471
     onChange();
472
 }
473
diff --git a/Core/HardParticle/FormFactorTruncatedCube.cpp b/Core/HardParticle/FormFactorTruncatedCube.cpp
474
index 0327479..f95763c 100644
475
--- a/Core/HardParticle/FormFactorTruncatedCube.cpp
476
+++ b/Core/HardParticle/FormFactorTruncatedCube.cpp
477
@@ -45,9 +45,9 @@ FormFactorTruncatedCube::FormFactorTruncatedCube(double length, double removed_l
478
     , m_removed_length(removed_length)
479
 {
480
     setName(BornAgain::FFTruncatedCubeType);
481
-    registerParameter(BornAgain::Length, &m_length).setUnit(BornAgain::UnitsNm)
482
+    registerParameter(BornAgain::LengthInNm, &m_length).setUnit(BornAgain::UnitsNm)
483
         .setNonnegative();
484
-    registerParameter(BornAgain::RemovedLength, &m_removed_length).setUnit(BornAgain::UnitsNm)
485
+    registerParameter(BornAgain::RemovedLengthInNm, &m_removed_length).setUnit(BornAgain::UnitsNm)
486
         .setNonnegative();
487
     onChange();
488
 }
489
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.cpp b/Core/HardParticle/FormFactorTruncatedSphere.cpp
490
index eb255d8..73d4623 100644
491
--- a/Core/HardParticle/FormFactorTruncatedSphere.cpp
492
+++ b/Core/HardParticle/FormFactorTruncatedSphere.cpp
493
@@ -33,9 +33,9 @@ FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double heigh
494
 {
495
     setName(BornAgain::FFTruncatedSphereType);
496
     check_initialization();
497
-    registerParameter(BornAgain::Radius, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
498
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
499
-    registerParameter(BornAgain::DeltaHeight, &m_dh).setUnit(BornAgain::UnitsNm).setNonnegative();
500
+    registerParameter(BornAgain::RadiusInNm, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
501
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
502
+    registerParameter(BornAgain::DeltaHeightInNm, &m_dh).setUnit(BornAgain::UnitsNm).setNonnegative();
503
     mP_integrator = make_integrator_complex(this, &FormFactorTruncatedSphere::Integrand);
504
     onChange();
505
 }
506
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
507
index 536c763..0c659c2 100644
508
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
509
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
510
@@ -35,10 +35,10 @@ FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(
511
 {
512
     setName(BornAgain::FFTruncatedSpheroidType);
513
     check_initialization();
514
-    registerParameter(BornAgain::Radius, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
515
-    registerParameter(BornAgain::Height, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
516
+    registerParameter(BornAgain::RadiusInNm, &m_radius).setUnit(BornAgain::UnitsNm).setNonnegative();
517
+    registerParameter(BornAgain::HeightInNm, &m_height).setUnit(BornAgain::UnitsNm).setNonnegative();
518
     registerParameter(BornAgain::HeightFlattening, &m_height_flattening).setNonnegative();
519
-    registerParameter(BornAgain::DeltaHeight, &m_dh).setUnit(BornAgain::UnitsNm).setNonnegative();
520
+    registerParameter(BornAgain::DeltaHeightInNm, &m_dh).setUnit(BornAgain::UnitsNm).setNonnegative();
521
     mP_integrator = make_integrator_complex(this, &FormFactorTruncatedSpheroid::Integrand);
522
     onChange();
523
 }
524
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/coregui/Models/FormFactorItems.cpp
525
index bc570d5..a1429ce 100644
526
--- a/GUI/coregui/Models/FormFactorItems.cpp
527
+++ b/GUI/coregui/Models/FormFactorItems.cpp
528
@@ -19,10 +19,10 @@
529
 
530
 /* ------------------------------------------------ */
531
 
532
-const QString AnisoPyramidItem::P_LENGTH = QString::fromStdString(BornAgain::Length);
533
-const QString AnisoPyramidItem::P_WIDTH = QString::fromStdString(BornAgain::Width);
534
-const QString AnisoPyramidItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
535
-const QString AnisoPyramidItem::P_ALPHA = QString::fromStdString(BornAgain::Alpha);
536
+const QString AnisoPyramidItem::P_LENGTH = QString::fromStdString(BornAgain::LengthInNm);
537
+const QString AnisoPyramidItem::P_WIDTH = QString::fromStdString(BornAgain::WidthInNm);
538
+const QString AnisoPyramidItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
539
+const QString AnisoPyramidItem::P_ALPHA = QString::fromStdString(BornAgain::AlphaInDeg);
540
 
541
 AnisoPyramidItem::AnisoPyramidItem()
542
     : FormFactorItem(Constants::AnisoPyramidType)
543
@@ -50,9 +50,9 @@ std::unique_ptr<IFormFactor> AnisoPyramidItem::createFormFactor() const
544
 
545
 /* ------------------------------------------------ */
546
 
547
-const QString BoxItem::P_LENGTH = QString::fromStdString(BornAgain::Length);
548
-const QString BoxItem::P_WIDTH = QString::fromStdString(BornAgain::Width);
549
-const QString BoxItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
550
+const QString BoxItem::P_LENGTH = QString::fromStdString(BornAgain::LengthInNm);
551
+const QString BoxItem::P_WIDTH = QString::fromStdString(BornAgain::WidthInNm);
552
+const QString BoxItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
553
 
554
 BoxItem::BoxItem()
555
     : FormFactorItem(Constants::BoxType)
556
@@ -77,9 +77,9 @@ std::unique_ptr<IFormFactor> BoxItem::createFormFactor() const
557
 
558
 /* ------------------------------------------------ */
559
 
560
-const QString ConeItem::P_RADIUS = QString::fromStdString(BornAgain::Radius);
561
-const QString ConeItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
562
-const QString ConeItem::P_ALPHA = QString::fromStdString(BornAgain::Alpha);
563
+const QString ConeItem::P_RADIUS = QString::fromStdString(BornAgain::RadiusInNm);
564
+const QString ConeItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
565
+const QString ConeItem::P_ALPHA = QString::fromStdString(BornAgain::AlphaInDeg);
566
 
567
 ConeItem::ConeItem()
568
     : FormFactorItem(Constants::ConeType)
569
@@ -104,9 +104,9 @@ std::unique_ptr<IFormFactor> ConeItem::createFormFactor() const
570
 
571
 /* ------------------------------------------------ */
572
 
573
-const QString Cone6Item::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdge);
574
-const QString Cone6Item::P_HEIGHT = QString::fromStdString(BornAgain::Height);
575
-const QString Cone6Item::P_ALPHA = QString::fromStdString(BornAgain::Alpha);
576
+const QString Cone6Item::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdgeInNm);
577
+const QString Cone6Item::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
578
+const QString Cone6Item::P_ALPHA = QString::fromStdString(BornAgain::AlphaInDeg);
579
 
580
 Cone6Item::Cone6Item()
581
     : FormFactorItem(Constants::Cone6Type)
582
@@ -132,10 +132,10 @@ std::unique_ptr<IFormFactor> Cone6Item::createFormFactor() const
583
 
584
 /* ------------------------------------------------ */
585
 
586
-const QString CuboctahedronItem::P_LENGTH = QString::fromStdString(BornAgain::Length);
587
-const QString CuboctahedronItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
588
+const QString CuboctahedronItem::P_LENGTH = QString::fromStdString(BornAgain::LengthInNm);
589
+const QString CuboctahedronItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
590
 const QString CuboctahedronItem::P_HEIGHT_RATIO = QString::fromStdString(BornAgain::HeightRatio);
591
-const QString CuboctahedronItem::P_ALPHA = QString::fromStdString(BornAgain::Alpha);
592
+const QString CuboctahedronItem::P_ALPHA = QString::fromStdString(BornAgain::AlphaInDeg);
593
 
594
 CuboctahedronItem::CuboctahedronItem()
595
     : FormFactorItem(Constants::CuboctahedronType)
596
@@ -164,8 +164,8 @@ std::unique_ptr<IFormFactor> CuboctahedronItem::createFormFactor() const
597
 
598
 /* ------------------------------------------------ */
599
 
600
-const QString CylinderItem::P_RADIUS = QString::fromStdString(BornAgain::Radius);
601
-const QString CylinderItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
602
+const QString CylinderItem::P_RADIUS = QString::fromStdString(BornAgain::RadiusInNm);
603
+const QString CylinderItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
604
 
605
 CylinderItem::CylinderItem()
606
     : FormFactorItem(Constants::CylinderType)
607
@@ -187,7 +187,7 @@ std::unique_ptr<IFormFactor> CylinderItem::createFormFactor() const
608
 
609
 /* ------------------------------------------------ */
610
 
611
-const QString DodecahedronItem::P_EDGE = QString::fromStdString(BornAgain::Edge);
612
+const QString DodecahedronItem::P_EDGE = QString::fromStdString(BornAgain::EdgeInNm);
613
 
614
 DodecahedronItem::DodecahedronItem()
615
     : FormFactorItem(Constants::DodecahedronType)
616
@@ -219,9 +219,9 @@ std::unique_ptr<IFormFactor> DotItem::createFormFactor() const
617
 
618
 /* ------------------------------------------------ */
619
 
620
-const QString EllipsoidalCylinderItem::P_RADIUS_X = QString::fromStdString(BornAgain::RadiusX);
621
-const QString EllipsoidalCylinderItem::P_RADIUS_Y = QString::fromStdString(BornAgain::RadiusY);
622
-const QString EllipsoidalCylinderItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
623
+const QString EllipsoidalCylinderItem::P_RADIUS_X = QString::fromStdString(BornAgain::RadiusXInNm);
624
+const QString EllipsoidalCylinderItem::P_RADIUS_Y = QString::fromStdString(BornAgain::RadiusYInNm);
625
+const QString EllipsoidalCylinderItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
626
 
627
 EllipsoidalCylinderItem::EllipsoidalCylinderItem()
628
     : FormFactorItem(Constants::EllipsoidalCylinderType)
629
@@ -246,7 +246,7 @@ std::unique_ptr<IFormFactor> EllipsoidalCylinderItem::createFormFactor() const
630
 
631
 /* ------------------------------------------------ */
632
 
633
-const QString FullSphereItem::P_RADIUS = QString::fromStdString(BornAgain::Radius);
634
+const QString FullSphereItem::P_RADIUS = QString::fromStdString(BornAgain::RadiusInNm);
635
 
636
 FullSphereItem::FullSphereItem()
637
     : FormFactorItem(Constants::FullSphereType)
638
@@ -264,8 +264,8 @@ std::unique_ptr<IFormFactor> FullSphereItem::createFormFactor() const
639
 
640
 /* ------------------------------------------------ */
641
 
642
-const QString FullSpheroidItem::P_RADIUS = QString::fromStdString(BornAgain::Radius);
643
-const QString FullSpheroidItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
644
+const QString FullSpheroidItem::P_RADIUS = QString::fromStdString(BornAgain::RadiusInNm);
645
+const QString FullSpheroidItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
646
 
647
 FullSpheroidItem::FullSpheroidItem()
648
     : FormFactorItem(Constants::FullSpheroidType)
649
@@ -288,9 +288,9 @@ std::unique_ptr<IFormFactor> FullSpheroidItem::createFormFactor() const
650
 
651
 /* ------------------------------------------------ */
652
 
653
-const QString HemiEllipsoidItem::P_RADIUS_X = QString::fromStdString(BornAgain::RadiusX);
654
-const QString HemiEllipsoidItem::P_RADIUS_Y = QString::fromStdString(BornAgain::RadiusY);
655
-const QString HemiEllipsoidItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
656
+const QString HemiEllipsoidItem::P_RADIUS_X = QString::fromStdString(BornAgain::RadiusXInNm);
657
+const QString HemiEllipsoidItem::P_RADIUS_Y = QString::fromStdString(BornAgain::RadiusYInNm);
658
+const QString HemiEllipsoidItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
659
 
660
 HemiEllipsoidItem::HemiEllipsoidItem()
661
     : FormFactorItem(Constants::HemiEllipsoidType)
662
@@ -316,7 +316,7 @@ std::unique_ptr<IFormFactor> HemiEllipsoidItem::createFormFactor() const
663
 
664
 /* ------------------------------------------------ */
665
 
666
-const QString IcosahedronItem::P_EDGE = QString::fromStdString(BornAgain::Edge);
667
+const QString IcosahedronItem::P_EDGE = QString::fromStdString(BornAgain::EdgeInNm);
668
 
669
 IcosahedronItem::IcosahedronItem()
670
     : FormFactorItem(Constants::IcosahedronType)
671
@@ -336,8 +336,8 @@ std::unique_ptr<IFormFactor> IcosahedronItem::createFormFactor() const
672
 
673
 /* ------------------------------------------------ */
674
 
675
-const QString Prism3Item::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdge);
676
-const QString Prism3Item::P_HEIGHT = QString::fromStdString(BornAgain::Height);
677
+const QString Prism3Item::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdgeInNm);
678
+const QString Prism3Item::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
679
 
680
 Prism3Item::Prism3Item()
681
     : FormFactorItem(Constants::Prism3Type)
682
@@ -359,8 +359,8 @@ std::unique_ptr<IFormFactor> Prism3Item::createFormFactor() const
683
 
684
 /* ------------------------------------------------ */
685
 
686
-const QString Prism6Item::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdge);
687
-const QString Prism6Item::P_HEIGHT = QString::fromStdString(BornAgain::Height);
688
+const QString Prism6Item::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdgeInNm);
689
+const QString Prism6Item::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
690
 
691
 Prism6Item::Prism6Item()
692
     : FormFactorItem(Constants::Prism6Type)
693
@@ -382,9 +382,9 @@ std::unique_ptr<IFormFactor> Prism6Item::createFormFactor() const
694
 
695
 /* ------------------------------------------------ */
696
 
697
-const QString PyramidItem::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdge);
698
-const QString PyramidItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
699
-const QString PyramidItem::P_ALPHA = QString::fromStdString(BornAgain::Alpha);
700
+const QString PyramidItem::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdgeInNm);
701
+const QString PyramidItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
702
+const QString PyramidItem::P_ALPHA = QString::fromStdString(BornAgain::AlphaInDeg);
703
 
704
 PyramidItem::PyramidItem()
705
     : FormFactorItem(Constants::PyramidType)
706
@@ -409,9 +409,9 @@ std::unique_ptr<IFormFactor> PyramidItem::createFormFactor() const
707
 
708
 /* ------------------------------------------------ */
709
 
710
-const QString Ripple1Item::P_LENGTH = QString::fromStdString(BornAgain::Length);
711
-const QString Ripple1Item::P_WIDTH = QString::fromStdString(BornAgain::Width);
712
-const QString Ripple1Item::P_HEIGHT = QString::fromStdString(BornAgain::Height);
713
+const QString Ripple1Item::P_LENGTH = QString::fromStdString(BornAgain::LengthInNm);
714
+const QString Ripple1Item::P_WIDTH = QString::fromStdString(BornAgain::WidthInNm);
715
+const QString Ripple1Item::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
716
 
717
 Ripple1Item::Ripple1Item()
718
     : FormFactorItem(Constants::Ripple1Type)
719
@@ -436,10 +436,10 @@ std::unique_ptr<IFormFactor> Ripple1Item::createFormFactor() const
720
 
721
 /* ------------------------------------------------ */
722
 
723
-const QString Ripple2Item::P_LENGTH = QString::fromStdString(BornAgain::Length);
724
-const QString Ripple2Item::P_WIDTH = QString::fromStdString(BornAgain::Width);
725
-const QString Ripple2Item::P_HEIGHT = QString::fromStdString(BornAgain::Height);
726
-const QString Ripple2Item::P_ASYMMETRY = QString::fromStdString(BornAgain::AsymmetryLength);
727
+const QString Ripple2Item::P_LENGTH = QString::fromStdString(BornAgain::LengthInNm);
728
+const QString Ripple2Item::P_WIDTH = QString::fromStdString(BornAgain::WidthInNm);
729
+const QString Ripple2Item::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
730
+const QString Ripple2Item::P_ASYMMETRY = QString::fromStdString(BornAgain::AsymmetryLengthInNm);
731
 
732
 Ripple2Item::Ripple2Item()
733
     : FormFactorItem(Constants::Ripple2Type)
734
@@ -468,9 +468,9 @@ std::unique_ptr<IFormFactor> Ripple2Item::createFormFactor() const
735
 
736
 /* ------------------------------------------------ */
737
 
738
-const QString TetrahedronItem::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdge);
739
-const QString TetrahedronItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
740
-const QString TetrahedronItem::P_ALPHA = QString::fromStdString(BornAgain::Alpha);
741
+const QString TetrahedronItem::P_BASEEDGE = QString::fromStdString(BornAgain::BaseEdgeInNm);
742
+const QString TetrahedronItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
743
+const QString TetrahedronItem::P_ALPHA = QString::fromStdString(BornAgain::AlphaInDeg);
744
 
745
 TetrahedronItem::TetrahedronItem()
746
     : FormFactorItem(Constants::TetrahedronType)
747
@@ -496,8 +496,8 @@ std::unique_ptr<IFormFactor> TetrahedronItem::createFormFactor() const
748
 
749
 /* ------------------------------------------------ */
750
 
751
-const QString TruncatedCubeItem::P_LENGTH = QString::fromStdString(BornAgain::Length);
752
-const QString TruncatedCubeItem::P_REMOVED_LENGTH = QString::fromStdString(BornAgain::RemovedLength);
753
+const QString TruncatedCubeItem::P_LENGTH = QString::fromStdString(BornAgain::LengthInNm);
754
+const QString TruncatedCubeItem::P_REMOVED_LENGTH = QString::fromStdString(BornAgain::RemovedLengthInNm);
755
 
756
 TruncatedCubeItem::TruncatedCubeItem()
757
     : FormFactorItem(Constants::TruncatedCubeType)
758
@@ -519,9 +519,9 @@ std::unique_ptr<IFormFactor> TruncatedCubeItem::createFormFactor() const
759
 
760
 /* ------------------------------------------------ */
761
 
762
-const QString TruncatedSphereItem::P_RADIUS = QString::fromStdString(BornAgain::Radius);
763
-const QString TruncatedSphereItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
764
-const QString TruncatedSphereItem::P_REMOVED_TOP = QString::fromStdString(BornAgain::DeltaHeight);
765
+const QString TruncatedSphereItem::P_RADIUS = QString::fromStdString(BornAgain::RadiusInNm);
766
+const QString TruncatedSphereItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
767
+const QString TruncatedSphereItem::P_REMOVED_TOP = QString::fromStdString(BornAgain::DeltaHeightInNm);
768
 
769
 TruncatedSphereItem::TruncatedSphereItem()
770
     : FormFactorItem(Constants::TruncatedSphereType)
771
@@ -546,10 +546,10 @@ std::unique_ptr<IFormFactor> TruncatedSphereItem::createFormFactor() const
772
 
773
 /* ------------------------------------------------ */
774
 
775
-const QString TruncatedSpheroidItem::P_RADIUS = QString::fromStdString(BornAgain::Radius);
776
-const QString TruncatedSpheroidItem::P_HEIGHT = QString::fromStdString(BornAgain::Height);
777
+const QString TruncatedSpheroidItem::P_RADIUS = QString::fromStdString(BornAgain::RadiusInNm);
778
+const QString TruncatedSpheroidItem::P_HEIGHT = QString::fromStdString(BornAgain::HeightInNm);
779
 const QString TruncatedSpheroidItem::P_HFC = QString::fromStdString(BornAgain::HeightFlattening);
780
-const QString TruncatedSpheroidItem::P_REMOVED_TOP = QString::fromStdString(BornAgain::DeltaHeight);
781
+const QString TruncatedSpheroidItem::P_REMOVED_TOP = QString::fromStdString(BornAgain::DeltaHeightInNm);
782
 
783
 TruncatedSpheroidItem::TruncatedSpheroidItem()
784
     : FormFactorItem(Constants::TruncatedSpheroidType)
785
diff --git a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
786
index bc58b9d..aeebc03 100644
787
--- a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
788
+++ b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
789
@@ -164,7 +164,7 @@ bool GUITranslationTest::isValidDomainName(const std::string& domainName) const
790
     return true;
791
 }
792
 
793
-//! Returns true, if it makes sence to look for domain translation for given GUI name.
794
+//! Returns true, if it makes sense to look for domain translation for given GUI name.
795
 //! Intended to supress warnings about not-yet implemented translations.
796
 
797
 bool GUITranslationTest::isValidGUIName(const std::string& guiName) const
798
diff --git a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
799
index 3ea2d0b..77c6d9d 100644
800
--- a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
801
+++ b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
802
@@ -33,11 +33,11 @@ TEST_F(ParticleDistributionTest, mainParameterUnits)
803
     Material mat = HomogeneousMaterial("Air", 0.0, 0.0);
804
     DistributionGate gate(1.0, 2.0);
805
 
806
-    ParameterDistribution par("/Particle/FullSphere/Radius", gate, 5);
807
+    ParameterDistribution par("/Particle/FullSphere/Radius[nm]", gate, 5);
808
     ParticleDistribution distr(Particle(mat, FormFactorFullSphere(1.0)), par);
809
     EXPECT_EQ(ParameterUtils::mainParUnits(distr), BornAgain::UnitsNm);
810
 
811
-    par = ParameterDistribution("/Particle/Cone/Alpha", gate, 5);
812
+    par = ParameterDistribution("/Particle/Cone/Alpha[deg]", gate, 5);
813
     ParticleDistribution distr2(Particle(mat, FormFactorCone(10.0, 20.0, 70.0 * Units::deg)), par);
814
     EXPECT_EQ(ParameterUtils::mainParUnits(distr2), BornAgain::UnitsRad);
815
 }