From d7c41853fe81a76c1c4a00294a9ab16849a7c322 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Thu, 23 Mar 2023 07:26:55 -0700 Subject: [PATCH] ccs lib Signed-off-by: James Cherry --- liberty/TableModel.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/liberty/TableModel.cc b/liberty/TableModel.cc index 48b988c2..8bb00889 100644 --- a/liberty/TableModel.cc +++ b/liberty/TableModel.cc @@ -1590,6 +1590,7 @@ OutputWaveforms::OutputWaveforms(TableAxisPtr slew_axis, slew_axis_(slew_axis), cap_axis_(cap_axis), current_waveforms_(current_waveforms), + voltage_waveforms_(current_waveforms.size()), ref_times_(ref_times) { } @@ -1628,10 +1629,12 @@ OutputWaveforms::voltageWaveform(float slew, size_t wave_index01 = slew_index * cap_axis_->size() + (cap_index + 1); size_t wave_index10 = (slew_index + 1) * cap_axis_->size() + cap_index; size_t wave_index11 = (slew_index + 1) * cap_axis_->size() + (cap_index + 1); - const Table1 *values00 = voltageWaveform(wave_index00, cap); - const Table1 *values01 = voltageWaveform(wave_index01, cap); - const Table1 *values10 = voltageWaveform(wave_index10, cap); - const Table1 *values11 = voltageWaveform(wave_index11, cap); + float cap0 = cap_axis_->axisValue(cap_index); + float cap1 = cap_axis_->axisValue(cap_index + 1); + const Table1 *values00 = voltageWaveform(wave_index00, cap0); + const Table1 *values01 = voltageWaveform(wave_index01, cap1); + const Table1 *values10 = voltageWaveform(wave_index10, cap0); + const Table1 *values11 = voltageWaveform(wave_index11, cap1); TableAxisPtr time_axis00 = values00->axis1(); TableAxisPtr time_axis01 = values01->axis1(); TableAxisPtr time_axis10 = values10->axis1();