Yes, they used to be separate.  Which I think was rather confusing.  :)

In this demo, the old version would now be equivalent to `drawImage(method='no_pixel')`.  i.e. Don't convolve by the pixel; instead sample the surface brightness at the location of each pixel center, and then multiply that value by the pixel area.  We called that "flux normalization", but if you're not convolving by a pixel, then you don't actually expect the sum of the pixel values to equal the flux.  So what exactly was that supposed to mean?  This combination only makes sense when the pixel convolution is already included in the object being drawn.

I think what we ought to have had in this demo for the optical PSF part is `draw('normalization='sb')`, which corresponds to what I do now.  i.e. just sample the surface brightness at the location of each pixel center.  This seems like the sensible thing to do here.  Why multiply by the pixel area when it isn't actually giving you the flux normalization that it is purportedly supposed to do?