Tree Identification

Are the needles generally less than 2" long and in groups of 1-4; the cones 1-2" long with few scales; the edible seeds large and without wings? 

These are pinyon pines.

Are the needles generally more than 2" long and in groups of 2-3; the cones longer than 2" with many scales; the seed size varies?