mirror of
https://forgemia.inra.fr/theophile.terraz/acoused.git
synced 2026-10-30 03:10:40 +01:00
interpolate Mifine profile is corrected with depth_bottom
This commit is contained in:
1 parent
73bf3cf9d3
commit
baebe2e8cc
1 file changed
+8
-15
@@ -1276,13 +1276,6 @@ class SedimentCalibrationTab(QWidget):
|
||||
|
||||
if stg.depth_cross_section[self.combobox_acoustic_data_choice.currentIndex()].shape != (0,):
|
||||
|
||||
print("test find indice of time ", np.where( np.abs(stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :]
|
||||
- (stg.time_fine[stg.fine_sample_profile[-1][1]])) ==
|
||||
np.nanmin(np.abs(stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :]
|
||||
- (stg.time_fine[stg.fine_sample_profile[-1][1]]))) ))
|
||||
print(stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :])
|
||||
print(stg.time_fine[stg.fine_sample_profile[-1][1]])
|
||||
|
||||
if stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()].shape != (0,):
|
||||
|
||||
stg.range_lin_interp, stg.M_profile_fine = (
|
||||
@@ -1290,13 +1283,13 @@ class SedimentCalibrationTab(QWidget):
|
||||
sample_depth=[-stg.depth_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
M_profile=[stg.Ctot_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
range_cells=stg.depth_cross_section[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :],
|
||||
r_bottom=stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
r_bottom=[stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
[
|
||||
np.where( np.abs(stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :]
|
||||
- stg.time_fine[stg.fine_sample_profile[-1][1]]) ==
|
||||
np.nanmin(np.abs(stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :]
|
||||
- stg.time_fine[stg.fine_sample_profile[-1][1]])) )[0][0]
|
||||
]
|
||||
] if len(stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]) != 0 else np.array([])][0]
|
||||
)
|
||||
)
|
||||
|
||||
@@ -1307,13 +1300,13 @@ class SedimentCalibrationTab(QWidget):
|
||||
sample_depth=[-stg.depth_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
M_profile=[stg.Ctot_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
range_cells=stg.depth_cross_section[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :],
|
||||
r_bottom=stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
r_bottom=[stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
[
|
||||
np.where( np.abs(stg.time[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :]
|
||||
- stg.time_fine[stg.fine_sample_profile[-1][1]]) ==
|
||||
np.nanmin(np.abs(stg.time[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :]
|
||||
- stg.time_fine[stg.fine_sample_profile[-1][1]])) )[0][0]
|
||||
]
|
||||
] if len(stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]) else np.array([])][0]
|
||||
)
|
||||
)
|
||||
|
||||
@@ -1326,7 +1319,7 @@ class SedimentCalibrationTab(QWidget):
|
||||
sample_depth=[-stg.depth_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
M_profile=[stg.Ctot_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
range_cells=stg.depth[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :],
|
||||
r_bottom=stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
r_bottom=[stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
[
|
||||
np.where(np.abs(stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()][
|
||||
self.combobox_freq2.currentIndex(), :]
|
||||
@@ -1335,7 +1328,7 @@ class SedimentCalibrationTab(QWidget):
|
||||
stg.time_cross_section[self.combobox_acoustic_data_choice.currentIndex()][
|
||||
self.combobox_freq2.currentIndex(), :]
|
||||
- stg.time_fine[stg.fine_sample_profile[-1][1]])))[0][0]
|
||||
]
|
||||
] if len(stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]) != 0 else np.array([])][0]
|
||||
))
|
||||
|
||||
else:
|
||||
@@ -1345,7 +1338,7 @@ class SedimentCalibrationTab(QWidget):
|
||||
sample_depth=[-stg.depth_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
M_profile=[stg.Ctot_fine[k[1]] for k in stg.fine_sample_profile],
|
||||
range_cells=stg.depth[self.combobox_acoustic_data_choice.currentIndex()][self.combobox_freq2.currentIndex(), :],
|
||||
r_bottom=stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
r_bottom=[stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]
|
||||
[
|
||||
np.where(np.abs(stg.time[self.combobox_acoustic_data_choice.currentIndex()][
|
||||
self.combobox_freq2.currentIndex(), :]
|
||||
@@ -1354,7 +1347,7 @@ class SedimentCalibrationTab(QWidget):
|
||||
stg.time[self.combobox_acoustic_data_choice.currentIndex()][
|
||||
self.combobox_freq2.currentIndex(), :]
|
||||
- stg.time_fine[stg.fine_sample_profile[-1][1]])))[0][0]
|
||||
]
|
||||
] if len(stg.depth_bottom[self.combobox_acoustic_data_choice.currentIndex()]) else np.array([])][0]
|
||||
))
|
||||
|
||||
stg.range_lin_interp = stg.range_lin_interp
|
||||
|
||||
Reference in new issue
Block a user