#2326: Adapted code in the diversity analyzers according to the new base class. Improved wiring of similarity calculators and analyzers.