Adapt to ROOT6 change in ROOT API
Merge pull request #1269 from wmtan/AdaptToRoot6APIChange

Adapt to ROOT6 change in ROOT API