From c67764b2f2d4f030e4703f87b336d74da89f079f Mon Sep 17 00:00:00 2001 From: jameswilburlewis Date: Thu, 29 Aug 2024 17:03:52 -0700 Subject: [PATCH] Importing shift from scipy.ndimage.interpolation is deprecated; replaced with import from scipy.ndimage --- pyspedas/particles/spd_part_products/spd_pgs_make_phi_spec.py | 2 +- pyspedas/particles/spd_part_products/spd_pgs_make_theta_spec.py | 2 +- .../erg/satellite/erg/particle/erg_pgs_make_phi_spec.py | 2 +- .../erg/satellite/erg/particle/erg_pgs_make_theta_spec.py | 2 +- pyspedas/projects/mms/fpi/mms_pad_fpi.py | 2 +- pyspedas/projects/mms/particles/mms_pgs_clean_data.py | 2 +- pyspedas/projects/mms/particles/moka_mms_clean_data.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyspedas/particles/spd_part_products/spd_pgs_make_phi_spec.py b/pyspedas/particles/spd_part_products/spd_pgs_make_phi_spec.py index ea1610f5..0774ebcd 100644 --- a/pyspedas/particles/spd_part_products/spd_pgs_make_phi_spec.py +++ b/pyspedas/particles/spd_part_products/spd_pgs_make_phi_spec.py @@ -1,7 +1,7 @@ import math import numpy as np -from scipy.ndimage.interpolation import shift +from scipy.ndimage import shift # use nansum from bottleneck if it's installed, otherwise use the numpy one try: diff --git a/pyspedas/particles/spd_part_products/spd_pgs_make_theta_spec.py b/pyspedas/particles/spd_part_products/spd_pgs_make_theta_spec.py index db03c35a..a792c16d 100644 --- a/pyspedas/particles/spd_part_products/spd_pgs_make_theta_spec.py +++ b/pyspedas/particles/spd_part_products/spd_pgs_make_theta_spec.py @@ -1,7 +1,7 @@ import math import numpy as np -from scipy.ndimage.interpolation import shift +from scipy.ndimage import shift # use nansum from bottleneck if it's installed, otherwise use the numpy one try: diff --git a/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_phi_spec.py b/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_phi_spec.py index 5bc532a2..52a297ce 100644 --- a/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_phi_spec.py +++ b/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_phi_spec.py @@ -1,7 +1,7 @@ import math import numpy as np -from scipy.ndimage.interpolation import shift +from scipy.ndimage import shift from copy import deepcopy diff --git a/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_theta_spec.py b/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_theta_spec.py index 7ee3f711..644d813d 100644 --- a/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_theta_spec.py +++ b/pyspedas/projects/erg/satellite/erg/particle/erg_pgs_make_theta_spec.py @@ -1,7 +1,7 @@ import math import numpy as np -from scipy.ndimage.interpolation import shift +from scipy.ndimage import shift from copy import deepcopy # use nansum from bottleneck if it's installed, otherwise use the numpy one diff --git a/pyspedas/projects/mms/fpi/mms_pad_fpi.py b/pyspedas/projects/mms/fpi/mms_pad_fpi.py index 3cc28268..ab06de4d 100644 --- a/pyspedas/projects/mms/fpi/mms_pad_fpi.py +++ b/pyspedas/projects/mms/fpi/mms_pad_fpi.py @@ -1,6 +1,6 @@ from copy import deepcopy import numpy as np -from scipy.ndimage.interpolation import shift +from scipy.ndimage import shift from scipy.constants import c as const_c from pyspedas import time_double from pyspedas.particles.spd_slice2d.slice2d_nearest import slice2d_nearest diff --git a/pyspedas/projects/mms/particles/mms_pgs_clean_data.py b/pyspedas/projects/mms/particles/mms_pgs_clean_data.py index 1036f635..c2b8f47d 100644 --- a/pyspedas/projects/mms/particles/mms_pgs_clean_data.py +++ b/pyspedas/projects/mms/particles/mms_pgs_clean_data.py @@ -1,5 +1,5 @@ import numpy as np -from scipy.ndimage.interpolation import shift +from scipy.ndimage import shift def mms_pgs_clean_data(data_in): diff --git a/pyspedas/projects/mms/particles/moka_mms_clean_data.py b/pyspedas/projects/mms/particles/moka_mms_clean_data.py index c2614714..c1ca9297 100644 --- a/pyspedas/projects/mms/particles/moka_mms_clean_data.py +++ b/pyspedas/projects/mms/particles/moka_mms_clean_data.py @@ -1,6 +1,6 @@ import logging import numpy as np -from scipy.ndimage.interpolation import shift +from scipy.ndimage import shift from pyspedas.projects.mms.particles.mms_convert_flux_units import mms_convert_flux_units