Skip to content

Commit 74a3f86

Browse files
committed
fix list flattening to be comp. with cdflib 1.3.3
1 parent 31a0e80 commit 74a3f86

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

seppy/tools/__init__.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2276,8 +2276,8 @@ def get_channel_energy_values(self, returns: str = "num") -> list:
22762276
p_identifier = "Ion_Bins_Text" if self.sensor == "ept" else "H_Bins_Text" if self.sensor == "het" else "Bins_Text"
22772277
energy_ranges = energy_dict[p_identifier]
22782278

2279-
# Each element in the list is also a list with len==1, so fix that
2280-
energy_ranges = [element[0] for element in energy_ranges]
2279+
# Each element in the list is also a list with len==1 for cdflib < 1.3.3, so fix that
2280+
energy_ranges = energy_ranges.flatten()
22812281

22822282
if self.spacecraft[:2] == "st":
22832283

@@ -2299,8 +2299,8 @@ def get_channel_energy_values(self, returns: str = "num") -> list:
22992299
else:
23002300
energy_ranges = energy_dict["Proton_Bins_Text"]
23012301

2302-
# Each element in the list is also a list with len==1, so fix that
2303-
energy_ranges = [element[0] for element in energy_ranges]
2302+
# Each element in the list is also a list with len==1 for cdflib < 1.3.3, so fix that
2303+
energy_ranges = energy_ranges.flatten()
23042304

23052305
if self.spacecraft == "soho":
23062306
if self.sensor.lower() == "erne":
@@ -2322,9 +2322,8 @@ def get_channel_energy_values(self, returns: str = "num") -> list:
23222322
if self.species == 'p':
23232323
energy_ranges = energy_dict["H_ENERGY_LABL"]
23242324

2325-
# In the case of ISOIS-EPIHI, each iterable object is a list with len=1 that contains
2326-
# the str
2327-
energy_ranges = [element[0] for element in energy_ranges]
2325+
# Each element in the list is also a list with len==1 for cdflib < 1.3.3, so fix that
2326+
energy_ranges = energy_ranges.flatten()
23282327

23292328
if self.sensor == "isois-epilo":
23302329
# The metadata of ISOIS-EPILO comes in a bit of complex form, so some handling is required

0 commit comments

Comments
 (0)