Adding Btag information and commenting out Calo-Jets