markus/lib-paveit-demo
1
0
Fork 0
Code Pull Requests Activity

Schersteifigkeit für TUD und Labor Hart ergänzt. Auswertung läuft

Browse Source
This commit is contained in:
Markus Clauß
2023-03-03 15:03:23 +01:00
parent e1dd4c7c00
commit ecaf97bbb3
3 changed files with 109 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/paveit/labtest/base.py
View File

@@ -201,7 +201,7 @@ class DataSineLoad():
for col in [
's_hor_sum', 's_hor_1', 's_hor_2', 's_vert_sum', 's_vert_1',
's_vert_2'
's_vert_2', 's_piston', 'extension',
]:
if col in self.data.columns:
self.data[col] = self.data[col].mul(self.unit_s)
@@ -232,12 +232,16 @@ class DataSineLoad():
cols = self.data.columns
if not 's_hor_sum' in cols:
self.data['s_hor_sum'] = self.data[['s_hor_1',
's_hor_2']].sum(axis=1)
if ('s_hor_1' in self.data.columns) & ('s_hor_2'
in self.data.columns):
self.data['s_hor_sum'] = self.data[['s_hor_1',
's_hor_2']].sum(axis=1)
if not 's_vert_sum' in cols:
self.data['s_vert_sum'] = self.data[['s_vert_1',
's_vert_2']].sum(axis=1)
if ('s_vert_1' in self.data.columns) & ('s_vert_2'
in self.data.columns):
self.data['s_vert_sum'] = self.data[['s_vert_1',
's_vert_2']].sum(axis=1)
def _post_opt_data(self):
#set dtypes: