version1.0.0-rc.16 fixes

etc/broker_crmx.json

@@ -93,15 +93,15 @@
   "detector_settings": {
     "frame_time_us": 10000,
     "count_time_us": 10,
-    "pedestal_g0_frames": 2000,
-    "pedestal_g1_frames": 300,
-    "pedestal_g2_frames": 300,
-    "pedestal_g0_rms_limit": 100,
-    "pedestal_min_image_count": 128,
-    "storage_cell_count": 1,
-    "storage_cell_delay_ns": 2100,
-    "fixed_gain_g1": false,
-    "use_gain_hg0": false,
+    "jungfrau_pedestal_g0_frames": 2000,
+    "jungfrau_pedestal_g1_frames": 300,
+    "jungfrau_pedestal_g2_frames": 300,
+    "jungfrau_pedestal_g0_rms_limit": 100,
+    "jungfrau_pedestal_min_image_count": 128,
+    "jungfrau_storage_cell_count": 1,
+    "jungfrau_storage_cell_delay_ns": 2100,
+    "jungfrau_fixed_gain_g1": false,
+    "jungfrau_use_gain_hg0": false,
     "internal_frame_generator": false,
     "internal_frame_generator_images": 1,
     "detector_trigger_delay_ns": 0

etc/broker_local.json

@@ -50,15 +50,15 @@
   ],
   "detector_settings": {
     "frame_time_us": 1000,
-    "pedestal_g0_frames": 0,
-    "pedestal_g1_frames": 0,
-    "pedestal_g2_frames": 0,
-    "pedestal_g0_rms_limit": 100,
-    "pedestal_min_image_count": 128,
-    "storage_cell_count": 1,
-    "storage_cell_delay_ns": 2100,
-    "fixed_gain_g1": false,
-    "use_gain_hg0": false,
+    "jungfrau_pedestal_g0_frames": 0,
+    "jungfrau_pedestal_g1_frames": 0,
+    "jungfrau_pedestal_g2_frames": 0,
+    "jungfrau_pedestal_g0_rms_limit": 100,
+    "jungfrau_pedestal_min_image_count": 128,
+    "jungfrau_storage_cell_count": 1,
+    "jungfrau_storage_cell_delay_ns": 2100,
+    "jungfrau_fixed_gain_g1": false,
+    "jungfrau_use_gain_hg0": false,
     "internal_frame_generator": true,
     "internal_frame_generator_images": 1,
     "detector_trigger_delay_ns": 0

frontend/src/App.tsx

@@ -19,6 +19,7 @@ import InstrumentMetadata from "./components/InstrumentMetadata";
 import {JFJOCH_VERSION} from "./version";
 import FpgaStatus from "./components/FpgaStatus";
 import {PlotType} from "./components/DataProcessingPlot";
+import {OpenAPI} from "./openapi";
 
 const jfjoch_theme = createTheme({
     palette: {
@@ -42,11 +43,15 @@ class App extends Component<MyProps, MyState> {
     state : MyState = {
         show_detector_setup: false,
         show_module_calibration: false,
-        show_preview: true,
+        show_preview: false,
         show_roi_setup: false,
         show_fpga_status: false
     }
 
+    componentDidMount() {
+        OpenAPI.BASE='';
+    }
+
     showPreviewToggle = (event: React.ChangeEvent<HTMLInputElement>) => {
         this.setState({show_preview: event.target.checked});
     }

frontend/src/components/DataProcessingPlot.tsx

@@ -37,33 +37,33 @@ type PlotlyPlot = {
 
 type PlotlyData = PlotlyPlot[]
 
-function AxisTypeX(plot: PlotType) : JSX.Element{
+function AxisTypeX(plot: PlotType) : string {
     if (plot == PlotType.AZIM_INT)
-        return <>Q [&#8491;<sup>-1</sup>]</>
+        return "Q [&#8491;<sup>-1</sup>]"
     else
-        return <>Image number</>;
+        return "Image number";
 }
 
-function AxisTypeY(plot: PlotType) : JSX.Element {
+function AxisTypeY(plot: PlotType) : string {
     switch (plot) {
         case PlotType.COLLECTION_EFFICIENCY:
-            return <>Efficiency</>;
+            return "Efficiency";
         case PlotType.SPOT_COUNT:
-            return <>Spot count</>;
+            return "Spot count";
         case PlotType.ROI_MAX_COUNT:
         case PlotType.ROI_SUM:
         case PlotType.AZIM_INT:
         case PlotType.BKG_ESTIMATE:
-            return <>Photon count</>;
+            return "Photon count";
         case PlotType.INDEXING_RATE:
-            return <>Indexing rate</>;
+            return "Indexing rate";
         case PlotType.ERROR_PIXELS:
         case PlotType.STRONG_PIXELS:
-            return <>Pixel count</>;
+            return "Pixel count";
         case PlotType.RECEIVER_DELAY:
-            return <>Delay</>;
+            return "Delay";
         case PlotType.RECEIVER_FREE_SEND_BUFS:
-            return <>Free buffers</>;
+            return "Free buffers";
     }
 }
 
@@ -167,7 +167,7 @@ class DataProcessingPlot extends Component<MyProps, MyState> {
 
     componentDidMount() {
         this.getValues();
-        this.interval = setInterval(() => this.getValues(), 500);
+        this.interval = setInterval(() => this.getValues(), 1000);
     }
 
     componentWillUnmount() {
@@ -190,7 +190,6 @@ class DataProcessingPlot extends Component<MyProps, MyState> {
                 mode: "line",
                 name: d.title
             }));
-
         return <MultiLinePlotWrapper xaxis={AxisTypeX(this.props.type)} yaxis={AxisTypeY(this.props.type)} data={data}/>
     }
 }