P11 update 2 - Separate set of changes to some general files

[agruzinov]

Here is another part of P11 files and additional cherry-picking on the P11-related HO as a part of cumulative update from work on P11 with Bixente and Jan.

There were also couple of commits on queue_entry.py, like disabling the wait for a result from EDNA because it is not fully implemented yet. Where it could be placed? Should there be separate entry for the queue entry implementation on P11?

For example:

collection_plan = strategy_result.getCollectionPlan() else: collection_plan = None log.debug("collection plan is %s. IGNORD FOR NOW" % str(collection_plan))

        # if collection_plan:
        if False:
            if char.auto_add_diff_plan:
                # default action
                self.handle_diffraction_plan(self.edna_result, None)

Thanks!

Andrey

[agruzinov]

Thanks for all suggestions!

[beteva]

@agruzinov thanks for updating the Tango part.

[agruzinov]

Main contributions came from Bixente and Jan. I've jumped in later :) Hopefully, it can be merged soon.

[rhfogh]

I'd say you could merge it now, if you want - both Antonia and I have OK'ed it. Unless you think that Marcus has to express himself as well?

[marcus-oscarsson]

Looks good :)