diff --git a/src/EcoFOCIpy/io/nitrates_parser.py b/src/EcoFOCIpy/io/nitrates_parser.py index 34f349e..0f5aaed 100644 --- a/src/EcoFOCIpy/io/nitrates_parser.py +++ b/src/EcoFOCIpy/io/nitrates_parser.py @@ -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 diff --git a/src/EcoFOCIpy/io/rcm_parser.py b/src/EcoFOCIpy/io/rcm_parser.py index 5949db2..216e56f 100644 --- a/src/EcoFOCIpy/io/rcm_parser.py +++ b/src/EcoFOCIpy/io/rcm_parser.py @@ -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): """ @@ -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':