Branch 14 10 2014

trkpt & trkdcabs; KeepGENOnly; Jpsi & Psi(2S)
@xshi @nsahoo