Merge branch 'develop' into wcs_test

ObservationSim/Straylight/Straylight.py

@@ -548,8 +548,8 @@ class Straylight(object):
     
     def calculateStrayLightFilter(self, filter = 'i', pixel_size_phy = 10, pixel_scale = 0.074):
         e1,py = self.calculateEarthShineFilter(filter = filter, pixel_size_phy = pixel_size_phy)
-        e2, _ = self.calculateZodiacalFilter2(filter = 'i', sun_pos=self.sun_pos, pixelsize = pixel_scale)
-        e3 = self.calculateStarLightFilter(filter = 'i',pointYaxis = py, pixel_size_phy = pixel_size_phy)
+        e2, _ = self.calculateZodiacalFilter2(filter = filter, sun_pos=self.sun_pos, pixelsize = pixel_scale)
+        e3 = self.calculateStarLightFilter(filter = filter,pointYaxis = py, pixel_size_phy = pixel_size_phy)
         
         return e1+e2+e3