Skip to content
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

Update suna #318

Merged
merged 3 commits into from
Mar 21, 2024
Merged

Update suna #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac34dc9
Update rcm_parser.py
shaunwbell Mar 11, 2024
48a770a
Update rcm_parser.py
shaunwbell Mar 11, 2024
487d70e
Update nitrates_parser.py
shaunwbell Mar 21, 2024
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
2 changes: 1 addition & 1 deletion src/EcoFOCIpy/io/nitrates_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ def FilterSuna(self,rmse_cutoff=0.00025):
assert 'Fit RMSE' in self.data_frame.columns , 'Must provide a Fit RMSE column in data'

self.data_frame = self.data_frame[self.data_frame['Fit RMSE'] <= rmse_cutoff]
self.data_frame = self.data_frame.resample('1H').median()
self.data_frame = self.data_frame.resample('1H').median(numeric_only=True)

return self.data_frame
4 changes: 3 additions & 1 deletion src/EcoFOCIpy/io/rcm_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ def engr2sci_oxy(self,channel='chan8'):
"""
if channel=='chan8':
self.rawdata_df['oxy_conc'] = self.rawdata_df['chan8']*0.4883
self.rawdata_df['oxy_percentsat'] = self.rawdata_df['chan8']*0.1465
elif channel=='chan7':
self.rawdata_df['oxy_conc'] = self.rawdata_df['chan7']*0.4883
self.rawdata_df['oxy_percentsat'] = self.rawdata_df['chan7']*0.1465

def engr2sci_temp(self,coefA=0,coefB=0,coefC=0,coefD=0):
"""
Expand All @@ -122,7 +124,7 @@ def engr2sci_pres(self,coefA=0,coefB=0,coefC=0,equationType='low',units='kPa'):

"""
if equationType=='low':
self.rawdata_df['pressure'] =(coefA+coefB*self.rawdata_df['press_engr']+coefC*(self.rawdata_df['press_engr']**2))/10-10
self.rawdata_df['pressure'] =(coefA+coefB*self.rawdata_df['press_engr']+coefC*(self.rawdata_df['press_engr']**2))
if units=='MPa':
self.rawdata_df['pressure'] =self.rawdata_df['pressure']*100-10
elif units=='kPa':
Expand Down