Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
54ec19b3
Commit
54ec19b3
authored
7 years ago
by
LamarMoore
Committed by
Lamar Moore
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Updated codebase with new DateAndTime
parent
cd755fab
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Algorithms/src/CalculateCountRate.cpp
+2
-2
2 additions, 2 deletions
Framework/Algorithms/src/CalculateCountRate.cpp
Framework/DataObjects/inc/MantidDataObjects/Events.h
+2
-3
2 additions, 3 deletions
Framework/DataObjects/inc/MantidDataObjects/Events.h
with
4 additions
and
5 deletions
Framework/Algorithms/src/CalculateCountRate.cpp
+
2
−
2
View file @
54ec19b3
...
...
@@ -269,8 +269,8 @@ void CalculateCountRate::calcRateLog(
double
dt
=
(
dTRangeMax
-
dTRangeMin
)
/
static_cast
<
double
>
(
m_numLogSteps
);
auto
t0
=
m_TRangeMin
.
totalNanoseconds
();
for
(
auto
i
=
0
;
i
<
m_numLogSteps
;
i
++
)
{
times
[
i
]
=
Mantid
::
Types
::
DateAndTime
(
t0
+
static_cast
<
int64_t
>
((
0.5
+
double
(
i
))
*
dt
));
times
[
i
]
=
Mantid
::
Types
::
DateAndTime
(
t0
+
static_cast
<
int64_t
>
((
0.5
+
double
(
i
))
*
dt
));
}
// store calculated values within the target log.
targLog
->
replaceValues
(
times
,
countRate
);
...
...
This diff is collapsed.
Click to expand it.
Framework/DataObjects/inc/MantidDataObjects/Events.h
+
2
−
3
View file @
54ec19b3
...
...
@@ -6,6 +6,7 @@
#endif
#include
"MantidAPI/MatrixWorkspace_fwd.h"
// get MantidVec declaration
#include
"MantidKernel/System.h"
#include
"MantidTypes/DateAndTime.h"
#include
"MantidKernel/TimeSplitter.h"
#include
"MantidKernel/cow_ptr.h"
#include
"MantidTypes/DateAndTime.h"
...
...
@@ -181,9 +182,7 @@ inline double WeightedEventNoTime::tof() const { return m_tof; }
/** Return the pulse time; this returns 0 since this
* type of Event has no time associated.
*/
inline
Mantid
::
Types
::
DateAndTime
WeightedEventNoTime
::
pulseTime
()
const
{
return
0
;
}
inline
Mantid
::
Types
::
DateAndTime
WeightedEventNoTime
::
pulseTime
()
const
{
return
0
;
}
/// Return the weight of the neutron, as a double (it is saved as a float).
inline
double
WeightedEventNoTime
::
weight
()
const
{
return
m_weight
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment