ptwrapper 2.7.4__tar.gz → 2.7.6__tar.gz

{ptwrapper-2.7.4 → ptwrapper-2.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ptwrapper
-Version: 2.7.4
+Version: 2.7.6
 Summary: A Pointing Tool OSVE wrapper
 License: European Space Agency Public License (ESA-PL) Permissive (Type 3) – v2.4
 License-File: LICENSE.txt
@@ -22,8 +22,9 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
+Requires-Dist: beautifulsoup4 (>=4.14.3)
 Requires-Dist: numpy (>=1.26.4)
-Requires-Dist: osve (==2.7.5)
+Requires-Dist: osve (==2.7.6)
 Requires-Dist: spiceypy (>=5.1.2)
 Project-URL: Documentation, https://juicesoc.esac.esa.int/panel/#/navigation/help
 Project-URL: Homepage, https://gitlab.esa.int/juice-soc-public/python/ptwrapper

{ptwrapper-2.7.4 → ptwrapper-2.7.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ptwrapper"
-version = "2.7.4"
+version = "2.7.6"
 description = "A Pointing Tool OSVE wrapper"
 authors = [
     "Marc Costa <marc.costa@ext.esa.int>",
@@ -36,9 +36,10 @@ ptwrapper = 'ptwrapper.cli:cli'
 
 [tool.poetry.dependencies]
 python = ">=3.8 <4.0"
-osve = "=2.7.5"
+osve = "=2.7.6"
 spiceypy = ">=5.1.2"
 numpy = ">=1.26.4"
+beautifulsoup4 =">=4.14.3"
 
 [tool.poetry.dev-dependencies]
 autoflake = "*"

{ptwrapper-2.7.4 → ptwrapper-2.7.6}/src/ptwrapper/config/agm/cfg_agm_jui.xml

@@ -200,11 +200,13 @@
     </Param>
     <Param id="AC_RW_WMM_MOMENTUMMIN" type="PT_VECRW" description="This is the lower limit of the momentum that can be absorbed by the corresponding reaction wheel. This value is used when the 3 reaction wheels are active. In case of 3 reaction wheels there is only one solution to redistribute the momentum among the wheels. For that reason we can check each wheel individually. If the value is set to 0 it indicates that there should be no zero-crossing for the RW." unit="N*m*s">
       <!-- w1, w2, w3, w4 -->
-      -60.0, -60.0, -60.0, 0.0
+      <!-- -60.0, -60.0, -60.0, 0.0 -->
+      -999999, -999999, -999999, 0.0
     </Param>
     <Param id="AC_RW_WMM_MOMENTUMMAX" type="PT_VECRW" description="This is the upper limit of the momentum that can be absorbed by the corresponding reaction wheel. This value is used when the 3 reaction wheels are active. In case of 3 reaction wheels there is only one solution to redistribute the momentum among the wheels. For that reason we can check each wheel individually." unit="N*m*s">
       <!-- w1, w2, w3, w4 -->
-      60.0, 60.0, 60.0, 0.0
+      <!-- 60.0, 60.0, 60.0, 0.0 -->
+      999999, 999999, 999999, 0.0
     </Param>
     <Param id="AC_RW_WMM_MOMENTUMINIT" type="PT_VECRW" description="Initial wheel momentum state for each RW" unit="N*m*s">
       <!-- w1, w2, w3, w4 -->
@@ -215,11 +217,13 @@
     </Param>
     <Param id="AC_RW_WMM_TORQUEMIN" type="PT_VECRW" description="Lower limit of the torque that can be applied instantaneously to the corresponding reaction wheel for the wheel momentum simulation. The wheel momentum simulation algorithm takes into account the previous spacecraft state in order to compute the spacecraft loads." unit="N*m">
       <!-- w1, w2, w3, w4 -->
-      -0.14, -0.14, -0.14, 0.0
+      <!-- -0.14, -0.14, -0.14, 0.0 -->
+      -999999, -999999, -999999, 0.0
     </Param>
     <Param id="AC_RW_WMM_TORQUEMAX" type="PT_VECRW" description="Upper limit of the torque that can be applied instantaneously to the corresponding reaction wheel for the wheel momentum simulation. The wheel momentum simulation algorithm takes into account the previous spacecraft state in order to compute the spacecraft loads." unit="N*m">
       <!-- w1, w2, w3, w4 -->
-      0.14, 0.14, 0.14, 0.0
+      <!-- 0.14, 0.14, 0.14, 0.0 -->
+      999999, 999999, 999999, 0.0
     </Param>
 
     <!-- Attitude constraints check: SA -->

{ptwrapper-2.7.4 → ptwrapper-2.7.6}/src/ptwrapper/subscribers.py

@@ -222,9 +222,14 @@ class OsvePtrLogger(OsvePtrAbstract):
 
     def _check_swi_block_duration(self, observation, block_data):
         violation, message = self._swi_block_duration_check(block_data, observation.get("obsId", "UNKNOWN"))
-        if violation:
-            log('WARNING', 'PTWR', f'{block_data["block_start"]}', message)
-            self.onMsgReceived('WARNING', 'PTWR', f'{block_data["block_start"]}', message)
+        if violation and observation.get("swi_type") == 'PRIME':
+            severity = 'WARNING'
+            log(severity, 'PTWR', f'{block_data["block_start"]}', f'[{observation.get("swi_type")}] {message}')
+            self.onMsgReceived(severity, 'PTWR', f'{block_data["block_start"]}', f'[{observation.get("swi_type")}] {message}')
+        elif violation and observation.get("swi_type") == 'RIDER':
+            severity = 'INFO'
+            log(severity, 'PTWR', f'{block_data["block_start"]}', f'[{observation.get("swi_type")}] {message}')
+            self.onMsgReceived(severity, 'PTWR', f'{block_data["block_start"]}', f'[{observation.get("swi_type")}] {message}')
 
     def _handle_pephi_jeni_checks(self, block_data):
         if self.remove_obs_comp or "observations" not in block_data:
@@ -749,6 +754,10 @@ class OsvePtrLogger(OsvePtrAbstract):
 
             exec_percentage = self._calculate_execution_percentage(time_exec, time_start, time_end)
 
+            ##Temporary fix
+            if "above maximum allowed" in log['text']: 
+                log['severity'] = 'ERROR'
+
             if verbose:
                 print(f"      {log['severity']} , {exec_percentage}, {log['time']} , {log['text']}")