Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
aa9baa39
Commit
aa9baa39
authored
Mar 20, 2013
by
Zhou, Wenduo
Browse files
Fix windows DLL and doxygen. Refs #6746.
parent
15f4967f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Code/Mantid/Framework/Kernel/inc/MantidKernel/Statistics.h
View file @
aa9baa39
...
...
@@ -63,7 +63,7 @@ namespace Mantid
template
<
typename
TYPE
>
std
::
vector
<
double
>
getModifiedZscore
(
const
std
::
vector
<
TYPE
>&
data
,
const
bool
sorted
=
false
);
/// Return the R-factors (Rwp) of a diffraction pattern data
double
getRFactor
(
const
std
::
vector
<
double
>&
obsI
,
const
std
::
vector
<
double
>&
calI
,
const
std
::
vector
<
double
>&
obsE
);
double
MANTID_KERNEL_DLL
getRFactor
(
const
std
::
vector
<
double
>&
obsI
,
const
std
::
vector
<
double
>&
calI
,
const
std
::
vector
<
double
>&
obsE
);
}
// namespace Kernel
}
// namespace Mantid
...
...
Code/Mantid/Framework/Kernel/src/Statistics.cpp
View file @
aa9baa39
...
...
@@ -217,11 +217,13 @@ namespace Mantid
}
/** Return the Rwp of a diffraction pattern data
* @param obsY :: array of observed intensity values
* @param calY :: array of calculated intensity values;
* @param obsI :: array of observed intensity values
* @param calI :: array of calculated intensity values;
* @param obsE :: array of error of the observed data;
* @return :: Rwp
*
*/
DLLExport
double
getRFactor
(
const
std
::
vector
<
double
>&
obsI
,
const
std
::
vector
<
double
>&
calI
,
const
std
::
vector
<
double
>&
obsE
)
double
getRFactor
(
const
std
::
vector
<
double
>&
obsI
,
const
std
::
vector
<
double
>&
calI
,
const
std
::
vector
<
double
>&
obsE
)
{
// 1. Check
if
(
obsI
.
size
()
!=
calI
.
size
()
||
obsI
.
size
()
!=
obsE
.
size
())
...
...
Code/Mantid/Framework/Kernel/test/StatisticsTest.h
View file @
aa9baa39
...
...
@@ -148,42 +148,3 @@ public:
};
#endif // STATISTICSTEST_H_
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment