updates for alex's code, switching to TTrees from TNtuples