Skip to content

align ends of nomograph to prevent returning nan when bmp is xxl #306

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

Merged
austinorr merged 1 commit into from
Jan 2, 2024
Merged

align ends of nomograph to prevent returning nan when bmp is xxl #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
80 changes: 42 additions & 38 deletions ipynb/nomographs/01-build_volume_nomos.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 26 additions & 16 deletions ipynb/nomographs/nomographs/volume/1980s.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
vol_cuft,size_fraction,ddt_hr,capture_fraction
,0.0,1,0.0
0.0,0.0,1,0.0
1000.0,0.0188,1,0.4591
2000.0,0.0376,1,0.6629
3000.0,0.0563,1,0.7811
Expand Down Expand Up @@ -44,7 +44,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,1,1.0
275000.0,5.1641,1,1.0
300000.0,5.6336,1,1.0
,0.0,2,0.0
305000.0,5.7275,1,1.0
0.0,0.0,2,0.0
1000.0,0.0188,2,0.3061
2000.0,0.0376,2,0.4784
3000.0,0.0563,2,0.6006
Expand Down Expand Up @@ -89,7 +90,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,2,1.0
275000.0,5.1641,2,1.0
300000.0,5.6336,2,1.0
,0.0,3,0.0
305000.0,5.7275,2,1.0
0.0,0.0,3,0.0
1000.0,0.0188,3,0.2363
2000.0,0.0376,3,0.3829
3000.0,0.0563,3,0.4952
Expand Down Expand Up @@ -134,7 +136,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,3,1.0
275000.0,5.1641,3,1.0
300000.0,5.6336,3,1.0
,0.0,6,0.0
305000.0,5.7275,3,1.0
0.0,0.0,6,0.0
1000.0,0.0188,6,0.1476
2000.0,0.0376,6,0.2518
3000.0,0.0563,6,0.3387
Expand Down Expand Up @@ -179,7 +182,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,6,1.0
275000.0,5.1641,6,1.0
300000.0,5.6336,6,1.0
,0.0,12,0.0
305000.0,5.7275,6,1.0
0.0,0.0,12,0.0
1000.0,0.0188,12,0.0899
2000.0,0.0376,12,0.1596
3000.0,0.0563,12,0.2212
Expand Down Expand Up @@ -224,7 +228,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,12,1.0
275000.0,5.1641,12,1.0
300000.0,5.6336,12,1.0
,0.0,24,0.0
305000.0,5.7275,12,1.0
0.0,0.0,24,0.0
1000.0,0.0188,24,0.0546
2000.0,0.0376,24,0.0992
3000.0,0.0563,24,0.1403
Expand Down Expand Up @@ -255,7 +260,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,24,1.0
275000.0,5.1641,24,1.0
300000.0,5.6336,24,1.0
,0.0,36,0.0
305000.0,5.7275,24,1.0
0.0,0.0,36,0.0
1000.0,0.0188,36,0.0407
2000.0,0.0376,36,0.0751
3000.0,0.0563,36,0.1071
Expand Down Expand Up @@ -286,7 +292,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,36,1.0
275000.0,5.1641,36,1.0
300000.0,5.6336,36,1.0
,0.0,48,0.0
305000.0,5.7275,36,1.0
0.0,0.0,48,0.0
1000.0,0.0188,48,0.0332
2000.0,0.0376,48,0.0619
3000.0,0.0563,48,0.0888
Expand Down Expand Up @@ -317,7 +324,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,48,1.0
275000.0,5.1641,48,1.0
300000.0,5.6336,48,1.0
,0.0,72,0.0
305000.0,5.7275,48,1.0
0.0,0.0,72,0.0
1000.0,0.0188,72,0.025
2000.0,0.0376,72,0.0468
3000.0,0.0563,72,0.0679
Expand Down Expand Up @@ -348,7 +356,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,72,0.9988
275000.0,5.1641,72,0.9996
300000.0,5.6336,72,1.0
,0.0,96,0.0
305000.0,5.7275,72,1.0
0.0,0.0,96,0.0
1000.0,0.0188,96,0.0201
2000.0,0.0376,96,0.0384
3000.0,0.0563,96,0.056
Expand Down Expand Up @@ -379,7 +388,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.6947,96,0.9954
275000.0,5.1641,96,0.9981
300000.0,5.6336,96,0.9991
,0.0,120,0.0
305000.0,5.7275,96,0.9991
0.0,0.0,120,0.0
1000.0,0.0188,120,0.0169
2000.0,0.0376,120,0.0325
3000.0,0.0563,120,0.0476
Expand All @@ -401,7 +411,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.7885,120,0.9905
280000.0,5.258,120,0.995
305000.0,5.7275,120,0.9979
,0.0,180,0.0
0.0,0.0,180,0.0
1000.0,0.0188,180,0.0121
2000.0,0.0376,180,0.0243
3000.0,0.0563,180,0.0356
Expand All @@ -423,7 +433,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.7885,180,0.9634
280000.0,5.258,180,0.9758
305000.0,5.7275,180,0.9848
,0.0,240,0.0
0.0,0.0,240,0.0
1000.0,0.0188,240,0.0102
2000.0,0.0376,240,0.0193
3000.0,0.0563,240,0.0289
Expand All @@ -445,7 +455,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.7885,240,0.9277
280000.0,5.258,240,0.9477
305000.0,5.7275,240,0.9632
,0.0,360,0.0
0.0,0.0,360,0.0
1000.0,0.0188,360,0.0073
2000.0,0.0376,360,0.0136
3000.0,0.0563,360,0.0206
Expand All @@ -467,7 +477,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.7885,360,0.8447
280000.0,5.258,360,0.8756
305000.0,5.7275,360,0.9006
,0.0,480,0.0
0.0,0.0,480,0.0
1000.0,0.0188,480,0.0057
2000.0,0.0376,480,0.0113
3000.0,0.0563,480,0.016
Expand All @@ -489,7 +499,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.7885,480,0.7667
280000.0,5.258,480,0.8039
305000.0,5.7275,480,0.8354
,0.0,720,0.0
0.0,0.0,720,0.0
1000.0,0.0188,720,0.004
2000.0,0.0376,720,0.0079
3000.0,0.0563,720,0.0118
Expand Down
42 changes: 26 additions & 16 deletions ipynb/nomographs/nomographs/volume/2030s.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
vol_cuft,size_fraction,ddt_hr,capture_fraction
,0.0,1,0.0
0.0,0.0,1,0.0
1000.0,0.0165,1,0.4457
2000.0,0.0329,1,0.6417
3000.0,0.0494,1,0.7579
Expand Down Expand Up @@ -44,7 +44,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,1,1.0
275000.0,4.528,1,1.0
300000.0,4.9396,1,1.0
,0.0,2,0.0
305000.0,5.0219,1,1.0
0.0,0.0,2,0.0
1000.0,0.0165,2,0.298
2000.0,0.0329,2,0.4639
3000.0,0.0494,2,0.5813
Expand Down Expand Up @@ -89,7 +90,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,2,1.0
275000.0,4.528,2,1.0
300000.0,4.9396,2,1.0
,0.0,3,0.0
305000.0,5.0219,2,1.0
0.0,0.0,3,0.0
1000.0,0.0165,3,0.2304
2000.0,0.0329,3,0.372
3000.0,0.0494,3,0.4798
Expand Down Expand Up @@ -134,7 +136,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,3,1.0
275000.0,4.528,3,1.0
300000.0,4.9396,3,1.0
,0.0,6,0.0
305000.0,5.0219,3,1.0
0.0,0.0,6,0.0
1000.0,0.0165,6,0.144
2000.0,0.0329,6,0.2454
3000.0,0.0494,6,0.3291
Expand Down Expand Up @@ -179,7 +182,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,6,1.0
275000.0,4.528,6,1.0
300000.0,4.9396,6,1.0
,0.0,12,0.0
305000.0,5.0219,6,1.0
0.0,0.0,12,0.0
1000.0,0.0165,12,0.0875
2000.0,0.0329,12,0.1558
3000.0,0.0494,12,0.2159
Expand Down Expand Up @@ -224,7 +228,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,12,1.0
275000.0,4.528,12,1.0
300000.0,4.9396,12,1.0
,0.0,24,0.0
305000.0,5.0219,12,1.0
0.0,0.0,24,0.0
1000.0,0.0165,24,0.053
2000.0,0.0329,24,0.0968
3000.0,0.0494,24,0.1371
Expand Down Expand Up @@ -255,7 +260,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,24,1.0
275000.0,4.528,24,1.0
300000.0,4.9396,24,1.0
,0.0,36,0.0
305000.0,5.0219,24,1.0
0.0,0.0,36,0.0
1000.0,0.0165,36,0.0393
2000.0,0.0329,36,0.073
3000.0,0.0494,36,0.1045
Expand Down Expand Up @@ -286,7 +292,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,36,0.998
275000.0,4.528,36,0.9993
300000.0,4.9396,36,0.9999
,0.0,48,0.0
305000.0,5.0219,36,0.9999
0.0,0.0,48,0.0
1000.0,0.0165,48,0.0319
2000.0,0.0329,48,0.0599
3000.0,0.0494,48,0.0863
Expand Down Expand Up @@ -317,7 +324,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,48,0.9955
275000.0,4.528,48,0.9975
300000.0,4.9396,48,0.9989
,0.0,72,0.0
305000.0,5.0219,48,0.9989
0.0,0.0,72,0.0
1000.0,0.0165,72,0.0239
2000.0,0.0329,72,0.0449
3000.0,0.0494,72,0.0654
Expand Down Expand Up @@ -348,7 +356,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,72,0.9914
275000.0,4.528,72,0.9936
300000.0,4.9396,72,0.9954
,0.0,96,0.0
305000.0,5.0219,72,0.9954
0.0,0.0,96,0.0
1000.0,0.0165,96,0.0192
2000.0,0.0329,96,0.0368
3000.0,0.0494,96,0.0536
Expand Down Expand Up @@ -379,7 +388,8 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
250000.0,4.1163,96,0.9873
275000.0,4.528,96,0.9904
300000.0,4.9396,96,0.9928
,0.0,120,0.0
305000.0,5.0219,96,0.9928
0.0,0.0,120,0.0
1000.0,0.0165,120,0.0161
2000.0,0.0329,120,0.0311
3000.0,0.0494,120,0.0455
Expand All @@ -401,7 +411,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.1987,120,0.9808
280000.0,4.6103,120,0.9866
305000.0,5.0219,120,0.9902
,0.0,180,0.0
0.0,0.0,180,0.0
1000.0,0.0165,180,0.0117
2000.0,0.0329,180,0.0233
3000.0,0.0494,180,0.034
Expand All @@ -423,7 +433,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.1987,180,0.9529
280000.0,4.6103,180,0.966
305000.0,5.0219,180,0.975
,0.0,240,0.0
0.0,0.0,240,0.0
1000.0,0.0165,240,0.0098
2000.0,0.0329,240,0.0185
3000.0,0.0494,240,0.0277
Expand All @@ -445,7 +455,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.1987,240,0.9124
280000.0,4.6103,240,0.9361
305000.0,5.0219,240,0.9522
,0.0,360,0.0
0.0,0.0,360,0.0
1000.0,0.0165,360,0.007
2000.0,0.0329,360,0.0131
3000.0,0.0494,360,0.0199
Expand All @@ -467,7 +477,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.1987,360,0.8198
280000.0,4.6103,360,0.8536
305000.0,5.0219,360,0.8824
,0.0,480,0.0
0.0,0.0,480,0.0
1000.0,0.0165,480,0.0055
2000.0,0.0329,480,0.0109
3000.0,0.0494,480,0.0154
Expand All @@ -489,7 +499,7 @@ vol_cuft,size_fraction,ddt_hr,capture_fraction
255000.0,4.1987,480,0.7379
280000.0,4.6103,480,0.7757
305000.0,5.0219,480,0.8097
,0.0,720,0.0
0.0,0.0,720,0.0
1000.0,0.0165,720,0.0038
2000.0,0.0329,720,0.0076
3000.0,0.0494,720,0.0114
Expand Down
Loading