Skip to content

Commit e709f49

Browse files
sbancalsbancal
authored
Merge pull request #93 from EPFL-ENAC/feat/data-convention/develop
Integrate new data convention devs into `develop` branch
2 parents 6f2d6e4 + 55812fa commit e709f49

File tree

304 files changed

+1335134
-2321655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+1335134
-2321655
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
"envFile": "${workspaceFolder}/secrets/.env"
3838
},
3939
{
40-
"name": "backend: initial inject to db",
40+
"name": "backend: init db",
4141
"type": "python",
4242
"request": "launch",
43-
"module": "initial_inject_to_db",
43+
"module": "init_db",
4444
"cwd": "${workspaceFolder}/backend",
4545
"envFile": "${workspaceFolder}/secrets/.env"
4646
}

‎Data/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
**/*_check_output.txt
2+
**/.~lock.*

‎Data/TST_Data_Convention.md‎

Lines changed: 111 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,127 @@
11
# TST Standard Data format
22

3-
### Structure
3+
## Structure
44

55
Each experiment is composed of several tests.
6+
67
```
8+
raw
79
└───Experiment folder
810
│ Metadata file .xls
911
│ Test data 001 .csv
1012
│ Test data 002 .csv
1113
│ ...
12-
1314
```
1415

16+
## Directory/file naming conventions
1517

16-
### Directory/file naming conventions
17-
18-
* Experiment folder: `TST_{Researcher's lastname}_{Date}_{Test type}`
19-
* Metadata file: `TST_{Date}_{Test type}_metadata.xls`
20-
* Test data: `TST_{Date}_{Test type}_{###}.csv`
18+
- Experiment folder: `TST_{Researcher's lastname}_{Date}_{Test type}`
19+
- Metadata file: `TST_{Date}_{Test type}_metadata.xls`
20+
- Test data: `TST_{Date}_{Test type}_{###}.csv`
2121

2222
with:
2323

24-
* date: `YYYY-MM` (starting month of the experiment)
25-
* Test type: `FA` = standard fatigue or `QS` = standard quasi-static.
26-
* `###`: Specimen number
27-
28-
29-
30-
### TST CSV files standards (column names must be exact) :
31-
32-
33-
| Column name | Description | Unit | Data type | Mandatory |
34-
|----------------------|----------------------------------------------------|-------|-----------|---|
35-
| Machine\_N_cycles | Number of cycles counted by the machine | [-] | int | y |
36-
| Machine_Load | Load measured by the machine | [kN] | double | y |
37-
| Machine_Displacement | Displacement measured by the machine | [mm] | double | y |
38-
| index | Image number | [-] | int | |
39-
| Camera\_N_cycles | Number of cycles counted by the camera | [-] | int | |
40-
| exx | Strain measured along main axis | [-] | double | |
41-
| eyy | Strain measured along secondary axis | [-] | double | |
42-
| exy | Strain measured along a specified axis | [-] | double | |
43-
| crack_length | Crack length measurement (for fracture testings) | [mm] | double | |
44-
| Th_time | Time as counted by temperature monitoring | [sec] | int | |
45-
| Th\_N_cycles | Number of cycles counted by temperature monitoring | [-] | int | |
46-
| Th\_specimen_max | Maximum temperature monitored | [°C] | single | |
47-
| Th\_specimen_mean | Mean temperature | [°C] | single | |
48-
| Th_chamber | Temperature of the test environment | [°C] | single | |
49-
| Th_uppergrips | Temperature of the upper grips | [°C] | single | |
50-
| Th_lowergrips | Temperature of the lower grips | [°C] | single | |
51-
| Specimen Name | Specimen Name | [-] | string | |
24+
- date: `YYYY-MM` (starting month of the experiment)
25+
- Test type:
26+
- `FA` = standard fatigue
27+
- `QS` = standard quasi-static
28+
- `TM` = DMA or temperature
29+
- `###`: Specimen number
30+
31+
## TST XLS file standards
32+
33+
Must match metadata template : [TST_Data_Template.xls](TST_Data_Template.xls)
34+
In the Excel metadata template, note that only row 4 (sheet 1) and row 3 (sheet 2) must be filled with metadata. The rest must remain unchanged.
35+
36+
## TST CSV files standards (column names must be exact) :
37+
38+
| Column name | Description | Unit | Data type | Mandatory | Multiple measurement points |
39+
| ---------------------- | ----------------------------------------------------- | -------- | --------- | --------- | --------------------------- |
40+
| `Machine_Time` | Absolute or relative time recorded by the machine | [-] | string | | |
41+
| `Machine_N_cycles` | Number of cycles counted by the machine | [-] | int | | |
42+
| `Machine_Displacement` | Displacement measured by the machine | [mm] | double | | |
43+
| `Machine_Load` | Load measured by the machine | [kN]/[N] | double | | |
44+
| `MD_index--#` | index for the measurement, e.g. image number | [-] | int | | y |
45+
| `MD_time--#` | Time recored by the measuring device | [-] | string | | y |
46+
| `MD_N_cycles--#` | Number of cycles from measuring device | [-] | int | | y |
47+
| `MD_Displacement--#` | Displacement from measuring device | [mm] | double | | y |
48+
| `MD_Load--#` | Load from measuring device | [kN]/[N] | double | | y |
49+
| `u--#` | Displacement measured along main axis at point # | [mm] | double | | y |
50+
| `v--#` | Displacement measured along secondary axis at point # | [mm] | double | | y |
51+
| `exx--#` | Strain measured along main axis at point # | [-] | double | | y |
52+
| `eyy--#` | Strain measured along secondary axis at point # | [-] | double | | y |
53+
| `exy--#` | Strain measured along a specified axis at point # | [-] | double | | y |
54+
| `Crack_length` | Crack length measurement (for fracture testings) | [mm] | double | | |
55+
| `Crack_N_cycles` | Number of cycles at measured crack length | [mm] | double | | |
56+
| `Crack_Displacement` | Displacement at measured crack length | [mm] | double | | |
57+
| `Crack_Load` | Load at measured crack length | [kN]/[N] | double | | |
58+
| `Th_time` | Time as counted by temperature monitoring | [sec] | int | | |
59+
| `Th_N_cycles` | Number of cycles counted by temperature monitoring | [-] | int | | |
60+
| `Th_specimen_max` | Maximum temperature monitored | [°C] | double | | |
61+
| `Th_specimen_mean` | Mean temperature | [°C] | double | | |
62+
| `Th_chamber` | Temperature of the test environment | [°C] | double | | |
63+
| `Th_uppergrips` | Temperature of the upper grips | [°C] | double | | |
64+
| `Th_lowergrips` | Temperature of the lower grips | [°C] | double | | |
65+
| `T--#` | Temperature at point # | [°C] | double | | y |
66+
| `Storage_modulus` | Storage modulus measured from DMA | [GPa] | double | | |
67+
| `Tan_delta` | Tan delta measured from DMA | [-] | double | | |
68+
| `Specimen_name` | Name of the specimen | [-] | string | | |
69+
70+
### `FA` without fracture specifities :
71+
72+
Mandatory data columns
73+
74+
- one of :
75+
- `Machine_N_cycles`
76+
- `MD_N_cycles--#`
77+
- one of :
78+
- `Machine_Displacement`
79+
- `MD_Displacement--#`
80+
- `exx--#`
81+
- one of :
82+
- `Machine_Load`
83+
- `MD_Load--#`
84+
85+
### `FA` with fracture specifities :
86+
87+
Mandatory data columns
88+
89+
- `Crack_N_cycles`
90+
- `Crack_length`
91+
92+
### `QS` without fracture specifities :
93+
94+
Mandatory data columns
95+
96+
- one of :
97+
- `Machine_Displacement`
98+
- `MD_Displacement--#`
99+
- `exx--#`
100+
- one of :
101+
- `Machine_Load`
102+
- `MD_Load--#`
103+
104+
### `QS` with fracture specifities :
105+
106+
Mandatory data columns
107+
108+
- one of :
109+
- `Machine_Displacement`
110+
- `MD_Displacement--#`
111+
- `Crack_length`
112+
- `Crack_Displacement`
113+
- one of :
114+
- `Machine_Load`
115+
- `MD_Load--#`
116+
- `Crack_Load`
117+
118+
### `TM` with and without fracture specifities:
119+
120+
Mandatory data columns
121+
122+
- `T--#`
123+
- one of :
124+
- `Storage_modulus`
125+
- `Tan_delta`
126+
- `Machine_Load`
127+
- `MD_Load--#`

‎Data/TST_Data_Template.xls‎

2.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)