refactor logictreeprocessor to pass it to calculators
merge commit