Merge pull request #401 from aaronwmorris/dev

pull bayer pattern from FITs header instead of indi properties

Author: aaronwmorris

indi_allsky/allsky.py

@@ -196,6 +196,7 @@ def sighup_handler(self, signum, frame):
 
         # CFA/Debayer setting
         if not self.config.get('CFA_PATTERN'):
+            # this is not always populated
             self.config['CFA_PATTERN'] = self.config['CCD_INFO']['CCD_CFA']['CFA_TYPE'].get('text')
 
 
@@ -433,6 +434,7 @@ def _initialize(self, connectOnly=False):
 
         # CFA/Debayer setting
         if not self.config.get('CFA_PATTERN'):
+            # this is not always populated
             self.config['CFA_PATTERN'] = self.config['CCD_INFO']['CCD_CFA']['CFA_TYPE'].get('text')
 
         logger.info('CCD CFA: {0:s}'.format(str(self.config['CFA_PATTERN'])))

indi_allsky/darks.py

@@ -866,7 +866,7 @@ def stack(self, tmp_fit_dir_p, filename_p, exposure, image_bitpix):
 
         dark_images = ccdproc.ImageFileCollection(tmp_fit_dir_p)
 
-        cal_darks = dark_images.files_filtered(imagetyp='Dark Frame', exptime=exposure, include_path=True)
+        cal_darks = dark_images.files_filtered(exptime=exposure, include_path=True)
 
 
         start = time.time()

indi_allsky/image.py

@@ -229,24 +229,24 @@ def saferun(self):
                 hdulist = fits.open(filename_p)
 
                 #logger.info('HDU Header = %s', pformat(hdulist[0].header))
-                image_type = hdulist[0].header['IMAGETYP']
                 image_bitpix = hdulist[0].header['BITPIX']
+                image_bayerpat = hdulist[0].header.get('BAYERPAT')
 
                 scidata = hdulist[0].data
             elif filename_p.suffix in ['.jpg', '.jpeg']:
                 self.indi_rgb = False
 
                 scidata = cv2.imread(str(filename_p), cv2.IMREAD_UNCHANGED)
 
-                image_type = 'Light Frame'
                 image_bitpix = 8
+                image_bayerpat = None
             elif filename_p.suffix in ['.png']:
                 self.indi_rgb = False
 
                 scidata = cv2.imread(str(filename_p), cv2.IMREAD_UNCHANGED)
 
-                image_type = 'Light Frame'
                 image_bitpix = 8
+                image_bayerpat = None
             elif filename_p.suffix in ['.dng']:
                 if not rawpy:
                     filename_p.unlink()
@@ -260,7 +260,6 @@ def saferun(self):
                 hdu = fits.PrimaryHDU(scidata)
                 hdulist = fits.HDUList([hdu])
 
-                hdulist[0].header['IMAGETYP'] = 'Light Frame'
                 hdulist[0].header['EXPTIME'] = float(exposure)
                 #hdulist[0].header['XBINNING'] = 1
                 #hdulist[0].header['YBINNING'] = 1
@@ -270,13 +269,13 @@ def saferun(self):
                     hdulist[0].header['XBAYROFF'] = 0
                     hdulist[0].header['YBAYROFF'] = 0
 
-                image_type = hdulist[0].header['IMAGETYP']
                 image_bitpix = hdulist[0].header['BITPIX']
+                image_bayerpat = hdulist[0].header.get('BAYERPAT')
 
 
 
             filename_p.unlink()  # no longer need the original file
-            logger.info('Detected image type: %s, bits: %d', image_type, image_bitpix)
+            logger.info('Detected image bits: %d, cfa: %s', image_bitpix, str(image_bayerpat))
 
 
 
@@ -306,7 +305,7 @@ def saferun(self):
                 self.sqm_value = self.calculateSqm(scidata, exposure)
 
                 # debayer
-                scidata = self.debayer(scidata)
+                scidata = self.debayer(scidata, image_bayerpat)
 
             else:
                 # data is probably RGB
@@ -1025,16 +1024,22 @@ def calibrate(self, scidata_uncalibrated, exposure, camera_id, image_bitpix):
         return scidata_calibrated
 
 
-    def debayer(self, scidata):
-        if not self.config['CFA_PATTERN']:
+    def debayer(self, scidata, image_bayerpat):
+        # sanity check
+        if not len(scidata.shape) == 2:
+            # color, already debayered
             return scidata
 
+        if not image_bayerpat:
+            return scidata
+
+
         if self.config.get('NIGHT_GRAYSCALE') and self.night_v.value:
-            debayer_algorithm = self.__cfa_gray_map[self.config['CFA_PATTERN']]
+            debayer_algorithm = self.__cfa_gray_map[image_bayerpat]
         elif self.config.get('DAYTIME_GRAYSCALE') and not self.night_v.value:
-            debayer_algorithm = self.__cfa_gray_map[self.config['CFA_PATTERN']]
+            debayer_algorithm = self.__cfa_gray_map[image_bayerpat]
         else:
-            debayer_algorithm = self.__cfa_bgr_map[self.config['CFA_PATTERN']]
+            debayer_algorithm = self.__cfa_bgr_map[image_bayerpat]
 
         scidata_bgr = cv2.cvtColor(scidata, debayer_algorithm)
 

indi_allsky/version.py

@@ -1,3 +1,3 @@
-__version__ = "5.4"
+__version__ = "5.5"
 __config_version__ = 20221023.0