Patches to solutions for cleaner running

likelihoodWP changed name to identificationWP in the release we are now using, so updating accoringly.

We can also be a little neater by using the enumeration rather than the explicit string for the geometry in the python code, so doing that.

@shahzad FYI. Now I will try to change things in main as well...