dkist-processing-common 11.3.1rc1__py3-none-any.whl → 11.4.0rc1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. changelog/266.misc.rst +1 -0
  2. dkist_processing_common/models/constants.py +28 -42
  3. dkist_processing_common/models/fits_access.py +0 -56
  4. dkist_processing_common/models/tags.py +1 -2
  5. dkist_processing_common/models/task_name.py +2 -2
  6. dkist_processing_common/parsers/cs_step.py +2 -2
  7. dkist_processing_common/parsers/dsps_repeat.py +4 -5
  8. dkist_processing_common/parsers/experiment_id_bud.py +2 -5
  9. dkist_processing_common/parsers/id_bud.py +3 -6
  10. dkist_processing_common/parsers/l0_fits_access.py +3 -4
  11. dkist_processing_common/parsers/l1_fits_access.py +21 -22
  12. dkist_processing_common/parsers/near_bud.py +2 -5
  13. dkist_processing_common/parsers/proposal_id_bud.py +2 -3
  14. dkist_processing_common/parsers/retarder.py +3 -4
  15. dkist_processing_common/parsers/single_value_single_key_flower.py +1 -6
  16. dkist_processing_common/parsers/task.py +6 -7
  17. dkist_processing_common/parsers/time.py +15 -19
  18. dkist_processing_common/parsers/unique_bud.py +2 -5
  19. dkist_processing_common/parsers/wavelength.py +3 -4
  20. dkist_processing_common/tasks/parse_l0_input_data.py +3 -5
  21. dkist_processing_common/tests/test_assemble_movie.py +1 -0
  22. dkist_processing_common/tests/test_constants.py +0 -15
  23. dkist_processing_common/tests/test_fits_access.py +7 -62
  24. dkist_processing_common/tests/test_parse_l0_input_data.py +24 -22
  25. dkist_processing_common/tests/test_stems.py +21 -30
  26. dkist_processing_common/tests/test_task_parsing.py +7 -17
  27. {dkist_processing_common-11.3.1rc1.dist-info → dkist_processing_common-11.4.0rc1.dist-info}/METADATA +6 -6
  28. {dkist_processing_common-11.3.1rc1.dist-info → dkist_processing_common-11.4.0rc1.dist-info}/RECORD +30 -32
  29. changelog/265.feature.1.rst +0 -3
  30. changelog/265.feature.rst +0 -4
  31. changelog/265.misc.rst +0 -2
  32. {dkist_processing_common-11.3.1rc1.dist-info → dkist_processing_common-11.4.0rc1.dist-info}/WHEEL +0 -0
  33. {dkist_processing_common-11.3.1rc1.dist-info → dkist_processing_common-11.4.0rc1.dist-info}/top_level.txt +0 -0
{dkist_processing_common-11.3.1rc1.dist-info → dkist_processing_common-11.4.0rc1.dist-info}/RECORD RENAMED
@@ -1,7 +1,5 @@
1
1
  changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
2
- changelog/265.feature.1.rst,sha256=lLp6JB7V2_-MReT_JhpcWTnGo-8G9lYf48jGbGGoS5k,221
3
- changelog/265.feature.rst,sha256=j1XZx2gNHkDdz8ntXhcM4oUJrw1EeTTI96FnpqVmhV0,312
4
- changelog/265.misc.rst,sha256=bkbBVTaDAMh13gXqtIwrJaBTXXcNmYFlKGaYYrIDmq4,159
2
+ changelog/266.misc.rst,sha256=5yvMMAn3qAkY4NgLSgc-7dFzJdBTfWTu1J_TwCzd_eM,107
5
3
  dkist_processing_common/__init__.py,sha256=GQ9EBnYhkOnt-qODclAoLS_g5YVhurxfg1tjVtI9rDI,320
6
4
  dkist_processing_common/config.py,sha256=OCqMjIV9mDvsWX_nvwS_v1W3chAhfA52wQVVXjCQwe8,4248
7
5
  dkist_processing_common/manual.py,sha256=bIVVyLsbXMh-g_2L3kGROL-1TtJe0_XviHsp7Br31x8,7023
@@ -24,9 +22,9 @@ dkist_processing_common/codecs/str.py,sha256=Xqt5k8IhLc95KiiNiFwB1JWcVVc6T8AfcLr
24
22
  dkist_processing_common/fonts/Lato-Regular.ttf,sha256=1jbkaDIx-THtoiLViOlE0IK_0726AvkovuRhwPGFslE,656568
25
23
  dkist_processing_common/fonts/__init__.py,sha256=hBvZRtkoGRPlNDWCK-ZePXdSIlThCcjwBDfYaamVgAw,101
26
24
  dkist_processing_common/models/__init__.py,sha256=6LMqemdzVZ87fRrpAsbEnTtWZ02_Gu_oajsUlwGRH_Q,74
27
- dkist_processing_common/models/constants.py,sha256=oghBiVmtVk7YLkaQ2v8oZ-COHlAhmfjSvO9ZwzXCvLw,5828
25
+ dkist_processing_common/models/constants.py,sha256=PFTyT1Z2I5RnNlwsYospAJyielRj7YJOCrSwvqaOjTE,5442
28
26
  dkist_processing_common/models/dkist_location.py,sha256=6Nk0wvv4R8ptlrV7BXon7abq4YLvmTdUmPsDN5G8nWc,971
29
- dkist_processing_common/models/fits_access.py,sha256=NLxvIsaFrv4Fui1EhGzkV5XXjv-Vi8DQaLfMHOrRdzc,5949
27
+ dkist_processing_common/models/fits_access.py,sha256=hCQa1c9C_iFg7MjdvjXf38GBwQ3HiIYoKmxecJaOw5w,4114
30
28
  dkist_processing_common/models/flower_pot.py,sha256=_J7DwHM8u5kQfdPCpk5pUmALtLrM1L_h-x8JW5BSjXA,5129
31
29
  dkist_processing_common/models/fried_parameter.py,sha256=ro_H2Eo3I88lRf1wJjZfTc_XOjhgLt4whIQR_sjAFbM,1609
32
30
  dkist_processing_common/models/graphql.py,sha256=oSEcdVsVRytnIDEORLs4b6r3C2Lr7gqEEMHu82zpOOg,5912
@@ -36,31 +34,31 @@ dkist_processing_common/models/message_queue_binding.py,sha256=Y4otwkkePrLRSjlry
36
34
  dkist_processing_common/models/metric_code.py,sha256=WSLF9yqcVzk9L9u8WBhgtpUYUWYsG4ZFWFRFtezdUCM,848
37
35
  dkist_processing_common/models/parameters.py,sha256=9An3SxUEBI-oYHjICQ_q-IIScTfpvVeAFH7jLzBzzWI,9649
38
36
  dkist_processing_common/models/quality.py,sha256=TmDVbvPbfl5CIIs1ioD5guLUoEOFTfiJESvDjLTLl5s,3981
39
- dkist_processing_common/models/tags.py,sha256=0YqiDrismOSds_3XtFBb2dfv0gjMs6CgRv2dJKsSthI,12082
40
- dkist_processing_common/models/task_name.py,sha256=uAl7qTK4Xx1nqPAhNAe5nAXqxwPwQzAq58YmoccX6xQ,567
37
+ dkist_processing_common/models/tags.py,sha256=A3ryBjkIkU8FaFcuMka8UZFc53rVWWyZ4OzOqouVgD4,12059
38
+ dkist_processing_common/models/task_name.py,sha256=kTYjHdB_xqMr3hKWN6fn3c0T-Lj4LzJdIYnNXcXkkQI,566
41
39
  dkist_processing_common/models/wavelength.py,sha256=4UhRVoNvCHZitXo5S1oRdewadbmGfmDK6wetMV06POA,967
42
40
  dkist_processing_common/parsers/__init__.py,sha256=XJQzHtPb78F6-qXXKXjyztc0x-aHVlgv1C_l4dR88tI,67
43
- dkist_processing_common/parsers/cs_step.py,sha256=rL2gdstKEV5aqdPDs3a5EuUaOT_6YXDJVqIPIVKSw8M,6450
44
- dkist_processing_common/parsers/dsps_repeat.py,sha256=Jg6oI9-PtFQbQHbGul6_eiRzBKr0Z2HIGOitG0G5CD4,1642
45
- dkist_processing_common/parsers/experiment_id_bud.py,sha256=5ARnj6M5PEef_5-IVD1W6zl5DkYqx8eyt5-26Se-X2s,804
46
- dkist_processing_common/parsers/id_bud.py,sha256=XohLGwVC-AD66qJe6I3AKdm5ArQIf3ryfDzPCQ5hEBk,1688
47
- dkist_processing_common/parsers/l0_fits_access.py,sha256=gbE_4vFexOeKNLvqWvUFNxg-zBRpY1rCfRpIWHFpt_0,1009
48
- dkist_processing_common/parsers/l1_fits_access.py,sha256=dJbbKRExoRpl94cSpgZg5SQZLh4tkV8p0vsKO8P8FLE,2814
49
- dkist_processing_common/parsers/near_bud.py,sha256=lOHrjERKh3ooFusbd3_N-IDDpEOD9VWq2G82_wJ2c08,4002
50
- dkist_processing_common/parsers/proposal_id_bud.py,sha256=tKW8dwh7XkECU1Z0T1E4AHj42emV3-RRVBBpVUZloTk,753
41
+ dkist_processing_common/parsers/cs_step.py,sha256=HQIFq1bVnK-0cOhAziMivmNqxtzQ5SWpTjrLXpJDQdg,6462
42
+ dkist_processing_common/parsers/dsps_repeat.py,sha256=mb-PRK2M8ZJyGqEMdtiiem82iOgxwn0dMBw_yY5gSi8,1573
43
+ dkist_processing_common/parsers/experiment_id_bud.py,sha256=6XlkpmGcHEAK-SKOcux0WuFIsMh_DzX5ANXQhfgPp4Q,707
44
+ dkist_processing_common/parsers/id_bud.py,sha256=sebLspD1t4aQ1Ughz9RHjyCAUidF5YLIDOVyv6J0Zmk,1538
45
+ dkist_processing_common/parsers/l0_fits_access.py,sha256=hA6AHDA4sNSJCBFxWnzjKEQ9xXWk5YY95E3Zmtp36wY,922
46
+ dkist_processing_common/parsers/l1_fits_access.py,sha256=3bQgtugs2TihUhm-72_yLEeXxuSnfTsHLcNBDHt9Yms,2596
47
+ dkist_processing_common/parsers/near_bud.py,sha256=mXJedJxAHmQTpEAkzRrwv5SSZnb_7ssq2PEdkhHGVdE,3866
48
+ dkist_processing_common/parsers/proposal_id_bud.py,sha256=lv8k_wFThtDC5w1dXVROTvfQHDXMpmRAjbsjhT_TjhU,678
51
49
  dkist_processing_common/parsers/quality.py,sha256=hhCT-bHODOYSp9jvgsiWfYcLYtQCSWgfuy0xZnkYXwo,1141
52
- dkist_processing_common/parsers/retarder.py,sha256=AvDrMLmxuwKOIP3NNm9mtV7dV2kw_aqW92hTLd1UdK0,1507
53
- dkist_processing_common/parsers/single_value_single_key_flower.py,sha256=3mcPOG6dEU7IHWm0Jtjx3FVzbxAJCiKtLyVwZqFd2lA,1425
54
- dkist_processing_common/parsers/task.py,sha256=nuGxDl5_gjbi07jMOrCPD5J9L51lyZZ6VS25FuDC3V8,3990
55
- dkist_processing_common/parsers/time.py,sha256=z9zHV3Fz6ebEDgiPhv6H-aAS8e-sSW3EkBbPbtHpzGY,8576
56
- dkist_processing_common/parsers/unique_bud.py,sha256=IkS2zZkVzn3PRsYF2ksBkUxl_HJ4TxCqBKJUs1WdL54,3310
57
- dkist_processing_common/parsers/wavelength.py,sha256=P5C9mG8DAKK3GB3vWNRBI5l7pAW68lJK-kw-4eqERuQ,612
50
+ dkist_processing_common/parsers/retarder.py,sha256=YZ1VX9fUerYbyhT-RXSdvPCu-u4_oP4Ob5OpXyRTaiY,1442
51
+ dkist_processing_common/parsers/single_value_single_key_flower.py,sha256=PbiYBcePLHjkF7Hc050PO_qhAsisT_EvVL9npz15AGE,1231
52
+ dkist_processing_common/parsers/task.py,sha256=axjAPAU230KTVHaLx6_qidoPEwDB31_mRG3IZZnTUX0,3939
53
+ dkist_processing_common/parsers/time.py,sha256=M6GQPoEuFaU3ZokyKh1tXrc0yDR_cl0FamEK7BaskCM,8371
54
+ dkist_processing_common/parsers/unique_bud.py,sha256=TMj6RqACgRnMG2Pm36pj1Y-KWkImIBo0F_91b6H6mDo,3174
55
+ dkist_processing_common/parsers/wavelength.py,sha256=_XYJZqxw-sbzVi2NQyG_aqcQ5XOH1uBhckNIPMm0fEg,547
58
56
  dkist_processing_common/tasks/__init__.py,sha256=l23ctjNsKJbHbbqaZBMeOPaOtw0hmITEljI_JJ-CVsU,627
59
57
  dkist_processing_common/tasks/assemble_movie.py,sha256=m8O1psUBn8bRPj0AwMd1K5wNlcAtlxBQb1PZeSKne6o,12772
60
58
  dkist_processing_common/tasks/base.py,sha256=mebbG-VZp9Iu-J7skE9S5qMCUENZy48ySJkaGh8weC0,13144
61
59
  dkist_processing_common/tasks/l1_output_data.py,sha256=jjJao1YO88sgsKfl6Lg11yurlM1bcljOZpK1-ykFWw4,10576
62
60
  dkist_processing_common/tasks/output_data_base.py,sha256=ZWdxkXKzrQdc1PN97b8cEcFBckraOJkwrBoMOPWii8o,3683
63
- dkist_processing_common/tasks/parse_l0_input_data.py,sha256=Apa1qG6TAVll_oCGp5aSZb_j_ywNnu1GmYNnpjvHqH4,8133
61
+ dkist_processing_common/tasks/parse_l0_input_data.py,sha256=B7ZYzT2jFPlzaSq92LgisZQIjqeFD123qTa8KeyLKSQ,7998
64
62
  dkist_processing_common/tasks/quality_metrics.py,sha256=5rLCkGyE6F76bJp71y2lmKbol5FJ_ynbZbkhX8IBPKA,12489
65
63
  dkist_processing_common/tasks/teardown.py,sha256=eHyOJbtu8w51wFSTVFSt8iVVOkSODqHLvrcP6W-Szcg,2355
66
64
  dkist_processing_common/tasks/transfer_input_data.py,sha256=hjJzgwCVqltF87IMa2Oi9hmKyT0mFqwvPCI8xTV2B44,5787
@@ -78,14 +76,14 @@ dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=k0hlthVbW7Jso9q_P
78
76
  dkist_processing_common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
79
77
  dkist_processing_common/tests/conftest.py,sha256=Tm-Yq956EAafpDtu1d7JjdVY0Unp9e4z9ak-yf4wnH4,22320
80
78
  dkist_processing_common/tests/mock_metadata_store.py,sha256=fbCvSk1-s0ojN6l538RWodPW7dx6k4eXqipemnHKO0Y,8248
81
- dkist_processing_common/tests/test_assemble_movie.py,sha256=dyVhowxB-Kc6GuxlDs74UrPtK9fwdUL7y5haA3Bidz0,4065
79
+ dkist_processing_common/tests/test_assemble_movie.py,sha256=RI7Kitd-XNmba-o5pUgqURocXPFi15T-mEvWaSbsN6U,4125
82
80
  dkist_processing_common/tests/test_assemble_quality.py,sha256=-F22jMY6mPy65VZ1TZY2r1vsxMXOPmZHArGx70OD3BA,17832
83
81
  dkist_processing_common/tests/test_base.py,sha256=EQsIkeWoOtjk0yxr_oPkhW3Uc0p8cMsknSMwKgrJI9E,7078
84
82
  dkist_processing_common/tests/test_codecs.py,sha256=XuvG1sG8DECMPmxtDEi98TxlvTSAy0vrtUUFLrwnHlA,22173
85
- dkist_processing_common/tests/test_constants.py,sha256=I_KcJs7ScCn53GYhEO6qjWrrnfZuyC1IVYOy87Pjlg4,6565
83
+ dkist_processing_common/tests/test_constants.py,sha256=Kc9k5TdYy5QkRRlGav6kfI2dy5HHKqtpf9qOuaAfDZU,5903
86
84
  dkist_processing_common/tests/test_cs_step.py,sha256=RA0QD3D8eaL3YSOL_gIJ9wkngy14RQ2jbD-05KAziW4,2408
87
85
  dkist_processing_common/tests/test_dkist_location.py,sha256=-_OoSw4SZDLFyIuOltHvM6PQjxm5hTiJQsiTGZ8Sadc,456
88
- dkist_processing_common/tests/test_fits_access.py,sha256=IYLrGRq71ve_yKJA6N-Gxz2-r9iISExwM8Zt6bB-jJI,13832
86
+ dkist_processing_common/tests/test_fits_access.py,sha256=tyUPNbUqoTPhQgzua_doWP9l9ee4ir_LLV-I9rHktcs,11393
89
87
  dkist_processing_common/tests/test_flower_pot.py,sha256=X9_UI3maa3ZQncV3jYHgovWnawDsdEkEB5vw6EAB96o,3151
90
88
  dkist_processing_common/tests/test_fried_parameter.py,sha256=iXtlQIifZ6cDOkEi-YDgP3oAlss2loq08Uohgvy1byQ,1295
91
89
  dkist_processing_common/tests/test_input_dataset.py,sha256=pQ01rWAkQ2XQojyHWzAqeOdrMXshNcgEVL5I_9bBTdo,9610
@@ -94,16 +92,16 @@ dkist_processing_common/tests/test_interservice_bus_mixin.py,sha256=IptJkW7Qeu2Y
94
92
  dkist_processing_common/tests/test_manual_processing.py,sha256=iHF7yQPlar9niYAGXtFv28Gw3Undlds38yMfszk4ccY,1037
95
93
  dkist_processing_common/tests/test_output_data_base.py,sha256=D8b1XKvbE3C5cGOiHq58yJ2pzQL3iL0wLZy_AkDdB9Y,3085
96
94
  dkist_processing_common/tests/test_parameters.py,sha256=CUEUIGBPMCUXPll0G0UxFDbMXi8lmnjRwXBarGX1PAQ,14033
97
- dkist_processing_common/tests/test_parse_l0_input_data.py,sha256=rwmtQJQo7SNdzPVzMOFxXS35H_nOLWYgbZsc9QuMEgc,10503
95
+ dkist_processing_common/tests/test_parse_l0_input_data.py,sha256=ufhn-wXk9gAag6a99f7bXUvqFdlgOKmT2Dm5qlCU9Ag,10630
98
96
  dkist_processing_common/tests/test_publish_catalog_messages.py,sha256=l6Wga1s2wNBIf4wGZ78ZIO_rtqjdidmtvlN9nMnQUAs,3222
99
97
  dkist_processing_common/tests/test_quality.py,sha256=IPz7liXcmoqWIsY78oX07Ui0nWHxoUH2FbKGEmMle7E,10258
100
98
  dkist_processing_common/tests/test_quality_mixin.py,sha256=qanm3SXEiLb0OJDawbh8ixVAG9uRglFMzwxTeYxkDsM,55369
101
99
  dkist_processing_common/tests/test_scratch.py,sha256=WO8C1VJlkcC5IzST9Hj08CyyrINwYcN8pyteD9x38xs,16482
102
- dkist_processing_common/tests/test_stems.py,sha256=8Im6TtEEwkU6MN5wAAbq2gL4Z5bCQp-rbVH_QEdc880,32316
100
+ dkist_processing_common/tests/test_stems.py,sha256=4BWY5lMfCdDOiSvK7EobmhX6gHJupO6B1ci6dqyyWcQ,32649
103
101
  dkist_processing_common/tests/test_submit_dataset_metadata.py,sha256=LHEyjoIxJHXXssqKkr8Qn1NzzHD1FLJiD3lP8yaLiXU,3764
104
102
  dkist_processing_common/tests/test_tags.py,sha256=w5gmVfp3Ck92KNV80lJQRMz0OYgTYzWtwVUFWv1b5i8,5024
105
103
  dkist_processing_common/tests/test_task_name.py,sha256=kqFr59XX2K87xzfTlClzDV4-Je1dx72LvdaJ22UE8UU,1233
106
- dkist_processing_common/tests/test_task_parsing.py,sha256=leXQrIWU5CIkUWRaiG0hW4NCmFtlpxHNsgl4Jz2EghA,4368
104
+ dkist_processing_common/tests/test_task_parsing.py,sha256=QXt1X6DTO3_liBD2c-t84DToLeEn7B3J-eteIyN4HEM,4027
107
105
  dkist_processing_common/tests/test_teardown.py,sha256=DaliHSGsiQBZaFkf5wb3XBo6rHNPmx2bmQtVymYeBN4,5601
108
106
  dkist_processing_common/tests/test_transfer_input_data.py,sha256=eyAAWXpTHQ8aew87-MncWpYBn4DAZrTSOL3LvlQfR5Q,12611
109
107
  dkist_processing_common/tests/test_transfer_l1_output_data.py,sha256=PVGDJBEUk4kAeu8ivrhlCE7yd29R18t9kZLFx-mpBwY,2063
@@ -119,7 +117,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
119
117
  docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
120
118
  docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
121
119
  licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
122
- dkist_processing_common-11.3.1rc1.dist-info/METADATA,sha256=maWEsyuHt4CVUBIsUA8fh1jtF-XcyFQq21s_E810K4g,7204
123
- dkist_processing_common-11.3.1rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
124
- dkist_processing_common-11.3.1rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
125
- dkist_processing_common-11.3.1rc1.dist-info/RECORD,,
120
+ dkist_processing_common-11.4.0rc1.dist-info/METADATA,sha256=3GwCMs5Qw11nvxhrzdOIEIf07F8ZIQ3_Q5Rs-WW0nBI,7207
121
+ dkist_processing_common-11.4.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
122
+ dkist_processing_common-11.4.0rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
123
+ dkist_processing_common-11.4.0rc1.dist-info/RECORD,,
changelog/265.feature.1.rst DELETED
@@ -1,3 +0,0 @@
1
- Add `_set_metadata_key_value` method to FitsAccessBase that takes a StrEnum and sets
2
- a class attribute. The attribute name is the StrEnum name and the attribute value
3
- gets the header value with the StrEnum value as key.
changelog/265.feature.rst DELETED
@@ -1,4 +0,0 @@
1
- Create new MetadataKey string enum class. Replace usages like `metadata_key="keyword_name"`
2
- with `metadata_key=MetadataKey.keyword_name`. Note that unlike other enum classes, we are using
3
- the name, not the value. Stem bases now check if they are passed a MetadataKey, and take
4
- the name as the required string.
changelog/265.misc.rst DELETED
@@ -1,2 +0,0 @@
1
- Change classes that inherit from `str` and `Enum` to inherit `StrEnum` instead: BudName, StemName, TaskName. Convert
2
- strings to class members where relevant.