Skip to content
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.

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

Some updates for ERG #194

Merged
merged 3 commits into from Aug 10, 2022
Merged

Some updates for ERG #194

merged 3 commits into from Aug 10, 2022

Conversation

horit
Copy link
Collaborator

@horit horit commented Aug 4, 2022

Could you merge ERG-related scripts from the "erg" branch? The updates include:

  • Minor bug fixes for load routines for some particle data
  • Initial import of load routines for ground observation data
  • An experimental version of part_products routines for ERG satellite data

And could you discard the "ergsc-devel" branch? At first I tried to merge the above updates to the old branch, but failed, due to an unknown error with analysis/time_domain_filter.py. That is why I have instead created a new branch "erg" from the master and put all the updates in it. Any future updates for the ERG module would be delivered through this new branch.

@ericthewizard ericthewizard merged commit 66d9375 into master Aug 10, 2022
@ericthewizard
Copy link
Collaborator

ericthewizard commented Aug 10, 2022

Thanks - merged!

I think that the particle *_get_dist routines are returning a slightly older definition of the particle data structure; as I implemented the 2D slices routines (last few months), I changed the data structure slightly for both 2D slices and the get_spec routines - the difference is that these functions should return a list of particle data structures (a list of hash tables) now (one at each measurement). Previously these returned a single hash table, with time varying data/bins/angles/energies (this was better for memory but led to problems as we had to keep track of every quantity that's time varying internally). Once these updates are made, I think both the get_spec and 2D slices routines should work.

Also - it looks like the ERG energy spectra routines are still using the 'jet' color map. We used this early on as a "close to IDL SPEDAS" color map - but since then, we've actually implemented the SPEDAS color map in pytplot as 'spedas'. I suggest updating the 'jet' to 'spedas' to be consistent with the rest of PySPEDAS; you can find them easily with:

https://github.com/spedas/pyspedas/search?q=jet

(or simply removing the options calls to set the color map, as the 'spedas' one is the default).

Thanks again!

@ericthewizard
Copy link
Collaborator

One more issue: it looks like the linter found a bug when I merged:

./pyspedas/erg/satellite/erg/particle/erg_hep_part_products.py:337:43: F821 undefined name 'made_et_spec'
if ('erg_lepe_' in in_tvarname) and (made_et_spec):
^
1 F821 undefined name 'made_et_spec'
1

@horit
Copy link
Collaborator Author

horit commented Aug 17, 2022

Thank you so much for the merging as well as the careful review of the code. I will make the necessary changes for the code in terms of the color map and the bug of erg_hep_part, once I go back to work next week. As for the particle data structure, let us take the time to modify and carefully test the particle code, before committing them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants