mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 37 Wiki Activity

Fixes to 8x10g FPGA image and frontend

Browse Source
This commit is contained in:
leonarski_f
2024-10-16 09:12:24 +02:00
parent 4cf20ae71b
commit 4ae0668f2f
26 changed files with 839 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python-client/docs/JfjochStatistics.md
View File

@@ -7,6 +7,11 @@ Pool statistics for Jungfraujoch to reduce transfers between frontend and jfjoch
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**detector** | [**DetectorStatus**](DetectorStatus.md) | | [optional]
**detector_list** | [**DetectorList**](DetectorList.md) | | [optional]
**detector_settings** | [**DetectorSettings**](DetectorSettings.md) | | [optional]
**image_format_settings** | [**ImageFormatSettings**](ImageFormatSettings.md) | | [optional]
**instrument_metadata** | [**InstrumentMetadata**](InstrumentMetadata.md) | | [optional]
**data_processing_settings** | [**SpotFindingSettings**](SpotFindingSettings.md) | | [optional]
**measurement** | [**MeasurementStatistics**](MeasurementStatistics.md) | | [optional]
**broker** | [**BrokerStatus**](BrokerStatus.md) | | [optional]
**fpga** | [**List[FpgaStatusInner]**](FpgaStatusInner.md) | | [optional]

32
python-client/jfjoch_client/models/jfjoch_statistics.py
View File

@@ -22,9 +22,14 @@ from pydantic import BaseModel, ConfigDict
from typing import Any, ClassVar, Dict, List, Optional
from jfjoch_client.models.broker_status import BrokerStatus
from jfjoch_client.models.calibration_statistics_inner import CalibrationStatisticsInner
from jfjoch_client.models.detector_list import DetectorList
from jfjoch_client.models.detector_settings import DetectorSettings
from jfjoch_client.models.detector_status import DetectorStatus
from jfjoch_client.models.fpga_status_inner import FpgaStatusInner
from jfjoch_client.models.image_format_settings import ImageFormatSettings
from jfjoch_client.models.instrument_metadata import InstrumentMetadata
from jfjoch_client.models.measurement_statistics import MeasurementStatistics
from jfjoch_client.models.spot_finding_settings import SpotFindingSettings
from typing import Optional, Set
from typing_extensions import Self
@@ -33,11 +38,16 @@ class JfjochStatistics(BaseModel):
Pool statistics for Jungfraujoch to reduce transfers between frontend and jfjoch_broker
""" # noqa: E501
detector: Optional[DetectorStatus] = None
detector_list: Optional[DetectorList] = None
detector_settings: Optional[DetectorSettings] = None
image_format_settings: Optional[ImageFormatSettings] = None
instrument_metadata: Optional[InstrumentMetadata] = None
data_processing_settings: Optional[SpotFindingSettings] = None
measurement: Optional[MeasurementStatistics] = None
broker: Optional[BrokerStatus] = None
fpga: Optional[List[FpgaStatusInner]] = None
calibration: Optional[List[CalibrationStatisticsInner]] = None
__properties: ClassVar[List[str]] = ["detector", "measurement", "broker", "fpga", "calibration"]
__properties: ClassVar[List[str]] = ["detector", "detector_list", "detector_settings", "image_format_settings", "instrument_metadata", "data_processing_settings", "measurement", "broker", "fpga", "calibration"]
model_config = ConfigDict(
populate_by_name=True,
@@ -81,6 +91,21 @@ class JfjochStatistics(BaseModel):
# override the default output from pydantic by calling `to_dict()` of detector
if self.detector:
_dict['detector'] = self.detector.to_dict()
# override the default output from pydantic by calling `to_dict()` of detector_list
if self.detector_list:
_dict['detector_list'] = self.detector_list.to_dict()
# override the default output from pydantic by calling `to_dict()` of detector_settings
if self.detector_settings:
_dict['detector_settings'] = self.detector_settings.to_dict()
# override the default output from pydantic by calling `to_dict()` of image_format_settings
if self.image_format_settings:
_dict['image_format_settings'] = self.image_format_settings.to_dict()
# override the default output from pydantic by calling `to_dict()` of instrument_metadata
if self.instrument_metadata:
_dict['instrument_metadata'] = self.instrument_metadata.to_dict()
# override the default output from pydantic by calling `to_dict()` of data_processing_settings
if self.data_processing_settings:
_dict['data_processing_settings'] = self.data_processing_settings.to_dict()
# override the default output from pydantic by calling `to_dict()` of measurement
if self.measurement:
_dict['measurement'] = self.measurement.to_dict()
@@ -114,6 +139,11 @@ class JfjochStatistics(BaseModel):
_obj = cls.model_validate({
"detector": DetectorStatus.from_dict(obj["detector"]) if obj.get("detector") is not None else None,
"detector_list": DetectorList.from_dict(obj["detector_list"]) if obj.get("detector_list") is not None else None,
"detector_settings": DetectorSettings.from_dict(obj["detector_settings"]) if obj.get("detector_settings") is not None else None,
"image_format_settings": ImageFormatSettings.from_dict(obj["image_format_settings"]) if obj.get("image_format_settings") is not None else None,
"instrument_metadata": InstrumentMetadata.from_dict(obj["instrument_metadata"]) if obj.get("instrument_metadata") is not None else None,
"data_processing_settings": SpotFindingSettings.from_dict(obj["data_processing_settings"]) if obj.get("data_processing_settings") is not None else None,
"measurement": MeasurementStatistics.from_dict(obj["measurement"]) if obj.get("measurement") is not None else None,
"broker": BrokerStatus.from_dict(obj["broker"]) if obj.get("broker") is not None else None,
"fpga": [FpgaStatusInner.from_dict(_item) for _item in obj["fpga"]] if obj.get("fpga") is not None else None,