Moved the setting of estimator to exist for all cases with energyout filters.

Conflicts:
	src/input_xml.F90