Skip to content
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.

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

[WIP] Abstract XRF spectrum #772

Closed
wants to merge 365 commits into from
Closed

[WIP] Abstract XRF spectrum #772

wants to merge 365 commits into from

Conversation

beteva
Copy link
Member

@beteva beteva commented Jul 7, 2023

Clean the AbstractXRFSpectrum.
Specific ESRF implementation, using PyMca as analysis program.

@github-actions
Copy link

github-actions bot commented Jul 7, 2023

Coverage

Coverage Report •
FileStmtsMissCoverMissing
mxcubecore
   CommandContainer.py46721454%94–95, 218–219, 378–389, 395–406, 422–430, 451–452, 462–463, 469–480, 488–509, 526–527, 539, 547, 589–590, 645–662, 665–676, 682–693, 708–716, 738–739, 749–750, 758–841, 846–863, 869–880, 891–892, 902–967
   HardwareRepository.py45223748%49, 96, 99, 109, 120, 124, 131–140, 146–154, 165–170, 194–195, 201–204, 219, 228, 232–237, 285, 289–292, 312–313, 326, 372–375, 378, 385, 389–398, 424–425, 436–443, 453–457, 463–468, 474–480, 483, 487–492, 519–532, 546–547, 561–566, 578–584, 600–607, 613–619, 623–629, 633–639, 654, 662, 669–670, 676, 680, 684, 708–711, 722–727, 738–743, 754, 765–864, 871, 878–880, 883–900, 903–917, 936–992
   Poller.py1276053%34–35, 39, 57–58, 107–108, 111, 117, 120, 123–129, 157–217
   __version__.py161225%9–28
mxcubecore/Command
   Sardana.py2842840%21–502
   Tango.py1738949%45–46, 57–61, 64–77, 80–96, 104–105, 113, 120, 122–135, 140, 192–199, 214–229, 235–238, 245–247, 255–260, 264–277, 281–288, 319–320, 327, 329, 331, 337–350, 353, 356
mxcubecore/HardwareObjects
   Beamline.py31610666%146–160, 262–269, 302, 324, 368, 379, 401, 457, 469, 513, 524, 537, 559, 570, 581, 592, 603, 614, 625, 637, 652, 663, 676, 687, 702, 713, 724, 740, 756, 773–859, 866–876, 879, 882–893
   BeamlineActions.py2072070%1–327
   EDNACharacterisation.py3223220%1–518
   GenericDiffractometer.py70736349%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, 1124, 1132–1133, 1140–1146, 1154–1157, 1165–1171, 1177–1182, 1188–1189, 1195, 1201–1205, 1211–1225, 1234, 1240, 1244, 1254–1266, 1270–1284, 1290, 1296, 1300, 1303, 1310, 1322–1333, 1337–1339, 1343–1344, 1348–1349, 1357, 1376–1381, 1387–1389, 1395–1420, 1426, 1432, 1435, 1439, 1443, 1446, 1449, 1452–1453, 1456–1474, 1477–1493, 1496–1499
   ISARAMaint.py1031883%37–41, 63, 104–106, 185, 196, 198, 205–214
   ISPyBClient.py134413440%1–2585
   ISPyBRestClient.py2442440%4–599
   LdapAuthenticator.py1021020%7–185
   LimaEigerDetector.py1301300%4–313
   MachCurrent.py48480%21–99
   Microdiff.py3043040%1–773
   MiniDiff.py6136130%1–1122
   MotorsNPosition.py1461460%21–284
   QtGraphicsManager.py104310430%19–2319
   QueueManager.py2072070%10–451
   SampleView.py2959169%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
   SardanaMotor.py1341340%1–289
   Session.py1747955%84, 98–99, 113, 149–176, 186–195, 202, 209, 222–228, 239–245, 263, 279–296, 309–323, 326–333, 341–349, 364–373, 380, 387, 394, 401, 408
   TangoMotor.py1301300%19–240
   TangoShutter.py62620%21–145
   XMLRPCServer.py4024020%8–731
   XRFSpectrum.py2912910%1–424
   XSDataMXCuBEv1_4.py169216920%7–2757
   XSDataMXv1.py11174 111740%0%7–18875
   sample_centring.py28025210%12–37, 42, 49, 60–109, 125, 142, 144–146, 165, 186–193, 212–662
mxcubecore/HardwareObjects/Gphl
   CollectEmulator.py1921920%3–378
   GphlMessages.py6416410%3–1338
   GphlWorkflow.py129112910%4–2949
   GphlWorkflowConnection.py6326320%3–1265
   Transcal2MiniKappa.py79790%4–232
mxcubecore/HardwareObjects/Native
   __init__.py45450%3–136
mxcubecore/HardwareObjects/abstract
   AbstractAuthenticator.py13130%22–50
   AbstractCollect.py3953950%21–890
   AbstractDetector.py1283374%92–93, 105–111, 127, 140, 154, 161–162, 169, 176, 197, 204, 257–258, 281–282, 322, 329, 332–340, 352–355
   AbstractEnergyScan.py95950%1–216
   AbstractMachineInfo.py27581%49, 56, 63, 70, 77
   AbstractMultiCollect.py6826820%1–1363
   AbstractXRFSpectrum.py1191786%64, 98–99, 129–134, 139, 176–178, 223–227
mxcubecore/HardwareObjects/mockup
   ActuatorMockup.py41393%64, 105, 107
   BeamMockup.py571279%104–105, 114–115, 124–126, 132–133, 136–137, 140
   BeamlineActionsMockup.py46460%1–76
   DetectorMockup.py30583%55, 61, 64–66
   EnergyScanMockup.py1911910%1–474
   ISPyBClientMockup.py20811744%94, 97–101, 105–131, 145–213, 221, 240, 243, 255–260, 263, 278–282, 298–305, 321, 333, 343, 354, 370, 375–381, 590, 603, 606, 609, 612, 615, 626, 629, 638–642, 645, 658, 661, 668, 683, 686, 689, 692, 695, 698, 701, 704, 725
   ISPyBRestClientMockup.py1031030%4–336
   MotorMockup.py56395%75, 113, 124
   MultiCollectMockup.py1821820%1–316
   SampleChangerMockup.py1112082%44, 47, 58, 73–87, 117, 123, 126, 129, 132, 135, 183
   XRFSpectrumMockup.py9189%42
   XrayCentringMockup.py29290%18–66
mxcubecore/model
   crystal_symmetry.py84840%4–583
   queue_model_objects.py1455115421%37–38, 52–63, 67, 73, 83, 90, 97, 108–111, 123, 130, 141–146, 149–157, 160, 163–170, 173–180, 183, 186, 189, 192, 195, 198, 201, 204, 208, 211, 214, 217, 220–228, 231–232, 235–237, 242–246, 249, 256–258, 263–265, 270–273, 276–277, 282–309, 312–313, 316, 319–324, 327, 330–335, 338–345, 348–465, 468–487, 490–500, 510–514, 518, 521–536, 539, 542, 545, 548, 551, 554, 557–564, 598–627, 631, 635–639, 667–669, 672, 675, 678, 681, 684, 690, 693, 696, 699, 702, 705–708, 711–714, 719, 722–723, 726–739, 747–748, 756–757, 765, 773–795, 798–799, 802, 805, 810, 815–828, 831, 850–869, 873, 876, 879, 884, 887, 890–894, 897, 904, 909–912, 920–921, 929–935, 938, 947–988, 991, 1027–1029, 1032–1034, 1039–1056, 1059, 1062, 1065, 1068, 1071, 1074, 1077, 1080, 1083–1084, 1087–1098, 1101–1108, 1111, 1116–1135, 1144–1161, 1164, 1167, 1170, 1173–1174, 1177–1183, 1186, 1189, 1192, 1195, 1198, 1201–1208, 1211, 1216–1219, 1224–1253, 1256, 1259, 1262–1264, 1267, 1286–1296, 1299, 1302, 1305, 1308, 1311, 1314, 1317–1320, 1333–1355, 1374–1389, 1392, 1395, 1398, 1401, 1404, 1407, 1410, 1413–1416, 1426–1435, 1438, 1441, 1446–1449, 1458–1472, 1498–1512, 1515–1531, 1534, 1551–1553, 1556–1567, 1570–1571, 1574–1575, 1585–1642, 1645–1652, 1655–1666, 1669–1676, 1679, 1682–1695, 1698, 1703–1743, 1746–1751, 1754, 1793, 1798–1817, 1820, 1823, 1841–1852, 1855–1857, 1900–1902, 1905–1909, 1912, 1915–1929, 1932, 1935, 1938, 1941, 1944, 1947, 1952–1956, 1959, 1962, 1965, 1970–2048, 2052–2083, 2086–2088, 2120–2225, 2257–2299, 2307–2429, 2434, 2439, 2444, 2449, 2454, 2459, 2462, 2467, 2471–2476, 2481–2486, 2502–2517, 2535–2538, 2548–2567, 2570, 2576, 2579, 2584–2587, 2631–2712, 2731–2738, 2769–2777, 2805–2851, 2855–2858
mxcubecore/queue_entry
   __init__.py22220%19–106
   advanced_connector.py33330%19–88
   base_queue_entry.py4344340%19–920
   characterisation.py1361360%19–258
   energy_scan.py1041040%19–236
   sample_centring.py55550%19–122
   xrf_spectrum.py59590%19–138
TOTAL60676560258% 

Tests Skipped Failures Errors Time
1933 0 💤 0 ❌ 0 🔥 1m 47s ⏱️

Copy link
Collaborator

@rhfogh rhfogh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine

Andrey Gruzinov and others added 28 commits August 29, 2023 14:52
Corrected incorrect import
Travis CI jobs have been replaced by github actions.
Remove unused travis config file to avoid confusion.
P11 update 2 - Separate set of changes to some general files
marcus-oscarsson and others added 18 commits January 22, 2024 15:56
Use the `--force` flag of `mamba env create` in case environment exists.

Skip `poetry run` when running `sphinx-build`
since Poetry installs in the conda environment directly.

Remove the workaround for the unwarranted error
about "missing `conda.environment`" configuration setting,
because it has been fixed already.
See:
* readthedocs/readthedocs.org#10979 (comment)
* readthedocs/readthedocs.org#11040
Remove hardware objects that are no longer used at MAXIV.

These objects are not maintained anymore, so let's remove them to
cut down on possible future confusion.
Fix the pinned version for `python-ldap`.

Add some explanatory comments.

Remove `pip` since it is already a dependency of `python`.

Remove `openldap` since it is already a dependency of `python-ldap`.
@marcus-oscarsson
Copy link
Member

marcus-oscarsson commented Feb 20, 2024

Still WIP @beteva ?

@beteva
Copy link
Member Author

beteva commented Feb 20, 2024

Yes. I'll rebase and remove the WIP then.

@beteva beteva closed this Feb 28, 2024
@beteva beteva deleted the XRF branch February 28, 2024 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants