panoramer

Hi there, I do a lot of HDR panoramas. What I try to accomplish is to get stars on street lights on cityscapes. But whenever I try to go for a higher F-Stop I get diffraction around to city lights. Does anyone of you have some experience? X-E1 with 14mm Thanks