Thanks J, I'd previously placed photos of Cacti #1 at the entry for
Candelabra Tree (Euphorbia ingens) because that's what someone identified it as but the photos at that entry all look different to me and nothing like the photos I took in San Diego. One photo at that entry looks like another of a cactus I saw in San Diego that someone identified as
Euphorbia (Euphorbia candelabrum) but it doesn't look anything like your photos of E. candelabrum so I'm thinking my photo there is in the wrong place too.
