Skip to content

Commit

Permalink
Merge branch 'main' into new_act
Browse files Browse the repository at this point in the history
  • Loading branch information
rcjackson authored Jan 18, 2024
2 parents bc8e501 + e372cfa commit 0618e68
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pysp2/io/read_hk.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ def read_hk_file(file_name):
hk_df: pandas.DataFrame
The housekeeping information in a pandas DataFrame
"""

try:
my_df = act.io.csvfiles.read_csv(file_name, sep="\t")
except AttributeError:
my_df = act.io.text.read_csv(file_name, sep="\t")

# Parse time from filename
start_time = pd.Timestamp('1904-01-01')
my_df = my_df.rename({'index': 'time'})
Expand Down

0 comments on commit 0618e68

Please sign in to comment.