Commit graph

1121 commits

Author SHA1 Message Date
Andrejh
6e14f8dbb6 update var naming 2021-09-10 16:48:17 +02:00
Luis Aleixo
8807942603 f_dep in function of diameter graph 2021-09-10 10:10:44 +02:00
Andrejh
2bc31d88f6 harmonize unfiform dist in data.py 2021-09-08 17:40:32 +02:00
Luis Aleixo
8c1ab2f504 Added viable_to_RNA variable to each virus in model 2021-09-08 15:46:19 +02:00
Andrejh
4dac6237c2 Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot 2021-09-08 15:40:51 +02:00
Andrejh
95cfddcdbe add mask dependency 2021-09-08 15:40:07 +02:00
Luis Aleixo
fe00584c89 Merge branch 'feature/virions_plot' of https://gitlab.cern.ch/cara/cara into feature/virions_plot 2021-09-08 15:35:30 +02:00
Luis Aleixo
b92b2ec132 Added viable_to_RNA distribution on Virus class 2021-09-08 15:35:17 +02:00
Andrejh
eb8feb6ed4 add phy activity as and atribute 2021-09-08 15:12:25 +02:00
Luis Aleixo
902396fcf7 added values of cn_B and cn_L into the model 2021-09-08 14:33:57 +02:00
Luis Aleixo
c81e9b1c14 merge with new style 2021-09-07 16:46:41 +02:00
Luis Aleixo
e8f4db16fa CDF models for breathing, speaking and shouting 2021-09-07 12:15:51 +02:00
Luis Aleixo
ca120716ff Merge branch 'master' into feature/virions_plot 2021-09-07 09:59:12 +02:00
Luis Aleixo
b820b3d889 bug in print_er_info arguments 2021-09-07 09:56:42 +02:00
Philip Elson
97ac2ab743 Merge branch 'feature/alternative_scenario_d3' into 'master'
Alternative scenarios plot with D3

See merge request cara/cara!246
2021-09-07 06:43:23 +02:00
Luis Aleixo
250b7c0582 Plot alternative scenarios in report using D3.js, speeding up the response time and improving user interactivity 2021-09-07 06:43:22 +02:00
Luis Aleixo
5f9091f18b Changed colormap fontsize 2021-09-06 17:29:55 +02:00
Luis Aleixo
83caf48282 Merge branch 'feature/virions_plot' of https://gitlab.cern.ch/cara/cara into feature/virions_plot 2021-09-06 17:14:29 +02:00
Luis Aleixo
52ee8f3c38 Plot with correct legends and media values 2021-09-06 17:13:31 +02:00
Andrejh
16e705f5bb increase sample size + add means of log(er) 2021-09-06 17:00:30 +02:00
Andrejh
ba2524a1ea Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot 2021-09-06 15:37:20 +02:00
Andrejh
a4b1e5adf2 legend edits 2021-09-06 15:36:54 +02:00
Luis Aleixo
e152b296c8 breathing, speaking and shouting histograms all in one 2021-09-06 14:44:14 +02:00
Luis Aleixo
cca80d86ea changed models.virus to mc.virus 2021-09-06 11:29:55 +02:00
Luis Aleixo
f0c59b0c61 added shouting model and changed talking to speaking 2021-09-06 11:04:03 +02:00
Luis Aleixo
57b6a668c0 statistical data for breathing and talking models 2021-09-06 10:42:31 +02:00
Luis Aleixo
c4afd66747 statistical data on emission rate 2021-09-06 09:37:18 +02:00
Andrejh
b00af20e82 minor edit 2021-09-03 17:18:49 +02:00
Andrejh
3ea400af2a rearrange code in file to group talking together 2021-09-03 17:11:24 +02:00
Andrejh
38b48d3341 add tick 2021-09-03 17:10:06 +02:00
Andrejh
afb49ee1e7 Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot 2021-09-03 16:59:56 +02:00
Luis Aleixo
a4114edaf9 bug fix on label 2021-09-03 15:53:35 +02:00
Andrejh
b76152015b Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot
# Conflicts:
#	cara/model_scenarios.py
2021-09-03 15:50:22 +02:00
Luis Aleixo
919ba2f51e Changed graph legend 2021-09-03 15:49:35 +02:00
Andrejh
1b6f5eea75 legend updates 2021-09-03 15:41:23 +02:00
Luis Aleixo
dc86171bd1 changed files organization 2021-09-03 15:39:04 +02:00
Luis Aleixo
9686739cc6 Correct breathing values 2021-09-03 13:55:27 +02:00
Luis Aleixo
7aec37c47a Merge branch 'feature/virions_plot' of https://gitlab.cern.ch/cara/cara into feature/virions_plot 2021-09-03 12:48:20 +02:00
Luis Aleixo
25f4981c96 Removed unused code and added line legend for cn (B and L) 2021-09-03 12:46:46 +02:00
Andrejh
e93e744dec legend updates 2021-09-03 12:08:40 +02:00
Luis Aleixo
7be638c92f Legends and colormap 2021-09-03 11:16:21 +02:00
Philip Elson
0414e15e4b Merge branch 'feature/masks_efficiency' into 'master'
Inward efficiency of masks

See merge request cara/cara!250
2021-09-02 17:15:06 +02:00
Luis Aleixo
ab153ca781 added inward mask efficiency references 2021-09-02 15:23:49 +02:00
Luis Aleixo
bdc51d81b8 Changed relevant references for mask distributions 2021-09-02 12:11:22 +02:00
Andre Henriques
72681b9895 Merge branch 'feature/climate_function' into 'master'
Allow location selection as part of the calculator, with temp profile from local weather station

See merge request cara/cara!211
2021-09-02 11:58:33 +02:00
James Devine
db02132853 Allow location selection as part of the calculator, with temp profile from local weather station 2021-09-02 11:58:32 +02:00
Luis Aleixo
32a2a75bc9 Changed color value 2021-09-02 10:43:45 +02:00
Luis Aleixo
f2b1335beb Merge branch 'master' into feature/virions_plot 2021-09-02 10:36:50 +02:00
Luis Aleixo
5c07820a9e Changed colormap color scale and plot linewidth 2021-09-02 10:35:16 +02:00
Andrejh
32f9fa0d50 add cn_L, cn_B 2021-09-02 10:19:30 +02:00