Mag l1a processing #384
Merged
Mag l1a processing #384
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maxinelasp
requested review from
bourque,
sdhoyt,
greglucas,
tech3371,
vmartinez-cu and
laspsandoval
and removed request for
a team
greglucas
approved these changes
Apr 1, 2024
Comment on lines
121
to
129
| sample_time_interval = 1 / self.vectors_per_second | ||
| previous_time = self.start_time | ||
| for index, vector in enumerate(self.vectors): | ||
| if index == 0: | ||
| new_vector = Vector(vector, self.start_time) | ||
| else: | ||
| new_vector = Vector(vector, previous_time + sample_time_interval) | ||
|
|
||
| previous_time = new_vector.timestamp |
There was a problem hiding this comment.
I think this can be simplified a bit by updating the time at the end of your loop iteration.
Suggested change
| sample_time_interval = 1 / self.vectors_per_second | |
| previous_time = self.start_time | |
| for index, vector in enumerate(self.vectors): | |
| if index == 0: | |
| new_vector = Vector(vector, self.start_time) | |
| else: | |
| new_vector = Vector(vector, previous_time + sample_time_interval) | |
| previous_time = new_vector.timestamp | |
| sample_time_interval = 1 / self.vectors_per_second | |
| current_time = self.start_time | |
| for index, vector in enumerate(self.vectors): | |
| new_vector = Vector(vector, current_time) | |
| # Increment our time counter before the next iteration | |
| current_time = new_vector.timestamp + sample_time_interval |
There was a problem hiding this comment.
Nice, that's way better
Comment on lines
+179
to
+188
| if i % 4 == 0: # start at bit 0, take 8 bits + 8bits | ||
| # pos = 0, 25, 50... | ||
| x = ( | ||
| ((vector_data[pos + 0] & 0xFF) << 8) | ||
| | ((vector_data[pos + 1] & 0xFF) << 0) | ||
| ) & 0xFFFF | ||
| y = ( | ||
| ((vector_data[pos + 2] & 0xFF) << 8) | ||
| | ((vector_data[pos + 3] & 0xFF) << 0) | ||
| ) & 0xFFFF | ||
| z = ( | ||
| ((vector_data[pos + 4] & 0xFF) << 8) | ||
| | ((vector_data[pos + 5] & 0xFF) << 0) | ||
| ) & 0xFFFF | ||
| rng = (vector_data[pos + 6] >> 6) & 0x3 | ||
| pos += 6 |
There was a problem hiding this comment.
Again minor (and I realize you got this from elsewhere), but I would probably write this with variables being parameterized and then used in the lookups a single time to try and avoid the duplication of those lookups. No need to change here unless you like this form better.
if i % 4 == 0:
left_mask = 0xFF
left_shift = 0
elif i % 4 == 1:
left_mask = 0x3F
left_shift = 2
...
x = ((vector_data[pos + 0] & left_mask) << (left_shift + 8))
| (vector_data[pos + 1] & 0xFF) << left_shift))
& 0xFFFF
|
pre-commit.ci autofix |
for more information, see https://pre-commit.ci
tech3371
approved these changes
Apr 4, 2024
| # byte boundaries are. | ||
|
|
||
| # VECSEC is already decoded in mag_l0 | ||
| total_primary_vectors = seconds_per_packet * mag_l0.PRI_VECSEC |
There was a problem hiding this comment.
love these descriptive variable names! Makes it easy to follow
| ---------- | ||
| vector_data : np.ndarray | ||
| Raw vector data, in bytes. Contains both primary and secondary vector data | ||
| (first primary, then secondary) |
| # chunk corresponds to 3 16 bit signed integers. The last 2 bits are the sensor | ||
| # range. | ||
|
|
||
| for i in range(primary_count + secondary_count): # 0..63 say |
maxinelasp
merged commit acd380d
into
IMAP-Science-Operations-Center:dev
15 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change Summary
Finishing MAG L1A processing, including creating vectors and timestamping them. This still needs some work on the timestamps (they're still in spacecraft time and should be in J2000) and some CDF generation work.
Overview
Data classes are in mag_l1a_data. L1A processing is in mag_l1a_data and mag_l1a. I refactored some earlier work to split up normal and burst mode upon packet read, as these packets are not mixed together again and it makes the code cleaner. And moved from bytearray to numpy array in early L1a processing.
New Dependencies
None
New Files
Updated Files
Testing
Added new tests for L1A, primarily using validation data provided by MAG. I plan to go back and add one more byte-processing test.