pspipe 0.13__tar.gz → 0.14__tar.gz

{pspipe-0.13 → pspipe-0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pspipe
-Version: 0.13
+Version: 0.14
 Summary: Power spectra pipeline for Cosmic Dawn, Epoch of Reionization radio interferometric experiments
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE

{pspipe-0.13 → pspipe-0.14}/pspipe/tasks.py

@@ -191,10 +191,8 @@ class ImagingSubTask(AbstractSubTask):
                       odd=self.odd if odd is None else odd, img_name=img_name)
         meta.save()
 
-    def done_callback(self):
-        for file in glob.glob(f'{self.get_fits_prefix()}*-MFS-*.fits'):
-            os.remove(file)
-
+    def fits_keywords(self):
+        '''Integration time, total time and channel width of the images, for their headers.'''
         img = self.settings.image
 
         if img.time_start_index != img.time_end_index:
@@ -204,6 +202,15 @@ class ImagingSubTask(AbstractSubTask):
         else:
             total_time = self.obs_meta.total_time
 
+        return {'PEINTTIM': int(self.obs_meta.int_time), 'PETOTTIM': int(total_time),
+                'PECHWIDT': int(self.obs_meta.chan_width)}
+
+    def done_callback(self):
+        for file in glob.glob(f'{self.get_fits_prefix()}*-MFS-*.fits'):
+            os.remove(file)
+
+        img = self.settings.image
+
         if self.even_odd:
             parts = [('-even', True, False), ('-odd', False, True)]
         else:
@@ -220,10 +227,12 @@ class ImagingSubTask(AbstractSubTask):
                 files = glob.glob(f'{prefix}*.fits')
                 img_name = 'image'
 
-            for file in files:
-                pf.setval(file, 'PEINTTIM', value=int(self.obs_meta.int_time))
-                pf.setval(file, 'PETOTTIM', value=int(total_time))
-                pf.setval(file, 'PECHWIDT', value=int(self.obs_meta.chan_width))
+            # psimager writes the keywords with the files (-fits-keyword)
+            if img.imager != 'psimager':
+                keywords = self.fits_keywords()
+                for file in files:
+                    with pf.open(file, mode='update') as hdul:
+                        hdul[0].header.update(keywords)
 
             if not img.lst_bins:
                 self.register_files(files, img_name=img_name, even=even, odd=odd)
@@ -278,6 +287,9 @@ class ImagingSubTask(AbstractSubTask):
 
             args.append(f'-temp-dir {self.temp_dir}')
 
+        if img.imager == 'psimager':
+            args.append(' '.join(f'-fits-keyword {k}={v}' for k, v in self.fits_keywords().items()))
+
         if self.even_odd:
             args.append('-even-odd')
         elif self.even:

{pspipe-0.13 → pspipe-0.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "pspipe"
-version = "0.13"
+version = "0.14"
 description = "Power spectra pipeline for Cosmic Dawn, Epoch of Reionization radio interferometric experiments"
 readme = "README.md"
 license = "GPL-3.0-or-later"