From 47324a79ae659ba66a48949db2b733fdc0f70ace Mon Sep 17 00:00:00 2001
From: appleb_m <martin.appleby@psi.ch>
Date: Wed, 1 Apr 2026 17:02:53 +0200
Subject: [PATCH] AareDB: todos

---
 src/aare/daq/aaredb.py | 49 ++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/aare/daq/aaredb.py b/src/aare/daq/aaredb.py
index 8c79b1a0..56cfde95 100644
--- a/src/aare/daq/aaredb.py
+++ b/src/aare/daq/aaredb.py
@@ -38,6 +38,19 @@ from jfjoch_client.models import ScanResult
 
 logger = setup_logger("aareDAQ")
 
+#TODO which additional events to add?
+# - Mounted
+# - Mount Failed
+# - Unmounted
+# - Unmounted Failed
+# - Centered
+# - Collected
+# - Collection Failed
+# - Failed
+# - AXCFailed
+# - ALCFailed
+# - Lost
+
 class AareWrapper:
     def __init__(
         self,
@@ -242,10 +255,10 @@ class AareWrapper:
         try:
             if r.screening:
                 characterization = CharacterizationParameters(
-                    omegaStart_deg=r.start_omega_deg,
+                    omegaStart_deg=round(r.start_omega_deg,3),
                     omegaStep=r.incr_omega_deg,
-                    phi=d.geom.smargon.phi_deg,
-                    chi=d.geom.smargon.chi_deg,
+                    phi=round(d.geom.smargon.phi_deg,3),
+                    chi=round(d.geom.smargon.chi_deg,3),
                     numberOfImages=r.steps,
                     exposureTime_s=r.exp_time_s,
                     oscillation_deg=r.wedge_omega_deg
@@ -253,10 +266,10 @@ class AareWrapper:
                 rotation = None
             else:
                 rotation = RotationParameters(
-                    omegaStart_deg=r.start_omega_deg,
+                    omegaStart_deg=round(r.start_omega_deg,3),
                     omegaStep=r.incr_omega_deg,
-                    phi=d.geom.smargon.phi_deg,
-                    chi=d.geom.smargon.chi_deg,
+                    phi=round(d.geom.smargon.phi_deg,3),
+                    chi=round(d.geom.smargon.chi_deg,3),
                     numberOfImages=r.steps,
                     exposureTime_s=r.exp_time_s,
                 )
@@ -306,7 +319,7 @@ class AareWrapper:
                 sample_id=s.db_id,
                 experiment_parameters_create=experiment_params_payload
             )
-            logger.debug("Experiment parameters created:", response)
+            #logger.debug("Experiment parameters created:", response)
         except Exception as e:
             logger.error(e)
 
@@ -322,9 +335,9 @@ class AareWrapper:
                 yStep= r.grid_size_mm.y,
                 x_col=r.n_x,
                 y_row=r.n_y,
-                omegaStart_deg=r.omega_deg,
-                numberOfImages=r.n_x * r.n_y,
-                exposureTime_s=r.exp_time_s,
+                omegaStart_deg=round(r.omega_deg,2),
+                numberOfImages=round(r.n_x * r.n_y,0),
+                exposureTime_s=round(r.exp_time_s,4),
             )
             dataset = Datasets(
                 filepath=r.file_prefix,
@@ -336,12 +349,12 @@ class AareWrapper:
                 model=d.diffraction.detector_description,
                 type="photon-counting",
                 serialNumber=d.diffraction.detector_serial_number,
-                detectorDistance_mm=d.diffraction.dtz_mm,
-                resolution_at_edge_Ang=d.diffraction.max_resolution_angstrom,
-                beamCenterX_px=d.diffraction.beam_center_pxl[0],
-                beamCenterY_px=d.diffraction.beam_center_pxl[1],
-                pixelSizeX_um=d.diffraction.pixel_size_mm * 1000,
-                pixelSizeY_um=d.diffraction.pixel_size_mm * 1000,
+                detectorDistance_mm=round(d.diffraction.dtz_mm,3),
+                resolution_at_edge_Ang=round(d.diffraction.max_resolution_angstrom,3),
+                beamCenterX_px=round(d.diffraction.beam_center_pxl[0],2),
+                beamCenterY_px=round(d.diffraction.beam_center_pxl[1],2),
+                pixelSizeX_um=round(d.diffraction.pixel_size_mm * 1000,2),
+                pixelSizeY_um=round(d.diffraction.pixel_size_mm * 1000,2),
                 dataset=dataset
             )
             beamline_params = BeamlineParametersInput(
@@ -350,7 +363,7 @@ class AareWrapper:
                 detector=detector_data,
                 energy_keV=d.diffraction.energy_keV,
                 wavelength_Ang=d.diffraction.wavelength_angstrom,
-                ringCurrent_mA=d.bl.ring_current_mA,
+                ringCurrent_mA=round(d.bl.ring_current_mA,3),
                 ringMode="Beamline Development",
                 monochromator="Si111",
                 transmission=d.bl.transmission,
@@ -370,7 +383,7 @@ class AareWrapper:
                 sample_id=s.db_id,
                 experiment_parameters_create=experiment_params_payload
             )
-            logger.info("Experiment parameters created:", response)
+            #logger.info("Experiment parameters created:", response)
         except Exception as e:
             logger.debug(e)