Skip to content

Commit 5138991

Browse files
committed
Merge branch 'develop' into 'master'
channel data mapping See merge request eco/eo/lime_tbx!96
2 parents 1fa191c + def4859 commit 5138991

4 files changed

Lines changed: 16 additions & 9 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
[//]: # "## [unreleased] - yyyy-mm-dd"
99

10-
## [1.4.0] - 2025-10-13
10+
## [1.4.0] - 2025-10-14
1111

1212
### Added
1313

@@ -20,11 +20,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2020

2121
### Fixed
2222

23+
- **Channel data mapping**: Fixed a bug introduced in **v1.3.0** where channel data was swapped because simulated data was returned in
24+
alphabetical order due to sorting of the spectral response function names. This caused simulated signals to be assigned to the
25+
wrong channels. The data is now correctly mapped to each channel.
2326
- About dialog picture links now work on Linux.
2427
- Linux: CLI arguments containing spaces (e.g., JSON passed to `-i`) are now forwarded correctly by
2528
the launcher. Previously they could be split or mangled.
2629
- Windows GUI no longer leaves an idle console window open.
2730
- Fixed rare crashes and freezes triggered by Help, About, and Close-confirmation dialogs.
31+
- Builder scripts for Linux and Debian installers no longer copy the `coeff_data/selected.txt` file from the development environment.
32+
Previously, if the file existed, it was included in the installation package, causing permission issues at runtime.
2833

2934
## [1.3.0] - 2025-09-19
3035

deployment/installer/build_linux_installer.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ mkdir -p linux/installer_files
22
[ ! -d "linux/installer_files/kernels" ] && cp -r ../../kernels linux/installer_files
33
[ ! -d "linux/installer_files/eocfi_data" ] && cp -r ../../eocfi_data linux/installer_files
44
[ ! -d "linux/installer_files/coeff_data" ] && cp -r ../../coeff_data linux/installer_files
5+
rm -f linux/installer_files/coeff_data/selected.txt
56
[ -d "linux/installer_files/LimeTBX" ] && rm -rf linux/installer_files/LimeTBX
67
[ -f "linux/lime_installer.zip" ] && rm -f linux/lime_installer.zip
78
cp -r ../../dist/LimeTBX linux/installer_files

deployment/installer/debian/build_deb.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ mkdir -p $name/opt/esa/LimeTBX
2020
cp -r ../../../kernels $name/opt/esa/LimeTBX
2121
cp -r ../../../eocfi_data $name/opt/esa/LimeTBX
2222
cp -r ../../../coeff_data $name/opt/esa/LimeTBX
23+
rm -f $name/opt/esa/LimeTBX/coeff_data/selected.txt
2324
cp ../../../lime_tbx/presentation/gui/assets/lime_logo.png $name/opt/esa/LimeTBX
2425
cp -r ../../../dist/LimeTBX $name/opt/esa/LimeTBX
2526
cp ../linux/limetbx.desktop $name/opt/esa/LimeTBX

lime_tbx/common/datatypes.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -966,15 +966,15 @@ def __init__(
966966
def wlens(self):
967967
"""Return the array of wavelengths."""
968968
if self._is_multichannel:
969-
return np.array(
970-
sorted(
971-
set(
972-
col.rsplit("_", 1)[0]
973-
for col in self._df.columns
974-
if col.endswith("_data")
975-
)
976-
)
969+
vals = np.array(
970+
[
971+
col.rsplit("_", 1)[0]
972+
for col in self._df.columns
973+
if col.endswith("_data")
974+
]
977975
)
976+
vals, index = np.unique(vals, return_index=True)
977+
return vals[index.argsort()]
978978
return self._df["wlens"].values
979979

980980
@property

0 commit comments

Comments
 (0)