Skip to content

fixed resample's start and end times to be consistent with original #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JSMTHWCK merged 1 commit into from
Jan 9, 2026
Merged

fixed resample's start and end times to be consistent with original #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions endaq/calc/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import scipy.signal
import pint


def sample_spacing(
data: Union[np.ndarray, pd.DataFrame],
convert: typing.Literal[None, "to_seconds"] = "to_seconds",
Expand Down Expand Up @@ -150,17 +149,21 @@ def resample(df: pd.DataFrame, sample_rate: Optional[float] = None) -> pd.DataFr
df,
num_samples_after_resampling,
t=df.index.values.astype(np.float64),
)
)
resampled_time = pd.date_range(
df.iloc[0].name, df.iloc[-1].name,
periods=num_samples_after_resampling,
)

# Check for datetimes, if so localize
if 'datetime' in str(df.index.dtype):
df.index = df.index.tz_localize(None)

resampled_df = pd.DataFrame(
resampled_data,
index=resampled_time.astype(df.index.dtype),
index=(resampled_time),
columns=df.columns,
)
)

resampled_df.index.name = df.index.name

Expand Down