Updates to XRF and EnergyScan abstract classes, Characterisation and minor fixes

[marcus-oscarsson]

Updates to XRF and EnergyScan abstract classes, Characterisation and minor fixes:

• General fixes related to linting and name changes
• Updates made to XRF and EnergyScan abstract classes.
• Speed up and options added to characterization
• Handling of run number at directory level

[github-actions[bot]]

Coverage Report •

File	Stmts	Miss	Cover	Missing
mxcubecore/HardwareObjects
BeamlineActions.py	178	178	0%	1–285
EDNACharacterisation.py	323	323	0%	1–519
GenericDiffractometer.py	707	363	49%	39–53, 121, 343–344, 354–357, 360–380, 385–386, 388, 393–394, 422–431, 439, 452–468, 472–473, 478–480, 490–492, 509, 512, 514, 516, 518, 520, 522, 526, 618, 623–625, 635, 649–654, 661, 668, 675, 683–705, 711–717, 721, 727, 733, 739, 745, 749, 755, 766–773, 786–787, 791–792, 800, 808, 813–841, 846–868, 872–889, 895–926, 934–961, 967–1003, 1007, 1011, 1021–1024, 1032–1071, 1075, 1079–1085, 1096, 1123, 1131–1132, 1139–1145, 1153–1156, 1164–1170, 1176–1181, 1187–1188, 1194, 1200–1204, 1210–1224, 1233, 1239, 1243, 1253–1265, 1269–1283, 1289, 1295, 1299, 1302, 1309, 1321–1332, 1336–1338, 1342–1343, 1347–1348, 1356, 1375–1380, 1386–1388, 1394–1419, 1425, 1431, 1434, 1438, 1442, 1445, 1448, 1451–1452, 1455–1473, 1476–1492, 1495–1498
ISPyBClient.py	1334	1334	0%	1–2560
LimaEigerDetector.py	130	130	0%	4–313
Microdiff.py	304	304	0%	1–773
MiniDiff.py	613	613	0%	1–1122
SampleView.py	295	91	69%	68, 74, 80, 83, 92, 101–106, 109, 157–163, 238, 325–332, 335–344, 347–353, 394, 397, 422–426, 430–435, 438–452, 466, 473–476, 483–486, 500, 503–504, 543–544, 550, 556–561, 568–569, 572, 575–594
Session.py	174	168	3%	16–408
XMLRPCServer.py	402	402	0%	8–731
XRFSpectrum.py	291	291	0%	1–424
XSDataMXCuBEv1_4.py	1692	1692	0%	7–2757
XSDataMXv1.py	11174 11174	0%	0%	7–18875
sample_centring.py	280	265	5%	12–37, 42–50, 53, 56, 60–662
mxcubecore/HardwareObjects/Native
__init__.py	45	45	0%	3–136
mxcubecore/HardwareObjects/abstract
AbstractDetector.py	128	34	73%	92–93, 105–111, 127, 140, 154, 161–162, 169, 176, 197, 204, 240, 257–258, 281–282, 322, 329, 332–340, 352–355
AbstractEnergyScan.py	95	95	0%	1–216
AbstractMultiCollect.py	682	682	0%	1–1363
AbstractXRFSpectrum.py	110	110	0%	21–217
mxcubecore/HardwareObjects/mockup
EnergyScanMockup.py	191	191	0%	1–474
ISPyBClientMockup.py	202	202	0%	5–712
MultiCollectMockup.py	182	182	0%	1–316
mxcubecore/model
queue_model_objects.py	1432	1135	21%	38–39, 53–64, 68, 74, 84, 91, 98, 109–112, 124, 131, 142–147, 150–158, 161, 164–171, 174–181, 184, 187, 190, 193, 196, 199, 202, 205, 209, 212, 215, 218, 221–229, 232–233, 236–238, 243–247, 250, 257–259, 264–266, 271–274, 277–278, 283–310, 313–314, 317, 320–325, 328, 331–334, 337–344, 347–464, 467–486, 489–499, 509–513, 517, 520–535, 538, 541, 544, 547, 550, 553, 556–563, 597–626, 630, 634–638, 666–668, 671, 674, 677, 680, 683, 689, 692, 695, 698, 701, 704–707, 710–713, 718, 721–722, 725–738, 746–747, 755–756, 764, 772–794, 797–798, 801, 804, 809, 814–827, 830, 849–868, 872, 875, 878, 883, 886, 889–893, 896, 903, 908–911, 919–920, 928–934, 937, 946–987, 990, 1026–1028, 1031–1033, 1038–1055, 1058, 1061, 1064, 1067, 1070, 1073, 1076, 1079, 1082–1083, 1086–1097, 1100–1107, 1110, 1115–1134, 1143–1160, 1163, 1166, 1169, 1172–1173, 1176–1182, 1185, 1188, 1191, 1194, 1197, 1200–1207, 1210, 1215–1218, 1223–1252, 1255, 1258, 1261–1263, 1266, 1285–1295, 1298, 1301, 1304, 1307, 1310, 1313, 1316–1319, 1332–1354, 1373–1388, 1391, 1394, 1397, 1400, 1403, 1406, 1409, 1412–1415, 1425–1434, 1437, 1440, 1445–1448, 1461–1475, 1483, 1487–1488, 1492–1493, 1497, 1501–1515, 1518–1534, 1537, 1554–1556, 1559–1570, 1573–1574, 1577–1578, 1588–1639, 1642–1649, 1652–1663, 1666–1673, 1676, 1679–1692, 1695, 1700–1740, 1743–1748, 1751, 1790, 1795–1814, 1817, 1820, 1838–1849, 1852–1854, 1897–1899, 1902–1906, 1909, 1912–1926, 1929, 1932, 1935, 1938, 1941, 1944, 1949–1953, 1956, 1959, 1962, 1967–2034, 2038–2067, 2070–2072, 2104–2184, 2214–2251, 2262–2378, 2383, 2388, 2393, 2398, 2403, 2408, 2411, 2416, 2420–2425, 2430–2435, 2446–2452, 2461–2482, 2501–2504, 2514–2533, 2536, 2542, 2545, 2550–2553, 2597–2678, 2697–2704, 2735–2743, 2771–2817, 2821–2824
mxcubecore/queue_entry
__init__.py	22	22	0%	19–106
characterisation.py	136	136	0%	19–258
energy_scan.py	104	104	0%	19–236
xrf_spectrum.py	73	73	0%	19–162
TOTAL	60243	56092	7%

Tests	Skipped	Failures	Errors	Time
1921	0 :zzz:	0 :x:	0 :fire:	1m 39s :stopwatch:

[marcus-oscarsson]

:), thanks for the review. Enjoy the WE !