Skip to content

Commit 74e7886

Browse files
authored
Merge pull request #158 from ImperialCollegeLondon/fix/imap-event-load
fix: IMAP event load
2 parents 2b5b1b7 + 2f0d524 commit 74e7886

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MAG_DATA_VISUALIZATION_VERSION=7.7.0
1+
MAG_DATA_VISUALIZATION_VERSION=7.7.1

resources/release-notes.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
## App
1+
## Software
22

3-
- (HelioSwarm) Add HK plot
3+
- (IMAP) Events recorded before the start of a test are discarded
44

5-
## Software
5+
## Project
66

7-
- (All) Add support for showing multiple lines in a stacked plot
8-
- (All) Allow specifying `LegendOrientation` for axes that support legends
9-
- (HelioSwarm) Add support for `hs-mag` v2.0.0 artifacts
10-
- (IMAP) Fix issue in field view where events for a sensor with no data are still being shown
7+
- Update code analyzer configuration to 1.0.1 (remove regex for enumeration naming)

src/mission/imap/+mag/+imap/@Analysis/Analysis.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ function load(this)
161161

162162
this.Results = mag.imap.Instrument();
163163

164-
this.loadEventsData();
165-
166164
[primarySetup, secondarySetup] = this.loadMetadata();
167165

166+
this.loadEventsData();
167+
168168
this.loadScienceData(primarySetup, secondarySetup);
169169

170170
this.loadIALiRTData(primarySetup, secondarySetup);

src/mission/imap/+mag/+imap/@Analysis/loadEventsData.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,13 @@ function loadEventsData(this)
289289
end
290290
end
291291

292+
%% Amend Time Range
293+
294+
% Concentrate on recorded timerange.
295+
if ~isempty(this.Results.Metadata) && ~ismissing(this.Results.Metadata.Timestamp)
296+
events = events([events.Timestamp] > this.Results.Metadata.Timestamp);
297+
end
298+
292299
%% Assign Value
293300

294301
this.Results.Events = events;

src/mission/imap/+mag/+imap/@Analysis/loadHKData.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function loadHKData(this)
3131
end
3232
end
3333

34-
%% Amend Timerange
34+
%% Amend Time Range
3535

3636
% Concentrate on recorded timerange.
3737
if ~isempty(this.Results.Metadata) && ~ismissing(this.Results.Metadata.Timestamp)

0 commit comments

Comments
 (0)