merge with run2011, with fabs fix
take off localv0 candidates
udpate for 2012A