avoid w in root and stau headers (refactor) (#1503)
avoid w in root and stau headers (refactor) (#1503)

* avoid w in root and stau headers (refactor) by substituting in roots
FFroehlich/AMICI,FFroehlich/AMICI,FFroehlich/AMICI,FFroehlich/AMICI