The waterfall you're probably talking about it Eaton Canyon Falls...and it's actually in Pasadena but on Altadena Dr. I've taken my dog hiking back there before. Here's a link to where you can find it...have fun!
http://www.yelp.com/biz/eaton-canyon...enter-pasadena