JanusReader 0.2.0__tar.gz → 0.3.0__tar.gz

{JanusReader-0.2.0 → JanusReader-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: JanusReader
-Version: 0.2.0
+Version: 0.3.0
 Author-email: Romolo Politi <Romolo.Politi@inaf.it>
 License: GNU GPL ver3
 Description-Content-Type: text/markdown

{JanusReader-0.2.0 → JanusReader-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "JanusReader"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
     "numpy",
     'importlib-metadata; python_version>"3.10"',

{JanusReader-0.2.0 → JanusReader-0.3.0}/src/JanusReader/janusReader.py

@@ -83,7 +83,39 @@ class AcquisitionParameter:
         tb.add_row("Multifilter","", str(self.multifilter))
         return tb
         
-        
+class OnBoardProcessing:
+    
+    def __init__(self,proc):
+        self.badPixelCorrection = int(getValue(
+            proc, 'juice_janus:bad_pixel_correction'))
+        self.badPixelMapName = getValue(
+            proc, 'juice_janus:bad_pixel_map_name')
+        self.badPixelCount = int(getValue(proc, 'juice_janus:bad_pixel_count'))
+        self.dnsuCorrection = int(getValue(proc, 'juice_janus:dsnu_correction'))
+        self.dnsuMapName = getValue(proc, 'juice_janus:dsnu_map_name')
+        self.spikeMaximumValue = int(
+            getValue(proc, 'juice_janus:spike_maximum_value'))
+        self.spikeDistance = int(getValue(proc, 'juice_janus:spike_distance'))
+        self.spikeCount = int(getValue(proc, 'juice_janus:spike_count'))
+    
+    def Show(self):
+        tb = Table(expand=False, show_header=False,
+                   show_lines=False, box=box.SIMPLE_HEAD,
+                   title="Onboard Processing", title_style="italic yellow")
+        tb.add_column(style='yellow', justify='left')
+        tb.add_column()
+        tb.add_column()
+        tb.add_row("Bad Pixels Correction", "",str(self.badPixelCorrection))
+        tb.add_row("Bad Pixel Map Name","", self.badPixelMapName)
+        tb.add_row("Bad Pixel Count","", str(self.badPixelCount))
+        tb.add_section()
+        tb.add_row("DSNU Correction", "", str(self.dnsuCorrection))
+        tb.add_row("DSNU Map Name","", self.dnsuMapName)
+        tb.add_section()
+        tb.add_row("Spike Maximum Value", "", str(self.spikeMaximumValue))
+        tb.add_row("Spike Distance","", str(self.spikeDistance))
+        tb.add_row("Spike Distance","", str(self.spikeDistance))
+        return tb
 
 class JanusReader:
     """Reader of the JANUS Data File
@@ -185,7 +217,8 @@ class JanusReader:
         
         acqPar = getElement(idObs, "juice_janus:Acquisition_Properties")
         self.AcquisitionParameter=AcquisitionParameter(acqPar)
-        self.onBoardProcessing=None
+        obProc = getElement(idObs, "juice_janus:Onboard_Processing")
+        self.onBoardProcessing=OnBoardProcessing(obProc)
         self.onGroundProcessing=None
         self.HK=None
         self.Downsamplig=None
@@ -204,7 +237,7 @@ class JanusReader:
 
             
         # if self.Format == "HALF":
-        if self.dataDesc.lower()=='raw':
+        if self.level.lower()=='raw':
             with open(self.fileName, 'rb') as f:
                 f.seek(self.Offset)
                 self.image=np.reshape(np.frombuffer(f.read(), dtype=np.uint16),(self.Lines,self.Samples))
@@ -243,7 +276,7 @@ class JanusReader:
         tb.add_row("Pointing Mode", "", self.pointingMode)
         tb.add_row("Observation Identifier", "", self.obsIdentifier)
         tb.add_section()
-        tb.add_row("On Board processing", "",str(self.onBoardProcessing))
+        # tb.add_row("On Board processing", "",str(self.onBoardProcessing))
         tb.add_row("On Ground Processing","",str(self.onGroundProcessing))
         tb.add_row("HK","",str(self.HK))
         tb.add_row("Downsampling","",str(self.Downsamplig))
@@ -251,9 +284,9 @@ class JanusReader:
         tb.add_row("On Board Compression","",str(self.onBoardCompression))
         tb.add_row("SubFrame","",str(self.subFrame))
         tb.add_row("Header","", str(self.Header))
-        tb.add_row("Image","",str(self.image))
+        # tb.add_row("Image","",str(self.image))
         if all:
-            col = Columns([tb, self.AcquisitionParameter.Show()],expand=False)
+            col = Columns([tb, self.AcquisitionParameter.Show(), self.onBoardProcessing.Show()],expand=False)
         else:
             col = tb
         self.console.print(Panel(col ,title=f"Label for {self.fileName.name}", border_style='yellow', expand=False))

{JanusReader-0.2.0 → JanusReader-0.3.0}/src/JanusReader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: JanusReader
-Version: 0.2.0
+Version: 0.3.0
 Author-email: Romolo Politi <Romolo.Politi@inaf.it>
 License: GNU GPL ver3
 Description-Content-Type: text/markdown