merge with master
fix flavor channel hist name
fixed histo initializing