lstosa 0.11.4__tar.gz → 0.11.6__tar.gz

{lstosa-0.11.4 → lstosa-0.11.6}/.mailmap

@@ -1,6 +1,7 @@
 Andres Baquero <obaquero@ucm.es> andres-baquero <obaquero@ucm.es>
 
-Daniel Morcuende <dmorcuen@ucm.es> morcuended <dmorcuen@ucm.es>
+Daniel Morcuende <daniel.morcuende@cta-observatory.org> morcuended <dmorcuen@ucm.es>
+Daniel Morcuende <daniel.morcuende@cta-observatory.org> morcuended <dmorcuende@iaa.es>
 
 Jose Luis Contreras <jlcontreras@fis.ucm.es> Jose Contreras <jose.contreras@cp02.ctan.cta-observatory.org>
 Jose Luis Contreras <jlcontreras@fis.ucm.es> Jose Luis Contreras <pda.jl.contreras@gmail.com>

{lstosa-0.11.4 → lstosa-0.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.11.4
+Version: 0.11.6
 Summary: Onsite analysis pipeline for the CTA LST-1
 Author: María Láinez, José Enrique Ruiz, Lab Saha, Andrés Baquero, José Luis Contreras, Maximilian Linhoff
 Author-email: Daniel Morcuende <dmorcuen@ucm.es>

{lstosa-0.11.4 → lstosa-0.11.6}/src/lstosa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.11.4
+Version: 0.11.6
 Summary: Onsite analysis pipeline for the CTA LST-1
 Author: María Láinez, José Enrique Ruiz, Lab Saha, Andrés Baquero, José Luis Contreras, Maximilian Linhoff
 Author-email: Daniel Morcuende <dmorcuen@ucm.es>

{lstosa-0.11.4 → lstosa-0.11.6}/src/osa/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.11.4'
-__version_tuple__ = version_tuple = (0, 11, 4)
+__version__ = version = '0.11.6'
+__version_tuple__ = version_tuple = (0, 11, 6)
 
-__commit_id__ = commit_id = 'gd434a8783'
+__commit_id__ = commit_id = 'g934050aad'

{lstosa-0.11.4 → lstosa-0.11.6}/src/osa/nightsummary/database.py

@@ -14,27 +14,21 @@ __all__ = ["query", "db_available", "get_run_info_from_TCU"]
 
 log = myLogger(logging.getLogger(__name__))
 
-
-CACO_DB = cfg.get("database", "caco_db")
 TCU_DB = cfg.get("database", "tcu_db")
 
-
 def db_available():
     """Check the connection to the TCU database."""
-    caco_client = MongoClient(CACO_DB, serverSelectionTimeoutMS=3000)
     tcu_client = MongoClient(TCU_DB, serverSelectionTimeoutMS=3000)
     try:
-        caco_client.server_info()
         tcu_client.server_info()
     except ConnectionFailure:
-        log.warning("TCU or CaCo database not available. No source info will be added.")
+        log.warning("TCU database not available. No source info will be added.")
         return False
     else:
-        log.debug("TCU and CaCo database are available. Source info will be added.")
+        log.debug("TCU database is available. Source info will be added.")
         return True
 
-
-def query(obs_id: int, property_name: str):
+def query(obs_id: int):
     """
     Query the source name and coordinates from TCU database.
 
@@ -42,13 +36,11 @@ def query(obs_id: int, property_name: str):
     ----------
     obs_id : int
         Run number
-    property_name : str
-        Properties from drive information e.g. `DriveControl_SourceName`,
-        `DriveControl_RA_Target`, `DriveControl_Dec_Target`
+
 
     Returns
     -------
-    query_result : str or None
+    query_result : Dict
         Query result from database. It can be either the source name or its coordinates.
 
     Raises
@@ -60,47 +52,47 @@ def query(obs_id: int, property_name: str):
     if not isinstance(obs_id, int):
         obs_id = int(obs_id)
 
-    caco_client = MongoClient(CACO_DB)
-    tcu_client = MongoClient(TCU_DB)
-
-    with caco_client, tcu_client:
-        run_info = caco_client["CACO"]["RUN_INFORMATION"]
-        run = run_info.find_one({"run_number": obs_id})
+    try:
+        tcu_client = MongoClient(TCU_DB, serverSelectionTimeoutMS=3000)
+        db = tcu_client["lst1_obs_summary"]
+        camera_col = db["camera"]
 
-        try:
-            start = datetime.fromisoformat(run["start_time"].replace("Z", ""))
-            end = datetime.fromisoformat(run["stop_time"].replace("Z", ""))
-        except TypeError:
-            return None
+        run_info = camera_col.find_one({"run_number": obs_id})
 
-        bridges_monitoring = tcu_client["bridgesmonitoring"]
-        property_collection = bridges_monitoring["properties"]
-        chunk_collection = bridges_monitoring["chunks"]
-        descriptors = property_collection.find(
-            {"property_name": property_name},
-        )
+        if not run_info:
+            log.info(f"Run {obs_id} not found 'lst1_obs_summary.camera'")
+        else:
 
-        entries = {"name": property_name, "time": [], "value": []}
+            tstart = run_info.get("tstart")
+            tstop = run_info.get("tstop")
+            run_type = run_info.get("kind")
 
-        for descriptor in descriptors:
-            query_property = {"pid": descriptor["_id"]}
+            tstart_iso = datetime.fromtimestamp(tstart).isoformat(sep=" ", timespec="seconds")
 
-            if start is not None:
-                query_property["begin"] = {"$gte": start}
+            log.info(f"Run {obs_id} ({run_type}) found.")
+            log.info(f"Time: {tstart_iso} (Timestamp: {tstart})")
 
-            if end is not None:
-                query_property["end"] = {"$lte": end}
+            telescope_col = db["telescope"]
+            query = {
+                "tstart": {"$lte": tstop},
+                "tstop": {"$gte": tstart}
+            }
 
-            chunks = chunk_collection.find(query_property)
+            tel_doc = telescope_col.find_one(query, sort=[("tstart", -1)])
 
-            for chunk in chunks:
-                for value in chunk["values"]:
-                    entries["time"].append(value["t"])
-                    entries["value"].append(value["val"])
+            if tel_doc:
 
-                    source_name = entries["value"][0]
-                    return source_name if source_name != "" else None
+                config = tel_doc.get("data", {}).get("structure", [])[0]
+                target = config.get("target", {})
+                source_name = target.get("name", "Desconocido")
+                ra = target.get("source_ra", "N/A")
+                dec = target.get("source_dec", "N/A")
+                return {"source_name": source_name, "ra": ra, "dec": dec}
+            else:
+                log.info("\nNo information found for that time range in 'lst1_obs_summary.telescope'.")
 
+    except Exception as e:
+        log.info(f"ERROR: {e}")
 
 def get_run_info_from_TCU(run_id: int, tcu_server: str) -> Tuple:
     """

{lstosa-0.11.4 → lstosa-0.11.6}/src/osa/nightsummary/extract.py

@@ -173,15 +173,16 @@ def extract_runs(summary_table):
             # Make sure we are looking at actual data runs. Avoid test runs.
             if run.run > 0 and run.type == "DATA":
                 log.debug(f"Looking info in TCU DB for run {run.run}")
-                run.source_name = database.query(
-                    obs_id=run.run, property_name="DriveControl_SourceName"
+
+                tcu_result = database.query(
+                    obs_id=run.run
                 )
-                run.source_ra = database.query(
-                    obs_id=run.run, property_name="DriveControl_RA_Target"
-                    )
-                run.source_dec = database.query(
-                    obs_id=run.run, property_name="DriveControl_Dec_Target"
-                    )
+
+                if tcu_result is not None:
+                    run.source_name = tcu_result.get("source_name")
+                    run.source_ra = tcu_result.get("ra")
+                    run.source_dec = tcu_result.get("dec")
+
                 # Store this source information (run_id, source_name, source_ra, source_dec)
                 # into an astropy Table and save to disk in RunCatalog files. In this way, the
                 # information can be dumped anytime later more easily than accessing the

lstosa-0.11.6/src/osa/nightsummary/tests/test_database.py

@@ -0,0 +1,8 @@
+from osa.nightsummary import database
+
+def test_query():
+    result = database.query(obs_id=20038)
+    assert result is None
+
+
+

{lstosa-0.11.4 → lstosa-0.11.6}/src/osa/scripts/sequencer.py

@@ -11,7 +11,7 @@ import os
 import sys
 from decimal import Decimal
 import datetime
-
+import re
 from osa import osadb
 from osa.configs import options
 from osa.configs.config import cfg
@@ -50,6 +50,7 @@ __all__ = [
     "update_sequence_status",
     "get_status_for_sequence",
     "output_matrix",
+    "check_catB_status",
     "report_sequences",
     "update_job_info",
 ]
@@ -205,6 +206,34 @@ def update_sequence_status(seq_list):
             )
             seq.muonstatus = int(Decimal(get_status_for_sequence(seq, "MUON") * 100) / seq.subruns)
             seq.dl2status = int(Decimal(get_status_for_sequence(seq, "DL2") * 100))
+            seq.catbstatus = check_catB_status(seq)
+
+
+def check_catB_status(seq):
+    catbstatus = "None"
+
+    if seq.type == "DATA":
+        directory = options.directory
+
+        closed_files = list(directory.glob(f"catB*{seq.run}*.closed"))
+        if closed_files:
+            catbstatus = "CLOSED"
+        else:
+            log_files = list(options.log_directory.glob(f"catB_calibration_{seq.run}_*.err"))
+            if log_files:
+                filename = sorted(log_files)[-1].name
+                match = re.search(f"catB_calibration_{seq.run}_(\d+).err", filename)
+                if match:
+                    job_id = match.group(1)
+
+                    sacct_output = run_sacct(job_id)
+                    sacct_info = get_sacct_output(sacct_output)
+
+                    if not sacct_info.empty:
+                        catbstatus = sacct_info.iloc[0]["State"]
+
+    return catbstatus
+
 
 
 def get_status_for_sequence(sequence, data_level) -> int:
@@ -278,7 +307,7 @@ def report_sequences(sequence_list):
         "Exit",
     ]
     if options.tel_id in ["LST1", "LST2"]:
-        header.extend(("DL1%", "MUONS%", "DL1AB%", "DATACHECK%", "DL2%"))
+        header.extend(("DL1%", "MUONS%", "CAT-B","DL1AB%", "DATACHECK%", "DL2%"))
     matrix = [header]
     for sequence in sequence_list:
         row_list = [
@@ -297,12 +326,13 @@ def report_sequences(sequence_list):
             sequence.exit,
         ]
         if sequence.type in ["DRS4", "PEDCALIB"]:
-            row_list.extend((None, None, None, None, None))
+            row_list.extend((None, None, None, None, None, None))
         elif sequence.type == "DATA":
             row_list.extend(
                 (
                     sequence.dl1status,
                     sequence.muonstatus,
+                    sequence.catbstatus,
                     sequence.dl1abstatus,
                     sequence.datacheckstatus,
                     sequence.dl2status,

{lstosa-0.11.4 → lstosa-0.11.6}/src/osa/scripts/sequencer_webmaker.py

@@ -107,7 +107,7 @@ def lines_to_matrix(lines: Iterable) -> list:
     matrix = []
     for line in lines:
         l_fields = line.split()
-        if len(l_fields) == 18:
+        if len(l_fields) == 19:
             matrix.append(l_fields)
     return matrix
 

{lstosa-0.11.4 → lstosa-0.11.6}/src/osa/scripts/tests/test_osa_scripts.py

@@ -163,10 +163,10 @@ def test_simulated_sequencer(
     assert rc.stdout == dedent(
         f"""\
         =================================== Starting sequencer.py at {now} UTC for LST, Telescope: LST1, Date: 2020-01-17 ===================================
-        Tel   Seq  Parent  Type      Run   Subruns  Source        Action  Tries  JobID  State  CPU_time  Exit  DL1%  MUONS%  DL1AB%  DATACHECK%  DL2%  
-        LST1    1  None    PEDCALIB  1809  5        None          None    None   None   None   None      None  None  None    None    None        None  
-        LST1    2       1  DATA      1807  11       Crab          None    None   None   None   None      None     0       0       0           0   100  
-        LST1    3       1  DATA      1808  9        MadeUpSource  None    None   None   None   None      None     0       0       0           0   100  
+        Tel   Seq  Parent  Type      Run   Subruns  Source        Action  Tries  JobID  State  CPU_time  Exit  DL1%  MUONS%  CAT-B  DL1AB%  DATACHECK%  DL2%  
+        LST1    1  None    PEDCALIB  1809  5        None          None    None   None   None   None      None  None  None    None   None    None        None  
+        LST1    2       1  DATA      1807  11       Crab          None    None   None   None   None      None     0       0  None        0           0   100  
+        LST1    3       1  DATA      1808  9        MadeUpSource  None    None   None   None   None      None     0       0  None        0           0   100  
         """  # noqa: E501
     )
 

lstosa-0.11.4/src/osa/nightsummary/tests/test_database.py

@@ -1,9 +0,0 @@
-import pytest
-from pymongo.errors import ConnectionFailure
-
-
-def test_query():
-    from osa.nightsummary import database
-
-    with pytest.raises(ConnectionFailure):
-        database.query(obs_id=1616, property_name="DriveControl_SourceName")