Skip to content

Commit f141953

Browse files
jonbrenasjonbrenas
committed
Trying a new idea.
1 parent fdef7eb commit f141953

1 file changed

Lines changed: 71 additions & 76 deletions

File tree

‎malariagen_data/anoph/h12.py‎

Lines changed: 71 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -479,83 +479,78 @@ def plot_h12_gwss_track(
479479
for i in range(len(circle_kwargs_param), 5)
480480
}
481481
)
482-
elif isinstance(circle_kwargs_param, dict):
483-
if isinstance(list(circle_kwargs_param.keys())[0], str):
484-
if list(circle_kwargs_param.keys())[0] in [
485-
"2L",
486-
"2R",
487-
"3L",
488-
"3R",
489-
"X",
490-
"2RL",
491-
"3RL",
492-
]:
493-
for i in range(0, 5):
494-
if i == 0:
495-
if "2L" in circle_kwargs_param.keys(): # Ag3
496-
circle_kwargs_param_dict[
497-
i
498-
] = gplt_params.default_circle_kwargs_dict[
499-
i
500-
] # circle_kwargs_param["2L"]
501-
elif "2RL" in circle_kwargs_param.keys(): # Af1
502-
circle_kwargs_param_dict[
503-
i
504-
] = gplt_params.default_circle_kwargs_dict[
505-
i
506-
] # circle_kwargs_param["2RL"]
507-
else:
508-
circle_kwargs_param_dict[
509-
i
510-
] = gplt_params.default_circle_kwargs_dict[i]
511-
elif i == 1:
512-
if "2R" in circle_kwargs_param.keys(): # Ag3
513-
circle_kwargs_param_dict[i] = circle_kwargs_param["2R"]
514-
elif "3RL" in circle_kwargs_param.keys(): # Af1
515-
circle_kwargs_param_dict[i] = circle_kwargs_param["3RL"]
516-
else:
517-
circle_kwargs_param_dict[
518-
i
519-
] = gplt_params.default_circle_kwargs_dict[i]
520-
elif i == 2:
521-
if "3L" in circle_kwargs_param.keys(): # Ag3
522-
circle_kwargs_param_dict[i] = circle_kwargs_param["3L"]
523-
elif "X" in circle_kwargs_param.keys(): # Af1
524-
circle_kwargs_param_dict[i] = circle_kwargs_param["X"]
525-
else:
526-
circle_kwargs_param_dict[
527-
i
528-
] = gplt_params.default_circle_kwargs_dict[i]
529-
elif i == 3:
530-
if "3R" in circle_kwargs_param.keys(): # Ag3
531-
circle_kwargs_param_dict[i] = circle_kwargs_param["3R"]
532-
else:
533-
circle_kwargs_param_dict[
534-
i
535-
] = gplt_params.default_circle_kwargs_dict[i]
536-
elif i == 4:
537-
if (
538-
"X" in circle_kwargs_param.keys()
539-
): # Ag3. Will also get a value for Af1 but it will be ignored.
540-
circle_kwargs_param_dict[i] = circle_kwargs_param["X"]
541-
else:
542-
circle_kwargs_param_dict[
543-
i
544-
] = gplt_params.default_circle_kwargs_dict[i]
545-
else:
546-
print("circle_kwargs")
547-
circle_kwargs_param_dict = {
548-
i: circle_kwargs_param for i in range(0, 5)
549-
}
550-
elif isinstance(list(circle_kwargs_param.keys())[0], int):
551-
circle_kwargs_param_dict = {}
482+
elif isinstance(circle_kwargs_param, dict[str, dict]):
483+
if list(circle_kwargs_param.keys())[0] in [
484+
"2L",
485+
"2R",
486+
"3L",
487+
"3R",
488+
"X",
489+
"2RL",
490+
"3RL",
491+
]:
552492
for i in range(0, 5):
553-
if i in list(circle_kwargs_param.keys()):
554-
circle_kwargs_param_dict[i] = circle_kwargs_param[i]
555-
else:
556-
circle_kwargs_param_dict[
557-
i
558-
] = gplt_params.default_circle_kwargs_dict[i]
493+
if i == 0:
494+
if "2L" in circle_kwargs_param.keys(): # Ag3
495+
circle_kwargs_param_dict[
496+
i
497+
] = gplt_params.default_circle_kwargs_dict[
498+
i
499+
] # circle_kwargs_param["2L"]
500+
elif "2RL" in circle_kwargs_param.keys(): # Af1
501+
circle_kwargs_param_dict[
502+
i
503+
] = gplt_params.default_circle_kwargs_dict[
504+
i
505+
] # circle_kwargs_param["2RL"]
506+
else:
507+
circle_kwargs_param_dict[
508+
i
509+
] = gplt_params.default_circle_kwargs_dict[i]
510+
elif i == 1:
511+
if "2R" in circle_kwargs_param.keys(): # Ag3
512+
circle_kwargs_param_dict[i] = circle_kwargs_param["2R"]
513+
elif "3RL" in circle_kwargs_param.keys(): # Af1
514+
circle_kwargs_param_dict[i] = circle_kwargs_param["3RL"]
515+
else:
516+
circle_kwargs_param_dict[
517+
i
518+
] = gplt_params.default_circle_kwargs_dict[i]
519+
elif i == 2:
520+
if "3L" in circle_kwargs_param.keys(): # Ag3
521+
circle_kwargs_param_dict[i] = circle_kwargs_param["3L"]
522+
elif "X" in circle_kwargs_param.keys(): # Af1
523+
circle_kwargs_param_dict[i] = circle_kwargs_param["X"]
524+
else:
525+
circle_kwargs_param_dict[
526+
i
527+
] = gplt_params.default_circle_kwargs_dict[i]
528+
elif i == 3:
529+
if "3R" in circle_kwargs_param.keys(): # Ag3
530+
circle_kwargs_param_dict[i] = circle_kwargs_param["3R"]
531+
else:
532+
circle_kwargs_param_dict[
533+
i
534+
] = gplt_params.default_circle_kwargs_dict[i]
535+
elif i == 4:
536+
if (
537+
"X" in circle_kwargs_param.keys()
538+
): # Ag3. Will also get a value for Af1 but it will be ignored.
539+
circle_kwargs_param_dict[i] = circle_kwargs_param["X"]
540+
else:
541+
circle_kwargs_param_dict[
542+
i
543+
] = gplt_params.default_circle_kwargs_dict[i]
544+
else:
545+
circle_kwargs_param_dict = {i: circle_kwargs_param for i in range(0, 5)}
546+
elif isinstance(circle_kwargs_param, dict[int, dict]):
547+
for i in range(0, 5):
548+
if i in list(circle_kwargs_param.keys()):
549+
circle_kwargs_param_dict[i] = circle_kwargs_param[i]
550+
else:
551+
circle_kwargs_param_dict[
552+
i
553+
] = gplt_params.default_circle_kwargs_dict[i]
559554
else:
560555
circle_kwargs_param_dict = gplt_params.default_circle_kwargs_dict
561556

0 commit comments

Comments
 (0)