Skip to content

Change members of EventList from value to unique_ptr #38108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Change members of EventList from value to unique_ptr #38108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c51fc5b
Change members from value to unique_ptr
peterfpeterson Sep 30, 2024
4a9a046
Merge remote-tracking branch 'upstream/main' into event_unique_ptr
peterfpeterson Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Framework/DataObjects/inc/MantidDataObjects/EventList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,9 @@ class MANTID_DATAOBJECTS_DLL EventList : public Mantid::API::IEventList {
* @param event :: TofEvent to add at the end of the list.
* */
inline void addEventQuickly(const Types::Event::TofEvent &event) {
this->events.emplace_back(event);
this->setSortOrder(UNSORTED);
this->events->emplace_back(event);
if (this->order != UNSORTED)
this->setSortOrder(UNSORTED);
}

// --------------------------------------------------------------------------
Expand All @@ -112,8 +113,9 @@ class MANTID_DATAOBJECTS_DLL EventList : public Mantid::API::IEventList {
* @param event :: WeightedEvent to add at the end of the list.
* */
inline void addEventQuickly(const WeightedEvent &event) {
this->weightedEvents.emplace_back(event);
this->setSortOrder(UNSORTED);
this->weightedEvents->emplace_back(event);
if (this->order != UNSORTED)
this->setSortOrder(UNSORTED);
}

// --------------------------------------------------------------------------
Expand All @@ -122,8 +124,9 @@ class MANTID_DATAOBJECTS_DLL EventList : public Mantid::API::IEventList {
* @param event :: WeightedEventNoTime to add at the end of the list.
* */
inline void addEventQuickly(const WeightedEventNoTime &event) {
this->weightedEventsNoTime.emplace_back(event);
this->setSortOrder(UNSORTED);
this->weightedEventsNoTime->emplace_back(event);
if (this->order != UNSORTED)
this->setSortOrder(UNSORTED);
}

Mantid::API::EventType getEventType() const override;
Expand Down Expand Up @@ -326,13 +329,13 @@ class MANTID_DATAOBJECTS_DLL EventList : public Mantid::API::IEventList {
HistogramData::Histogram m_histogram;

/// List of TofEvent (no weights).
mutable std::vector<Types::Event::TofEvent> events;
mutable std::unique_ptr<std::vector<Types::Event::TofEvent>> events;

/// List of WeightedEvent's
mutable std::vector<WeightedEvent> weightedEvents;
mutable std::unique_ptr<std::vector<WeightedEvent>> weightedEvents;

/// List of WeightedEvent's
mutable std::vector<WeightedEventNoTime> weightedEventsNoTime;
mutable std::unique_ptr<std::vector<WeightedEventNoTime>> weightedEventsNoTime;

/// What type of event is in our list.
Mantid::API::EventType eventType;
Expand Down
Loading
Loading