Add type check and tests for Entity::mergeAndReset

Entity::mergeAndReset now throws an exception if it is passed an Entity of a different type.

A test has also been added to test merges involving Entity objects created in different ways (which caused them to show different types in a previous implementation). The current implementation passes the test.

I was unable to reproduce a bug I had previously seen in Allen (where two Entities with seemingly identical type indices would fail the check). However, the offending code has since been removed in an update to Allen so this is no longer an issue. I suspect the issue may have arisen from comparing between Histograms constructed in code within different Allen libraries but it is no longer practical or necessary to investigate further.

Addresses #207 (closed)

changed the description

resolved all threads

@sponce I see this will clash with !1267 (merged) I don't immediately see a nice way to resolve the clash

resolved all threads

assigned to @clemenci

changed milestone to %v36r3

added lhcb-gaudi-head label

• [2021-11-16 00:03] Automatic merge failed in [lhcb-gaudi-head#3091](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-gaudi-head/3091/Gaudi/checkout
• [2021-11-16 00:32] Automatic merge failed in [lhcb-run2-gaudi-head#229](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run2-gaudi-head/229/Gaudi/checkout
• [2021-11-16 11:46] Automatic merge failed in [lhcb-gaudi-head#3092](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-gaudi-head/3092/Gaudi/checkout
• [2021-11-17 00:04] Automatic merge failed in [lhcb-gaudi-head#3093](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-gaudi-head/3093/Gaudi/checkout
• [2021-11-17 00:42] Automatic merge failed in [lhcb-run2-gaudi-head#230](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run2-gaudi-head/230/Gaudi/checkout
• [2021-11-18 00:04] Automatic merge failed in [lhcb-gaudi-head#3094](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-gaudi-head/3094/Gaudi/checkout
• [2021-11-18 00:38] Automatic merge failed in [lhcb-run2-gaudi-head#231](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run2-gaudi-head/231/Gaudi/checkout
• [2021-11-18 00:55] Automatic merge failed in [lhcb-gaudi-head#3094](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-gaudi-head/3094/Gaudi/checkout
• [2021-11-18 01:09] Automatic merge failed in [lhcb-run2-gaudi-head#231](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run2-gaudi-head/231/Gaudi/checkout
• [2021-11-18 01:41] Automatic merge failed in [lhcb-run2-gaudi-head#231](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run2-gaudi-head/231/Gaudi/checkout
• [2021-11-19 00:06] Automatic merge failed in [lhcb-gaudi-head#3095](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-gaudi-head/3095/Gaudi/checkout
• [2021-11-19 00:59] Automatic merge failed in [lhcb-run2-gaudi-head#232](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run2-gaudi-head/232/Gaudi/checkout
• [2021-11-20 00:06] Validation started with lhcb-gaudi-head#3096
• [2021-11-20 00:58] Validation started with lhcb-run2-gaudi-head#233
• [2021-11-20 01:14] Validation started with lhcb-gaudi-head#3096
• [2021-11-20 01:27] Validation started with lhcb-run2-gaudi-head#233
• [2021-11-20 01:56] Validation started with lhcb-run2-gaudi-head#233
• [2021-11-21 00:03] Validation started with lhcb-gaudi-head#3097
• [2021-11-21 00:26] Validation started with lhcb-run2-gaudi-head#234
• [2021-11-22 00:03] Validation started with lhcb-gaudi-head#3098
• [2021-11-23 00:06] Validation started with lhcb-gaudi-head#3099
• [2021-11-23 00:51] Validation started with lhcb-run2-gaudi-head#235
• [2021-11-24 00:06] Validation started with lhcb-gaudi-head#3100
• [2021-11-24 00:51] Validation started with lhcb-run2-gaudi-head#236
• [2021-11-25 00:04] Validation started with lhcb-gaudi-head#3101
• [2021-11-25 00:47] Validation started with lhcb-run2-gaudi-head#237
• [2021-11-26 00:04] Validation started with lhcb-gaudi-head#3102
• [2021-11-26 00:35] Validation started with lhcb-run2-gaudi-head#238
• [2021-11-27 00:06] Validation started with lhcb-gaudi-head#3103
• [2021-11-27 00:58] Validation started with lhcb-run2-gaudi-head#239
• [2021-11-28 00:06] Validation started with lhcb-gaudi-head#3104
• [2021-11-28 00:39] Validation started with lhcb-run2-gaudi-head#240
• [2021-11-29 00:04] Validation started with lhcb-gaudi-head#3105
• [2021-11-30 00:06] Validation started with lhcb-gaudi-head#3106
• [2021-11-30 00:52] Validation started with lhcb-run2-gaudi-head#241
• [2021-12-01 00:04] Validation started with lhcb-gaudi-head#3107
• [2021-12-01 00:38] Validation started with lhcb-run2-gaudi-head#242
• [2021-12-02 00:06] Validation started with lhcb-gaudi-head#3108
• [2021-12-02 00:45] Validation started with lhcb-run2-gaudi-head#243
• [2021-12-03 00:03] Validation started with lhcb-gaudi-head#3109
• [2021-12-03 00:34] Validation started with lhcb-run2-gaudi-head#244
• [2021-12-04 00:04] Validation started with lhcb-gaudi-head#3110
• [2021-12-04 00:32] Validation started with lhcb-run2-gaudi-head#245
• [2021-12-07 00:03] Validation started with lhcb-gaudi-head#3111
• [2021-12-07 00:25] Validation started with lhcb-run2-gaudi-head#246
• [2021-12-08 00:03] Validation started with lhcb-gaudi-head#3112
• [2021-12-08 00:35] Validation started with lhcb-run2-gaudi-head#247

@dcraik, can you rebase, please?

added 21 commits

• d52fd76c...82b26efb - 19 commits from branch gaudi:master
• e2d2c903 - Test for Monitoring::Hub::Entity::mergeAndReset
• 067ca667 - Add type check to Entity::mergeAndReset

Compare with previous version

mentioned in merge request !1267 (merged)

resolved all threads

mentioned in merge request !1258 (merged)

mentioned in merge request !1278 (merged)

approved this merge request

merged