Moved themis, mms to projects

.github/workflows/pythonpackage.yml

@@ -33,7 +33,7 @@ jobs:
           pip install coveralls
           pip install basemap
           pip install mth5
-          python -m pyspedas.mms.tests.setup_tests
+          python -m pyspedas.projects.mms.tests.setup_tests
       if: matrix.os == 'ubuntu-latest'
     - name: Install dependencies (Windows)
       env:
@@ -47,7 +47,7 @@ jobs:
           pip install coveralls
           pip install basemap
           pip install mth5
-          python -m pyspedas.mms.tests.setup_tests
+          python -m pyspedas.projects.mms.tests.setup_tests
       if: matrix.os == 'windows-latest'
     - name: Install dependencies (macOS)
       env:
@@ -61,7 +61,7 @@ jobs:
           pip install coveralls
           pip install basemap
           pip install mth5
-          python -m pyspedas.mms.tests.setup_tests
+          python -m pyspedas.projects.mms.tests.setup_tests
       if: matrix.os == 'macos-latest'
     - name: Lint with flake8
       run: |
@@ -193,37 +193,37 @@ jobs:
         echo Starting particles tests at `date`
         coverage run -a -m pyspedas.particles.tests.tests
         echo Starting mms cotrans tests at `date`
-        coverage run -a -m pyspedas.mms.tests.cotrans
+        coverage run -a -m pyspedas.projects.mms.tests.cotrans
         echo Starting mms events tests at `date`
-        coverage run -a -m pyspedas.mms.tests.events
+        coverage run -a -m pyspedas.projects.mms.tests.events
         echo Starting mms orbit_plots tests at `date`
-        coverage run -a -m pyspedas.mms.tests.orbit_plots
+        coverage run -a -m pyspedas.projects.mms.tests.orbit_plots
         echo Starting mms overview_plots tests at `date`
-        coverage run -a -m pyspedas.mms.tests.overview_plots
+        coverage run -a -m pyspedas.projects.mms.tests.overview_plots
         echo Starting mms neutral sheet tests at `date`
-        coverage run -a -m pyspedas.mms.tests.neutral_sheet
+        coverage run -a -m pyspedas.projects.mms.tests.neutral_sheet
         echo Starting mms ql_lib_sitl tests at `date`
-        coverage run -a -m pyspedas.mms.tests.ql_l1b_sitl_tests
+        coverage run -a -m pyspedas.projects.mms.tests.ql_l1b_sitl_tests
         echo Starting mms_part_getspec tests at `date`
-        coverage run -a -m pyspedas.mms.tests.mms_part_getspec
+        coverage run -a -m pyspedas.projects.mms.tests.mms_part_getspec
         echo Starting mms load routine tests at `date`
-        coverage run -a -m pyspedas.mms.tests.load_routine_tests
+        coverage run -a -m pyspedas.projects.mms.tests.load_routine_tests
         echo Starting mms feeps tests at `date`
-        coverage run -a -m pyspedas.mms.tests.feeps
+        coverage run -a -m pyspedas.projects.mms.tests.feeps
         echo Starting mms eis tests at `date`
-        coverage run -a -m pyspedas.mms.tests.eis
+        coverage run -a -m pyspedas.projects.mms.tests.eis
         echo Starting mms fpi tests at `date`
-        coverage run -a -m pyspedas.mms.tests.fpi_tests
+        coverage run -a -m pyspedas.projects.mms.tests.fpi_tests
         echo Starting mms file_filter tests at `date`
-        coverage run -a -m pyspedas.mms.tests.file_filter
+        coverage run -a -m pyspedas.projects.mms.tests.file_filter
         echo Starting mms data_rate_segments tests at `date`
-        coverage run -a -m pyspedas.mms.tests.data_rate_segments
+        coverage run -a -m pyspedas.projects.mms.tests.data_rate_segments
         echo Starting mms curlometer tests at `date`
-        coverage run -a -m pyspedas.mms.tests.curlometer
+        coverage run -a -m pyspedas.projects.mms.tests.curlometer
         echo Starting mms wavpol tests at `date`
-        coverage run -a -m pyspedas.mms.tests.wavpol
+        coverage run -a -m pyspedas.projects.mms.tests.wavpol
         echo Starting mms slice2d tests at `date`
-        coverage run -a -m pyspedas.mms.tests.slice2d
+        coverage run -a -m pyspedas.projects.mms.tests.slice2d
         echo "========================================================="
         # Show the free disk space on this filesystem
         echo "Disk space after MMS tests:"
@@ -288,7 +288,7 @@ jobs:
         echo Starting omni tests at `date`
         coverage run -a -m pyspedas.projects.omni.tests.tests
         echo Starting themis tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests
+        coverage run -a -m pyspedas.projects.themis.tests.tests
         echo Starting goes tests at `date`
         coverage run -a -m pyspedas.projects.goes.tests.tests
         echo Starting mica tests at `date`
@@ -302,21 +302,21 @@ jobs:
         echo Starting swarm tests at `date`
         coverage run -a -m pyspedas.projects.swarm.tests.tests
         echo Starting themis_check_args tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests_themis_check_args
+        coverage run -a -m pyspedas.projects.themis.tests.tests_themis_check_args
         echo Starting themis autoload support tests at `date`
-        coverage run -a -m pyspedas.themis.tests.autoload_support_tests
+        coverage run -a -m pyspedas.projects.themis.tests.autoload_support_tests
         echo Starting themis cal_fit tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests_cal_fit
+        coverage run -a -m pyspedas.projects.themis.tests.tests_cal_fit
         echo Starting themis dsl_cotrans tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests_dsl_cotrans
+        coverage run -a -m pyspedas.projects.themis.tests.tests_dsl_cotrans
         echo Starting themis lunar_cotrans tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests_lunar_cotrans
+        coverage run -a -m pyspedas.projects.themis.tests.tests_lunar_cotrans
         echo Starting themis spinmodel tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests_spinmodel
+        coverage run -a -m pyspedas.projects.themis.tests.tests_spinmodel
         echo Starting themis state tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests_state
+        coverage run -a -m pyspedas.projects.themis.tests.tests_state
         echo Starting themis scpot2dens tests at `date`
-        coverage run -a -m pyspedas.themis.tests.tests_scpot2dens
+        coverage run -a -m pyspedas.projects.themis.tests.tests_scpot2dens
         echo "========================================================="
         # Show the free disk space on this filesystem
         echo "Disk space after all tests:"

pyspedas/__init__.py

@@ -67,19 +67,19 @@
 from .projects import omni
 
 # Import routine names with mission prefixes into pyspedas namespace
-from .mms import mms_load_mec, mms_load_fgm, mms_load_scm, mms_load_edi, \
+from .projects.mms import mms_load_mec, mms_load_fgm, mms_load_scm, mms_load_edi, \
     mms_load_edp, mms_load_eis, mms_load_feeps, \
     mms_load_hpca, mms_load_fpi, mms_load_aspoc, \
     mms_load_dsp, mms_load_fsm, mms_load_state, \
     mms_qcotrans, mms_cotrans_lmn, mms_cotrans_qrotate, mms_cotrans_qtransformer
-from .mms.feeps.mms_feeps_pad import mms_feeps_pad
-from .mms.feeps.mms_feeps_gpd import mms_feeps_gpd
-from .mms.eis.mms_eis_pad import mms_eis_pad
-from .mms.hpca.mms_hpca_calc_anodes import mms_hpca_calc_anodes
-from .mms.hpca.mms_hpca_spin_sum import mms_hpca_spin_sum
-from .mms.plots.mms_overview_plot import mms_overview_plot
-from .mms.particles.mms_part_getspec import mms_part_getspec
-from .mms.particles.mms_part_slice2d import mms_part_slice2d
+from .projects.mms.feeps.mms_feeps_pad import mms_feeps_pad
+from .projects.mms.feeps.mms_feeps_gpd import mms_feeps_gpd
+from .projects.mms.eis.mms_eis_pad import mms_eis_pad
+from .projects.mms.hpca.mms_hpca_calc_anodes import mms_hpca_calc_anodes
+from .projects.mms.hpca.mms_hpca_spin_sum import mms_hpca_spin_sum
+from .projects.mms.plots.mms_overview_plot import mms_overview_plot
+from .projects.mms.particles.mms_part_getspec import mms_part_getspec
+from .projects.mms.particles.mms_part_slice2d import mms_part_slice2d
 
 # Make mission-specific namespaces available under pyspedas
 from .projects import ace
@@ -106,8 +106,8 @@
 # for backward compatibility
 from .projects.maven import maven_load
 from .projects import mica
+from .projects import mms
 from .projects import noaa
-
 from .projects import poes
 from .projects import polar
 from .projects import psp
@@ -118,7 +118,7 @@
 from .projects import st5
 from .projects import stereo
 from .projects import swarm
-from . import themis
+from .projects import themis
 from .projects import twins
 from .projects import ulysses
 from . import vires

pyspedas/analysis/tests/test_twavpol.py

@@ -20,7 +20,7 @@ def setUpClass(cls):
         The SPEDAS script that creates the file: projects/themis/state/cotrans/thm_cotrans_validate.pro
         """
         from pyspedas.utilities.download import download
-        from pyspedas.themis.config import CONFIG
+        from pyspedas.projects.themis.config import CONFIG
 
         # Testing tolerance
         cls.tol = 1e-10

pyspedas/analysis/tests/tests.py

@@ -209,7 +209,7 @@ def test_deriv_data(self):
         self.assertTrue((d[1] == [2., 2.5, 5.,   6., -7., -19.]).all())
 
     def test_tvectot(self):
-        from pyspedas.themis import state
+        from pyspedas.projects.themis import state
         from pytplot import data_exists
         state(probe='a')
         tvectot('tha_pos', join_component=True)

pyspedas/cotrans/tests/cotrans.py

@@ -12,7 +12,7 @@
 import unittest
 import pyspedas
 import logging
-from pyspedas.themis.cotrans.dsl2gse import dsl2gse
+from pyspedas.projects.themis.cotrans.dsl2gse import dsl2gse
 from pyspedas.cotrans.cotrans import cotrans
 from pyspedas.cotrans.fac_matrix_make import fac_matrix_make
 from pytplot import get_data, store_data, del_data

pyspedas/geopack/tests/geopack_idl_validation_tests.py

@@ -52,7 +52,7 @@ def setUpClass(cls):
         The SPEDAS script that creates the file: projects/themis/state/cotrans/thm_cotrans_validate.pro
         """
         from pyspedas.utilities.download import download
-        from pyspedas.themis.config import CONFIG
+        from pyspedas.projects.themis.config import CONFIG
 
         # Testing time range
         cls.t = ['2008-03-23', '2008-03-28']

pyspedas/projects/kyoto/load_geomagnetic_indices.py

@@ -1,7 +1,7 @@
 import logging
 from .load_dst import dst as load_dst
 from .load_ae import load_ae
-from pyspedas.themis.ground.gmag import gmag as thm_gmag
+from pyspedas.projects.themis.ground.gmag import gmag as thm_gmag
 from pyspedas.projects.noaa.noaa_load_kp import noaa_load_kp
 from pyspedas.projects.omni import data as omni_load
 from pytplot import time_clip as tclip

pyspedas/mms/aspoc/aspoc.py → pyspedas/projects/mms/aspoc/aspoc.py

@@ -1,4 +1,4 @@
-from pyspedas.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.mms_load_data import mms_load_data
 
 
 def mms_load_aspoc(trange=['2015-10-16', '2015-10-17'], probe='1', data_rate='srvy', 

pyspedas/mms/cotrans/mms_cotrans_lmn.py → pyspedas/projects/mms/cotrans/mms_cotrans_lmn.py

@@ -12,7 +12,7 @@
 # For some reason, the import below started picking up the module mec, rather than the wrapper mec() defined in mms/__init__.py.
 # Importing it as pyspedas.mms.mec seems to remove the ambiguity, but I wonder if something fishy is going on
 # with the imports in pyspedas, mms, and mms.mec.
-#from pyspedas.mms import mec
+#from pyspedas.projects.mms import mec
 
 logging.captureWarnings(True)
 logging.basicConfig(format='%(asctime)s: %(message)s', datefmt='%d-%b-%y %H:%M:%S', level=logging.INFO)

pyspedas/mms/dsp/dsp.py → pyspedas/projects/mms/dsp/dsp.py

@@ -1,6 +1,6 @@
-from pyspedas.mms.mms_load_data import mms_load_data
-from pyspedas.mms.dsp.mms_dsp_set_metadata import mms_dsp_set_metadata
-from pyspedas.mms.mms_config import CONFIG
+from pyspedas.projects.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.dsp.mms_dsp_set_metadata import mms_dsp_set_metadata
+from pyspedas.projects.mms.mms_config import CONFIG
 
 
 

pyspedas/mms/edi/edi.py → pyspedas/projects/mms/edi/edi.py

@@ -1,6 +1,6 @@
-from pyspedas.mms.mms_load_data import mms_load_data
-from pyspedas.mms.edi.mms_edi_set_metadata import mms_edi_set_metadata
-from pyspedas.mms.mms_config import CONFIG
+from pyspedas.projects.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.edi.mms_edi_set_metadata import mms_edi_set_metadata
+from pyspedas.projects.mms.mms_config import CONFIG
 
 
 

pyspedas/mms/edp/edp.py → pyspedas/projects/mms/edp/edp.py

@@ -1,6 +1,6 @@
-from pyspedas.mms.mms_load_data import mms_load_data
-from pyspedas.mms.edp.mms_edp_set_metadata import mms_edp_set_metadata
-from pyspedas.mms.mms_config import CONFIG
+from pyspedas.projects.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.edp.mms_edp_set_metadata import mms_edp_set_metadata
+from pyspedas.projects.mms.mms_config import CONFIG
 
 
 

pyspedas/mms/eis/eis.py → pyspedas/projects/mms/eis/eis.py

@@ -1,8 +1,8 @@
-from pyspedas.mms.mms_load_data import mms_load_data
-from pyspedas.mms.eis.mms_eis_omni import mms_eis_omni
-from pyspedas.mms.eis.mms_eis_spin_avg import mms_eis_spin_avg
-from pyspedas.mms.eis.mms_eis_set_metadata import mms_eis_set_metadata
-from pyspedas.mms.mms_config import CONFIG
+from pyspedas.projects.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.eis.mms_eis_omni import mms_eis_omni
+from pyspedas.projects.mms.eis.mms_eis_spin_avg import mms_eis_spin_avg
+from pyspedas.projects.mms.eis.mms_eis_set_metadata import mms_eis_set_metadata
+from pyspedas.projects.mms.mms_config import CONFIG
 from pytplot import tnames
 
 

pyspedas/mms/eis/mms_eis_pad.py → pyspedas/projects/mms/eis/mms_eis_pad.py

@@ -3,7 +3,7 @@
 import numpy as np
 from pytplot import tnames
 from pytplot import get_data, store_data, options
-from pyspedas.mms.eis.mms_eis_pad_spinavg import mms_eis_pad_spinavg
+from pyspedas.projects.mms.eis.mms_eis_pad_spinavg import mms_eis_pad_spinavg
 
 # use nanmean from bottleneck if it's installed, otherwise use the numpy one
 # bottleneck nanmean is ~2.5x faster

pyspedas/mms/feeps/feeps.py → pyspedas/projects/mms/feeps/feeps.py

@@ -1,13 +1,13 @@
-from pyspedas.mms.mms_load_data import mms_load_data
-from pyspedas.mms.feeps.mms_feeps_correct_energies import mms_feeps_correct_energies
-from pyspedas.mms.feeps.mms_feeps_flat_field_corrections import mms_feeps_flat_field_corrections
-from pyspedas.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
-from pyspedas.mms.feeps.mms_feeps_split_integral_ch import mms_feeps_split_integral_ch
-from pyspedas.mms.feeps.mms_feeps_remove_bad_data import mms_feeps_remove_bad_data
-from pyspedas.mms.feeps.mms_feeps_remove_sun import mms_feeps_remove_sun
-from pyspedas.mms.feeps.mms_feeps_omni import mms_feeps_omni
-from pyspedas.mms.feeps.mms_feeps_spin_avg import mms_feeps_spin_avg
-from pyspedas.mms.mms_config import CONFIG
+from pyspedas.projects.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.feeps.mms_feeps_correct_energies import mms_feeps_correct_energies
+from pyspedas.projects.mms.feeps.mms_feeps_flat_field_corrections import mms_feeps_flat_field_corrections
+from pyspedas.projects.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
+from pyspedas.projects.mms.feeps.mms_feeps_split_integral_ch import mms_feeps_split_integral_ch
+from pyspedas.projects.mms.feeps.mms_feeps_remove_bad_data import mms_feeps_remove_bad_data
+from pyspedas.projects.mms.feeps.mms_feeps_remove_sun import mms_feeps_remove_sun
+from pyspedas.projects.mms.feeps.mms_feeps_omni import mms_feeps_omni
+from pyspedas.projects.mms.feeps.mms_feeps_spin_avg import mms_feeps_spin_avg
+from pyspedas.projects.mms.mms_config import CONFIG
 from pytplot import time_clip as tclip
 
 def recvary_log_filter(log):

pyspedas/mms/feeps/mms_feeps_getgyrophase.py → pyspedas/projects/mms/feeps/mms_feeps_getgyrophase.py

@@ -1,7 +1,8 @@
 import logging
 import numpy as np
-from pyspedas import mms, tinterpol
-from pyspedas.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
+from pyspedas.projects import mms
+from pyspedas import tinterpol
+from pyspedas.projects.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
 from pytplot import get, store, options, time_double
 
 

pyspedas/mms/feeps/mms_feeps_gpd.py → pyspedas/projects/mms/feeps/mms_feeps_gpd.py

@@ -2,8 +2,8 @@
 import numpy as np
 import pyspedas 
 from pytplot import get, store, options
-from pyspedas.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
-from pyspedas.mms.feeps.mms_feeps_getgyrophase import mms_feeps_getgyrophase
+from pyspedas.projects.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
+from pyspedas.projects.mms.feeps.mms_feeps_getgyrophase import mms_feeps_getgyrophase
 
 # use nanmean from bottleneck if it's installed, otherwise use the numpy one
 # bottleneck nanmean is ~2.5x faster

pyspedas/mms/feeps/mms_feeps_pad.py → pyspedas/projects/mms/feeps/mms_feeps_pad.py

@@ -2,9 +2,9 @@
 import warnings
 import numpy as np
 from pytplot import get, store, options
-from pyspedas.mms.feeps.mms_feeps_pitch_angles import mms_feeps_pitch_angles
-from pyspedas.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
-from pyspedas.mms.feeps.mms_feeps_pad_spinavg import mms_feeps_pad_spinavg
+from pyspedas.projects.mms.feeps.mms_feeps_pitch_angles import mms_feeps_pitch_angles
+from pyspedas.projects.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
+from pyspedas.projects.mms.feeps.mms_feeps_pad_spinavg import mms_feeps_pad_spinavg
 
 # use nanmean from bottleneck if it's installed, otherwise use the numpy one
 # bottleneck nanmean is ~2.5x faster

pyspedas/mms/feeps/mms_feeps_pitch_angles.py → pyspedas/projects/mms/feeps/mms_feeps_pitch_angles.py

@@ -1,5 +1,5 @@
 import logging
-from pyspedas.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
+from pyspedas.projects.mms.feeps.mms_feeps_active_eyes import mms_feeps_active_eyes
 from pyspedas import mms_load_fgm
 from pytplot import data_exists
 from pytplot import get, store

pyspedas/mms/fgm/fgm.py → pyspedas/projects/mms/fgm/fgm.py

@@ -1,9 +1,9 @@
 import re
-from pyspedas.mms.mms_load_data import mms_load_data
-from pyspedas.mms.fgm.mms_fgm_remove_flags import mms_fgm_remove_flags
-from pyspedas.mms.fgm.mms_fgm_set_metadata import mms_fgm_set_metadata
-from pyspedas.mms.fgm.mms_split_fgm_data import mms_split_fgm_data
-from pyspedas.mms.mms_config import CONFIG
+from pyspedas.projects.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.fgm.mms_fgm_remove_flags import mms_fgm_remove_flags
+from pyspedas.projects.mms.fgm.mms_fgm_set_metadata import mms_fgm_set_metadata
+from pyspedas.projects.mms.fgm.mms_split_fgm_data import mms_split_fgm_data
+from pyspedas.projects.mms.mms_config import CONFIG
 from pytplot import data_exists
 from pytplot import del_data
 

pyspedas/mms/fpi/fpi.py → pyspedas/projects/mms/fpi/fpi.py

@@ -1,9 +1,9 @@
-from pyspedas.mms.mms_load_data import mms_load_data
-from pyspedas.mms.fpi.mms_fpi_set_metadata import mms_fpi_set_metadata
-from pyspedas.mms.fpi.mms_load_fpi_calc_pad import mms_load_fpi_calc_pad
-from pyspedas.mms.fpi.mms_fpi_make_compressionlossbars import mms_fpi_make_compressionlossbars
-from pyspedas.mms.fpi.mms_fpi_make_errorflagbars import mms_fpi_make_errorflagbars
-from pyspedas.mms.mms_config import CONFIG
+from pyspedas.projects.mms.mms_load_data import mms_load_data
+from pyspedas.projects.mms.fpi.mms_fpi_set_metadata import mms_fpi_set_metadata
+from pyspedas.projects.mms.fpi.mms_load_fpi_calc_pad import mms_load_fpi_calc_pad
+from pyspedas.projects.mms.fpi.mms_fpi_make_compressionlossbars import mms_fpi_make_compressionlossbars
+from pyspedas.projects.mms.fpi.mms_fpi_make_errorflagbars import mms_fpi_make_errorflagbars
+from pyspedas.projects.mms.mms_config import CONFIG
 from pytplot import tplot_rename, del_data
 
 

pyspedas/mms/fpi/mms_fpi_ang_ang.py → pyspedas/projects/mms/fpi/mms_fpi_ang_ang.py

@@ -6,8 +6,8 @@
 from pytplot import get_data
 import pyspedas
 from pyspedas import time_double
-from pyspedas.mms.fpi.mms_get_fpi_dist import mms_get_fpi_dist
-from pyspedas.mms.fpi.mms_pad_fpi import mms_pad_fpi
+from pyspedas.projects.mms.fpi.mms_get_fpi_dist import mms_get_fpi_dist
+from pyspedas.projects.mms.fpi.mms_pad_fpi import mms_pad_fpi
 
 
 def mms_fpi_ang_ang(

pyspedas/mms/fpi/mms_pad_fpi.py → pyspedas/projects/mms/fpi/mms_pad_fpi.py

@@ -8,7 +8,7 @@
 from pyspedas.particles.spd_slice2d.slice2d_get_support import slice2d_get_support
 from pyspedas.particles.spd_slice2d.slice2d_s2c import slice2d_s2c
 from pyspedas.particles.spd_slice2d.tplot_average import tplot_average
-from pyspedas.mms.particles.moka_mms_clean_data import moka_mms_clean_data
+from pyspedas.projects.mms.particles.moka_mms_clean_data import moka_mms_clean_data
 
 
 def mms_pad_fpi(dists,