Merge branch 'AM_invalidvalue_tistos' into 'master'

Followup from Rec!3337 (improve invalid value handling for tistos)

See merge request !971

Phys/FunTuple/python/FunTuple/functorcollections.py

@@ -169,10 +169,15 @@ def HltTisTos(*, selection_type: str, trigger_lines: List[str],
         DecReports=hlt1_dec,
         TriggerLines=trigger_lines).P2TisTosTable
 
-    hlt1tistos_info = {
-        selection_type: F.VALUE @ F.MAP_TO_RELATED(TisTosRelations)
-    }
-    return FunctorCollection(hlt1tistos_info)
+    hlt1tistos_info = FunctorCollection({
+        f'{line}_TOS': F.IS_TOS(line, TisTosRelations)
+        for line in trigger_lines
+    })
+    hlt1tistos_info += FunctorCollection({
+        f'{line}_TIS': F.IS_TIS(line, TisTosRelations)
+        for line in trigger_lines
+    })
+    return hlt1tistos_info
 
 
 def Kinematics() -> FunctorCollection: