diff --git a/configuration/camera_config/SARBD01-DSCR050.json b/configuration/camera_config/SARBD01-DSCR050.json index ecc8bf3..ad1d0bb 100644 --- a/configuration/camera_config/SARBD01-DSCR050.json +++ b/configuration/camera_config/SARBD01-DSCR050.json @@ -19,6 +19,6 @@ "group": [ "Electrons" ], - "source_type": "epics", + "source_type": "bsread", "alias": [] } \ No newline at end of file diff --git a/configuration/camera_config/SARBD02-DSCR051.json b/configuration/camera_config/SARBD02-DSCR051.json new file mode 100644 index 0000000..49bd5ae --- /dev/null +++ b/configuration/camera_config/SARBD02-DSCR051.json @@ -0,0 +1,23 @@ +{ + "name": "SARBD02-DSCR051", + "camera_calibration": { + "angle_horizontal": 0.0, + "angle_vertical": 0.0, + "reference_marker_height": 100.0, + "reference_marker": [ + 0, + 0, + 100, + 100 + ], + "reference_marker_width": 100.0 + }, + "source": "SARBD02-DSCR051", + "mirror_y": false, + "rotate": 0, + "mirror_x": false, + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SARCL02-DSCR280.json b/configuration/camera_config/SARCL02-DSCR280.json index 2542b1a..ea59362 100644 --- a/configuration/camera_config/SARCL02-DSCR280.json +++ b/configuration/camera_config/SARCL02-DSCR280.json @@ -16,7 +16,7 @@ "rotate": 1, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "name": "SARCL02-DSCR280", "source": "SARCL02-DSCR280", "group": [ diff --git a/configuration/camera_config/SARES20-CAMS142-M1.json b/configuration/camera_config/SARES20-CAMS142-M1.json index 2c09b1c..b0008bc 100644 --- a/configuration/camera_config/SARES20-CAMS142-M1.json +++ b/configuration/camera_config/SARES20-CAMS142-M1.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 3060, - 1028, - 3062, - 1030 + 2842, + 835, + 3259, + 1248 ], - "reference_marker_width": 8.5, - "reference_marker_height": 9.333333333333334, + "reference_marker_width": 2000.0, + "reference_marker_height": 2000.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SARES20-CAMS142-M3.json b/configuration/camera_config/SARES20-CAMS142-M3.json index e47b164..71fdc09 100644 --- a/configuration/camera_config/SARES20-CAMS142-M3.json +++ b/configuration/camera_config/SARES20-CAMS142-M3.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 2318, - 1162, - 2320, - 1164 + 1868, + 1009, + 2234, + 1396 ], - "reference_marker_width": 7.249523809523811, - "reference_marker_height": 11.906666666666666, + "reference_marker_width": 2000.0, + "reference_marker_height": 2000.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SARES20-CAMS142-M5.json b/configuration/camera_config/SARES20-CAMS142-M5.json index ae7901e..f3fb1ab 100644 --- a/configuration/camera_config/SARES20-CAMS142-M5.json +++ b/configuration/camera_config/SARES20-CAMS142-M5.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 0, - 0, - 1, - 1 + 706, + 384, + 807, + 484 ], "reference_marker_width": 1.0, "reference_marker_height": 1.0, diff --git a/configuration/camera_config/SARES20-DSDPPRM.json b/configuration/camera_config/SARES20-DSDPPRM.json index de7d1d2..444c728 100644 --- a/configuration/camera_config/SARES20-DSDPPRM.json +++ b/configuration/camera_config/SARES20-DSDPPRM.json @@ -23,9 +23,27 @@ "forwarder_port": 9020, "group": [ "Photonics", - "Bernina" + "Bernina", + "Beamline Aramis" ], "alias": [ "PROF_DSD (SARES20-DSDPPRM) (SARES20-DSDPPRM)" - ] + ], + "hardware_configuration": { + "EXPOSURE": 0.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 0.0, + "REGIONY_END": 0.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 600.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-PROF141-M1.json b/configuration/camera_config/SARES20-PROF141-M1.json index 5955888..cfe24d1 100644 --- a/configuration/camera_config/SARES20-PROF141-M1.json +++ b/configuration/camera_config/SARES20-PROF141-M1.json @@ -1,31 +1,31 @@ { "camera_calibration": { "reference_marker": [ - 327, - 197, - 439, - 265 + 291, + 205, + 375, + 281 ], - "reference_marker_width": 400.0, - "reference_marker_height": 250.0, + "reference_marker_width": 300.0, + "reference_marker_height": 300.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, "mirror_x": false, - "mirror_y": false, + "mirror_y": true, "rotate": 0, "roi": null, "image_background": null, "source_type": "bsread", - "prefix": "SARES20-PROF141-M1", "name": "SARES20-PROF141-M1", - "source": "SARES20-PROF141-M1", - "forwarder_port": 9013, - "group": [ - "Photonics", - "Bernina" - ], + "protocol": "tcp", + "source": "SLAAR21-LCAM-CS841", + "_debug": true, "alias": [ "PROF_KB (SARES20-PROF141-M1) (SARES20-PROF141-M1)" + ], + "group": [ + "Laser", + "Bernina" ] } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-PROF146-M1.json b/configuration/camera_config/SARES20-PROF146-M1.json index 77bade3..6647aa8 100644 --- a/configuration/camera_config/SARES20-PROF146-M1.json +++ b/configuration/camera_config/SARES20-PROF146-M1.json @@ -1,5 +1,16 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 954, + 1148, + 1046, + 1241 + ], + "reference_marker_width": 500.0, + "reference_marker_height": 500.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": false, "rotate": 0, @@ -13,5 +24,7 @@ "Photonics", "Bernina" ], - "alias": [] + "alias": [ + "PROF_DSD (SARES20-PROF146-M1)(SARES20-PROF146-M1)" + ] } \ No newline at end of file diff --git a/configuration/camera_config/SARFE10-PPRM053.json b/configuration/camera_config/SARFE10-PPRM053.json index 832601e..d027630 100644 --- a/configuration/camera_config/SARFE10-PPRM053.json +++ b/configuration/camera_config/SARFE10-PPRM053.json @@ -25,5 +25,22 @@ "Bernina", "Beamline Aramis" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0, + "REGIONY_START": 0, + "REGIONX_END": 832, + "REGIONY_END": 632, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 136.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SARFE10-PPRM064.json b/configuration/camera_config/SARFE10-PPRM064.json index c105cdd..7bf33a6 100644 --- a/configuration/camera_config/SARFE10-PPRM064.json +++ b/configuration/camera_config/SARFE10-PPRM064.json @@ -28,5 +28,22 @@ "alias": [ "PROF_FE (SARFE10-PPRM064) (SARFE10-PPRM064)" ], - "forwarder_port": 9015 + "forwarder_port": 9015, + "hardware_configuration": { + "EXPOSURE": 9.9, + "HSSPEED": 0.0, + "REGIONX_START": 1.0, + "REGIONY_START": 0.0, + "REGIONX_END": 1281.0, + "REGIONY_END": 1025.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 3.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SARFE10-PSSS059-LB.json b/configuration/camera_config/SARFE10-PSSS059-LB.json index d1d58a2..ff96c51 100644 --- a/configuration/camera_config/SARFE10-PSSS059-LB.json +++ b/configuration/camera_config/SARFE10-PSSS059-LB.json @@ -13,7 +13,7 @@ }, "mirror_x": false, "mirror_y": false, - "rotate": 1, + "rotate": 0, "roi": null, "image_background": null, "source_type": "bsread", @@ -21,7 +21,16 @@ "EXPOSURE": 9.9, "HSSPEED": 1, "REGIONX_START": 1, - "REGIONY_START": 500 + "REGIONY_START": 500, + "REGIONX_END": 2560.0, + "REGIONY_END": 2160.0, + "TRIGGER": 2, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "BINX": 1.0, + "BINY": 1.0 }, "prefix": "SARFE10-PSSS059-LB", "source": "SARFE10-PSSS059-LB", diff --git a/configuration/camera_config/SARFE10-PSSS059.json b/configuration/camera_config/SARFE10-PSSS059.json index f8891b4..84c2a51 100644 --- a/configuration/camera_config/SARFE10-PSSS059.json +++ b/configuration/camera_config/SARFE10-PSSS059.json @@ -21,7 +21,16 @@ "EXPOSURE": 9.9, "HSSPEED": 1, "REGIONX_START": 1, - "REGIONY_START": 500 + "REGIONY_START": 500, + "REGIONX_END": 2560.0, + "REGIONY_END": 1661.0, + "TRIGGER": 2, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "BINX": 1.0, + "BINY": 1.0 }, "camera_calib_datetime": "2024-09-12 15:53:26", "hardware": { diff --git a/configuration/camera_config/SAROP10-PSETUP.json b/configuration/camera_config/SAROP10-PSETUP.json index 8b58122..932f55e 100644 --- a/configuration/camera_config/SAROP10-PSETUP.json +++ b/configuration/camera_config/SAROP10-PSETUP.json @@ -8,7 +8,7 @@ "source_type": "epics", "name": "SAROP10-PSETUP", "source": "", - "Aramis camera_calib_datetime": "2024-12-11 09:48:56", + "Aramis camera_calib_datetime": "2025-02-12 16:57:11", "Alvra camera_calib_datetime": "2024-09-26 10:16:24", "Bernina camera_calib_datetime": "2024-09-25 15:48:01", "Cristallina camera_calib_datetime": "2024-09-25 15:48:08" diff --git a/configuration/camera_config/SAROP11-PPRM066.json b/configuration/camera_config/SAROP11-PPRM066.json index 3833f10..6b61f25 100644 --- a/configuration/camera_config/SAROP11-PPRM066.json +++ b/configuration/camera_config/SAROP11-PPRM066.json @@ -21,9 +21,27 @@ "source": "SAROP11-PPRM066", "group": [ "Photonics", - "Alvra" + "Alvra", + "Beamline Aramis" ], "alias": [ "PROF_MIRR_ALV1 (SAROP11-PPRM066) (SAROP11-PPRM066)" - ] + ], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PPRM078.json b/configuration/camera_config/SAROP11-PPRM078.json index 68166ae..97cdf0e 100644 --- a/configuration/camera_config/SAROP11-PPRM078.json +++ b/configuration/camera_config/SAROP11-PPRM078.json @@ -14,12 +14,32 @@ "mirror_x": true, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SAROP11-PPRM078", "source": "SAROP11-PPRM078", "group": [ "Photonics", - "Alvra" + "Alvra", + "Beamline Aramis" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 0.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PPRM110.json b/configuration/camera_config/SAROP11-PPRM110.json index d5054ab..283fb7f 100644 --- a/configuration/camera_config/SAROP11-PPRM110.json +++ b/configuration/camera_config/SAROP11-PPRM110.json @@ -14,12 +14,33 @@ "mirror_x": true, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "bsread", "name": "SAROP11-PPRM110", "source": "SAROP11-PPRM110", "group": [ "Photonics", - "Alvra" + "Alvra", + "Beamline Aramis" ], - "alias": [] + "alias": [], + "forwarder_port": 9050, + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 3.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PPRM117.json b/configuration/camera_config/SAROP11-PPRM117.json index 54556be..daf8285 100644 --- a/configuration/camera_config/SAROP11-PPRM117.json +++ b/configuration/camera_config/SAROP11-PPRM117.json @@ -24,5 +24,22 @@ "Alvra", "Beamline Aramis" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 5.005, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 300.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PPRM122.json b/configuration/camera_config/SAROP11-PPRM122.json index 9869b04..bed9839 100644 --- a/configuration/camera_config/SAROP11-PPRM122.json +++ b/configuration/camera_config/SAROP11-PPRM122.json @@ -14,12 +14,33 @@ "mirror_x": true, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "bsread", "name": "SAROP11-PPRM122", "source": "SAROP11-PPRM122", "group": [ "Photonics", - "Alvra" + "Alvra", + "Beamline Aramis" ], - "alias": [] + "alias": [], + "forwarder_port": 9051, + "hardware_configuration": { + "EXPOSURE": 5.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 1, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PSCR106.json b/configuration/camera_config/SAROP11-PSCR106.json index 2798813..23e6704 100644 --- a/configuration/camera_config/SAROP11-PSCR106.json +++ b/configuration/camera_config/SAROP11-PSCR106.json @@ -1,21 +1,44 @@ { - "camera_calibration": { - "angle_vertical": 0.0, - "angle_horizontal": 0.0, - "reference_marker_height": 100.0, - "reference_marker": [ - 0, - 0, - 100, - 100 - ], - "reference_marker_width": 100.0 - }, - "name": "SAROP11-PSCR106", - "source": "SAROP11-PSCR106", - "rotate": 0, - "mirror_y": false, - "mirror_x": false, - "group": ["Photonics"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 0, + 0, + 100, + 100 + ], + "reference_marker_width": 100.0, + "reference_marker_height": 100.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SAROP11-PSCR106", + "source": "SAROP11-PSCR106", + "group": [ + "Photonics", + "Beamline Aramis" + ], + "alias": [], + "hardware_configuration": { + "EXPOSURE": 27.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 1.0, + "REGIONY_END": 1026.0, + "TRIGGER": 0, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 3.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PSCR109.json b/configuration/camera_config/SAROP11-PSCR109.json index 2e157f1..58a98fb 100644 --- a/configuration/camera_config/SAROP11-PSCR109.json +++ b/configuration/camera_config/SAROP11-PSCR109.json @@ -22,7 +22,25 @@ "source": "SAROP11-PSCR109", "group": [ "Photonics", - "Alvra" + "Alvra", + "Beamline Aramis" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 0.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 0, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM094.json b/configuration/camera_config/SAROP21-PPRM094.json index a2bb106..a0beb9f 100644 --- a/configuration/camera_config/SAROP21-PPRM094.json +++ b/configuration/camera_config/SAROP21-PPRM094.json @@ -26,5 +26,22 @@ ], "alias": [ "PROF_MIRR1 (SAROP21-PPRM094) (SAROP21-PPRM094)" - ] + ], + "hardware_configuration": { + "EXPOSURE": 5.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM113.json b/configuration/camera_config/SAROP21-PPRM113.json index 13ec9d9..ca47abf 100644 --- a/configuration/camera_config/SAROP21-PPRM113.json +++ b/configuration/camera_config/SAROP21-PPRM113.json @@ -27,5 +27,22 @@ "PROF_MONO (SAROP21-PPRM113) (SAROP21-PPRM113)" ], "source": "SAROP21-PPRM113", - "forwarder_port": 9040 + "forwarder_port": 9040, + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM133.json b/configuration/camera_config/SAROP21-PPRM133.json index fdfb070..7bbe6b4 100644 --- a/configuration/camera_config/SAROP21-PPRM133.json +++ b/configuration/camera_config/SAROP21-PPRM133.json @@ -21,10 +21,28 @@ "source": "SAROP21-PPRM133", "group": [ "Photonics", - "Bernina" + "Bernina", + "Beamline Aramis" ], "forwarder_port": 9019, "alias": [ "PROF_OPT (SAROP21-PPRM133) (SAROP21-PPRM133)" - ] + ], + "hardware_configuration": { + "EXPOSURE": 1000.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM138.json b/configuration/camera_config/SAROP21-PPRM138.json index 83beb63..dd3dacd 100644 --- a/configuration/camera_config/SAROP21-PPRM138.json +++ b/configuration/camera_config/SAROP21-PPRM138.json @@ -20,11 +20,29 @@ "forwarder_port": 9004, "group": [ "Photonics", - "Bernina" + "Bernina", + "Beamline Aramis" ], "alias": [ "PROF_ATT (SAROP21-PPRM138) (SAROP21-PPRM138)" ], "name": "SAROP21-PPRM138", - "source": "SAROP21-PPRM138" + "source": "SAROP21-PPRM138", + "hardware_configuration": { + "EXPOSURE": 5.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PSCR097.json b/configuration/camera_config/SAROP21-PSCR097.json index 6743464..b871369 100644 --- a/configuration/camera_config/SAROP21-PSCR097.json +++ b/configuration/camera_config/SAROP21-PSCR097.json @@ -24,5 +24,22 @@ "Bernina", "Beamline Aramis" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 0.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PSRD103.json b/configuration/camera_config/SAROP21-PSRD103.json index 2841c7b..66ad1f5 100644 --- a/configuration/camera_config/SAROP21-PSRD103.json +++ b/configuration/camera_config/SAROP21-PSRD103.json @@ -24,5 +24,22 @@ "Bernina", "Beamline Aramis" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 0.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 1.0, + "REGIONY_END": 1.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP31-PPRM085.json b/configuration/camera_config/SAROP31-PPRM085.json index c3da163..aac7920 100644 --- a/configuration/camera_config/SAROP31-PPRM085.json +++ b/configuration/camera_config/SAROP31-PPRM085.json @@ -24,5 +24,22 @@ "Beamline Aramis", "Cristallina" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 2.024, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP31-PPRM113.json b/configuration/camera_config/SAROP31-PPRM113.json index f270415..bcd02d7 100644 --- a/configuration/camera_config/SAROP31-PPRM113.json +++ b/configuration/camera_config/SAROP31-PPRM113.json @@ -25,5 +25,22 @@ "Beamline Aramis", "Cristallina" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 2.011, + "HSSPEED": 0.0, + "REGIONX_START": 1.0, + "REGIONY_START": 0.0, + "REGIONX_END": 1281.0, + "REGIONY_END": 1026.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 3.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP31-PPRM150.json b/configuration/camera_config/SAROP31-PPRM150.json index f25ba23..e543e7e 100644 --- a/configuration/camera_config/SAROP31-PPRM150.json +++ b/configuration/camera_config/SAROP31-PPRM150.json @@ -16,8 +16,8 @@ "rotate": 0, "roi": null, "image_background": null, - "forwarder_port": 9002, "source_type": "bsread", + "forwarder_port": 9002, "name": "SAROP31-PPRM150", "source": "SAROP31-PPRM150", "group": [ @@ -25,5 +25,22 @@ "Beamline Aramis", "Cristallina" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 2.024, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 3.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP31-PSCD153.json b/configuration/camera_config/SAROP31-PSCD153.json index 4c0100a..f4eb441 100644 --- a/configuration/camera_config/SAROP31-PSCD153.json +++ b/configuration/camera_config/SAROP31-PSCD153.json @@ -24,5 +24,22 @@ "Beamline Aramis", "Cristallina" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 20.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 2592.0, + "REGIONY_END": 1944.0, + "TRIGGER": 0, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 0.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP31-PSCR068.json b/configuration/camera_config/SAROP31-PSCR068.json index e04994b..189a6b9 100644 --- a/configuration/camera_config/SAROP31-PSCR068.json +++ b/configuration/camera_config/SAROP31-PSCR068.json @@ -24,5 +24,22 @@ "Beamline Aramis", "Cristallina" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 0.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SAROP31-PSCR110.json b/configuration/camera_config/SAROP31-PSCR110.json new file mode 100644 index 0000000..44705e2 --- /dev/null +++ b/configuration/camera_config/SAROP31-PSCR110.json @@ -0,0 +1,34 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SAROP31-PSCR110", + "source": "SAROP31-PSCR110", + "group": [ + "Photonics", + "Beamline Aramis", + "Cristallina" + ], + "alias": [], + "hardware_configuration": { + "EXPOSURE": 20.035, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 2592.0, + "REGIONY_END": 1944.0, + "TRIGGER": 0, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 0.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SATBD01-DSCR120.json b/configuration/camera_config/SATBD01-DSCR120.json index 5a84d4a..cb61f5e 100644 --- a/configuration/camera_config/SATBD01-DSCR120.json +++ b/configuration/camera_config/SATBD01-DSCR120.json @@ -16,7 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "name": "SATBD01-DSCR120", "source": "SATBD01-DSCR120", "group": [ diff --git a/configuration/camera_config/SATES21-ADTEST1-CAM5.json b/configuration/camera_config/SATES21-ADTEST1-CAM5.json new file mode 100644 index 0000000..25f9195 --- /dev/null +++ b/configuration/camera_config/SATES21-ADTEST1-CAM5.json @@ -0,0 +1,14 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "bsread", + "name": "SATES21-ADTEST1-CAM5", + "protocol": "tcp", + "source": "SATES21-ADTEST1-CAM5", + "_debug": true, + "group": [ + "Photonics" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/SATFE10-PSCR066.json b/configuration/camera_config/SATFE10-PSCR066.json index 47bed18..7fd3adc 100644 --- a/configuration/camera_config/SATFE10-PSCR066.json +++ b/configuration/camera_config/SATFE10-PSCR066.json @@ -14,9 +14,31 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SATFE10-PSCR066", "source": "SATFE10-PSCR066", - "group": ["Photonics"], - "alias": [] -} + "group": [ + "Photonics", + "Beamline Athos" + ], + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 136.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SATFE10-PSCR070.json b/configuration/camera_config/SATFE10-PSCR070.json index 1a45c20..b0e28c9 100644 --- a/configuration/camera_config/SATFE10-PSCR070.json +++ b/configuration/camera_config/SATFE10-PSCR070.json @@ -14,9 +14,31 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SATFE10-PSCR070", "source": "SATFE10-PSCR070", - "group": ["Photonics"], - "alias": [] -} + "group": [ + "Photonics", + "Beamline Athos" + ], + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 136.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SATFE10-PSRD066.json b/configuration/camera_config/SATFE10-PSRD066.json index bbe1f9f..60b7095 100644 --- a/configuration/camera_config/SATFE10-PSRD066.json +++ b/configuration/camera_config/SATFE10-PSRD066.json @@ -14,12 +14,32 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "bsread", "forwarder_port": 9006, "name": "SATFE10-PSRD066", "source": "SATFE10-PSRD066", "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP10-PSETUP.json b/configuration/camera_config/SATOP10-PSETUP.json index e503416..70f53a8 100644 --- a/configuration/camera_config/SATOP10-PSETUP.json +++ b/configuration/camera_config/SATOP10-PSETUP.json @@ -8,7 +8,7 @@ "source_type": "epics", "name": "SATOP10-PSETUP", "source": "", - "Athos camera_calib_datetime": "2024-09-27 15:49:45", + "Athos camera_calib_datetime": "2025-02-12 16:30:21", "Furka camera_calib_datetime": "2024-09-27 14:37:57", "Maloja camera_calib_datetime": "2024-09-27 14:37:50" } \ No newline at end of file diff --git a/configuration/camera_config/SATOP11-PSAS079.json b/configuration/camera_config/SATOP11-PSAS079.json index 8168f58..130ad0e 100644 --- a/configuration/camera_config/SATOP11-PSAS079.json +++ b/configuration/camera_config/SATOP11-PSAS079.json @@ -20,7 +20,25 @@ "source": "SATOP11-PSAS079", "name": "SATOP11-PSAS079", "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], - "forwarder_port": 9020 + "forwarder_port": 9020, + "hardware_configuration": { + "EXPOSURE": 1.0, + "HSSPEED": 0.0, + "REGIONX_START": 8.0, + "REGIONY_START": 810.0, + "REGIONX_END": 4104.0, + "REGIONY_END": 1200.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 0.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP11-PSCR074.json b/configuration/camera_config/SATOP11-PSCR074.json index 72f87a8..1b54e8b 100644 --- a/configuration/camera_config/SATOP11-PSCR074.json +++ b/configuration/camera_config/SATOP11-PSCR074.json @@ -14,9 +14,31 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SATOP11-PSCR074", "source": "SATOP11-PSCR074", - "group": ["Photonics"], - "alias": [] -} + "group": [ + "Photonics", + "Beamline Athos" + ], + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 137.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SATOP11-PSCR086.json b/configuration/camera_config/SATOP11-PSCR086.json index 45d7d29..c7896d4 100644 --- a/configuration/camera_config/SATOP11-PSCR086.json +++ b/configuration/camera_config/SATOP11-PSCR086.json @@ -20,7 +20,25 @@ "name": "SATOP11-PSCR086", "source": "SATOP11-PSCR086", "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], - "alias": [] + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 137.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP11-PSCR090.json b/configuration/camera_config/SATOP11-PSCR090.json index 1335aae..f5764fc 100644 --- a/configuration/camera_config/SATOP11-PSCR090.json +++ b/configuration/camera_config/SATOP11-PSCR090.json @@ -14,9 +14,31 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SATOP11-PSCR090", "source": "SATOP11-PSCR090", - "group": ["Photonics"], - "alias": [] -} + "group": [ + "Photonics", + "Beamline Athos" + ], + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 136.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PMOS127-1D.json b/configuration/camera_config/SATOP21-PMOS127-1D.json index c296358..054705b 100644 --- a/configuration/camera_config/SATOP21-PMOS127-1D.json +++ b/configuration/camera_config/SATOP21-PMOS127-1D.json @@ -23,7 +23,8 @@ "connections": 2, "buffer_size": 0, "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], "alias": [], "protocol": "tcp", @@ -33,5 +34,22 @@ 0, 0 ], - "reference_marker_height": 0 + "reference_marker_height": 0, + "hardware_configuration": { + "EXPOSURE": 19.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 1984.0, + "REGIONY_END": 1264.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 256.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PMOS127-2D.json b/configuration/camera_config/SATOP21-PMOS127-2D.json index 58f516c..9d5caeb 100644 --- a/configuration/camera_config/SATOP21-PMOS127-2D.json +++ b/configuration/camera_config/SATOP21-PMOS127-2D.json @@ -30,9 +30,18 @@ "alias": [], "protocol": "tcp", "hardware_configuration": { - "EXPOSURE": 9.9, + "EXPOSURE": 9.5, "HSSPEED": 1, "REGIONX_START": 465, - "REGIONY_START": 1 + "REGIONY_START": 1, + "REGIONX_END": 2048.0, + "REGIONY_END": 2048.0, + "TRIGGER": 2, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "BINX": 1.0, + "BINY": 1.0 } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PSCA149.json b/configuration/camera_config/SATOP21-PSCA149.json index 6e2effa..85bea45 100644 --- a/configuration/camera_config/SATOP21-PSCA149.json +++ b/configuration/camera_config/SATOP21-PSCA149.json @@ -20,7 +20,25 @@ "alias": [], "source": "SATOP21-PSCA149", "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], - "name": "SATOP21-PSCA149" + "name": "SATOP21-PSCA149", + "hardware_configuration": { + "EXPOSURE": 10.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 136.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PSCA162.json b/configuration/camera_config/SATOP21-PSCA162.json index 6f3f7ad..150e8f4 100644 --- a/configuration/camera_config/SATOP21-PSCA162.json +++ b/configuration/camera_config/SATOP21-PSCA162.json @@ -22,6 +22,24 @@ "group": [ "Photonics", "Athos", - "Maloja" - ] + "Maloja", + "Beamline Athos" + ], + "hardware_configuration": { + "EXPOSURE": 10.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 600.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PSCR140.json b/configuration/camera_config/SATOP21-PSCR140.json index 27a7e29..dc84662 100644 --- a/configuration/camera_config/SATOP21-PSCR140.json +++ b/configuration/camera_config/SATOP21-PSCR140.json @@ -14,9 +14,31 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "source": "SATOP21-PSCR140", "name": "SATOP21-PSCR140", - "group": ["Photonics"], - "alias": [] -} + "group": [ + "Photonics", + "Beamline Athos" + ], + "alias": [], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 600.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PMOS132-1D.json b/configuration/camera_config/SATOP31-PMOS132-1D.json index c9966c8..ce3af49 100644 --- a/configuration/camera_config/SATOP31-PMOS132-1D.json +++ b/configuration/camera_config/SATOP31-PMOS132-1D.json @@ -23,7 +23,8 @@ "connections": 2, "buffer_size": 0, "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], "alias": [], "protocol": "tcp", @@ -33,5 +34,22 @@ 0, 0 ], - "reference_marker_height": 0 -} + "reference_marker_height": 0, + "hardware_configuration": { + "EXPOSURE": 0.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 0.0, + "REGIONY_END": 0.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 256.0, + "BINX": 1.0, + "BINY": 1.0 + } +} \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PMOS132-2D.json b/configuration/camera_config/SATOP31-PMOS132-2D.json index 86ba210..bf9cd15 100644 --- a/configuration/camera_config/SATOP31-PMOS132-2D.json +++ b/configuration/camera_config/SATOP31-PMOS132-2D.json @@ -34,6 +34,15 @@ "EXPOSURE": 9.9, "HSSPEED": 1, "REGIONX_START": 1, - "REGIONY_START": 300 + "REGIONY_START": 300, + "REGIONX_END": 2560.0, + "REGIONY_END": 1861.0, + "TRIGGER": 2, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "BINX": 1.0, + "BINY": 1.0 } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSCA158.json b/configuration/camera_config/SATOP31-PSCA158.json index f5a06c1..f91fc12 100644 --- a/configuration/camera_config/SATOP31-PSCA158.json +++ b/configuration/camera_config/SATOP31-PSCA158.json @@ -21,6 +21,24 @@ "source": "SATOP31-PSCA158", "name": "SATOP31-PSCA158", "group": [ - "Photonics" - ] + "Photonics", + "Beamline Athos" + ], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 63.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSCA176.json b/configuration/camera_config/SATOP31-PSCA176.json index c28d137..b396c72 100644 --- a/configuration/camera_config/SATOP31-PSCA176.json +++ b/configuration/camera_config/SATOP31-PSCA176.json @@ -18,9 +18,27 @@ "image_background": null, "source_type": "epics", "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], "alias": [], "name": "SATOP31-PSCA176", - "source": "SATOP31-PSCA176" + "source": "SATOP31-PSCA176", + "hardware_configuration": { + "EXPOSURE": 49.9, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 2592.0, + "REGIONY_END": 1944.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 0.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSCR095.json b/configuration/camera_config/SATOP31-PSCR095.json index f0f262d..014bf70 100644 --- a/configuration/camera_config/SATOP31-PSCR095.json +++ b/configuration/camera_config/SATOP31-PSCR095.json @@ -20,6 +20,24 @@ "name": "SATOP31-PSCR095", "source": "SATOP31-PSCR095", "group": [ - "Photonics" - ] + "Photonics", + "Beamline Athos" + ], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 600.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSCR136.json b/configuration/camera_config/SATOP31-PSCR136.json index c000deb..a0f67be 100644 --- a/configuration/camera_config/SATOP31-PSCR136.json +++ b/configuration/camera_config/SATOP31-PSCR136.json @@ -18,5 +18,26 @@ "image_background": null, "source_type": "epics", "source": "SATOP31-PSCR136", - "name": "SATOP31-PSCR136" + "name": "SATOP31-PSCR136", + "group": [ + "Photonics", + "Beamline Athos" + ], + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 0.0, + "REGIONY_END": 0.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 63.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSRD132.json b/configuration/camera_config/SATOP31-PSRD132.json index 0c25d36..38e1b93 100644 --- a/configuration/camera_config/SATOP31-PSRD132.json +++ b/configuration/camera_config/SATOP31-PSRD132.json @@ -13,14 +13,32 @@ }, "mirror_x": false, "mirror_y": false, - "rotate": 0, + "rotate": 1, "roi": null, "image_background": null, "source_type": "bsread", "forwarder_port": 9004, "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], "name": "SATOP31-PSRD132", - "source": "SATOP31-PSRD132" + "source": "SATOP31-PSRD132", + "hardware_configuration": { + "EXPOSURE": 6.011, + "HSSPEED": 0.0, + "REGIONX_START": 1.0, + "REGIONY_START": 1.0, + "REGIONX_END": 1281.0, + "REGIONY_END": 1025.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 3.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSRD175.json b/configuration/camera_config/SATOP31-PSRD175.json index bd30665..6adcd29 100644 --- a/configuration/camera_config/SATOP31-PSRD175.json +++ b/configuration/camera_config/SATOP31-PSRD175.json @@ -13,14 +13,32 @@ }, "mirror_x": false, "mirror_y": false, - "rotate": 0, + "rotate": 1, "roi": null, "image_background": null, "source_type": "bsread", "forwarder_port": 9008, "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], "name": "SATOP31-PSRD175", - "source": "SATOP31-PSRD175" + "source": "SATOP31-PSRD175", + "hardware_configuration": { + "EXPOSURE": 8.0, + "HSSPEED": 0.0, + "REGIONX_START": 0.0, + "REGIONY_START": 0.0, + "REGIONX_END": 659.0, + "REGIONY_END": 494.0, + "TRIGGER": 1, + "TRIGGERSOURCE": 0, + "DELAY": 0.0, + "ACQMODE": 0, + "RECMODE": 1, + "STOREMODE": 0, + "AMPGAIN": 100.0, + "BINX": 1.0, + "BINY": 1.0 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSRD175_pmos.json b/configuration/camera_config/SATOP31-PSRD175_pmos.json new file mode 100644 index 0000000..bff4880 --- /dev/null +++ b/configuration/camera_config/SATOP31-PSRD175_pmos.json @@ -0,0 +1,26 @@ +{ + "image_background_enable": false, + "image_background": "", + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATOP31-PSRD175", + "name": "SATOP31-PSRD175_pmos", + "function": "pmos_2.py", + "mode": "PUSH", + "allow_type_changes": false, + "allow_shape_changes": false, + "no_client_timeout": 0, + "port": "9009", + "reload": true, + "processing_threads": 6, + "thread_buffer_size": 30, + "abort_on_error": false, + "_enforce_pid": true, + "_enforce_timestamp": true, + "pixel_bkg": 2, + "e_axis_name": "SATOP31-PMOS132-2D:SPECTRUM_X", + "e_int_name": "SATOP31-PMOS132-2D:SPECTRUM_Y" +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-C561.json b/configuration/camera_config/SLAAR21-LCAM-C561.json index 5944dd2..583393c 100644 --- a/configuration/camera_config/SLAAR21-LCAM-C561.json +++ b/configuration/camera_config/SLAAR21-LCAM-C561.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 162, - 162, - 273, - 184 + 55, + 64, + 65, + 70 ], - "reference_marker_width": 111.0, - "reference_marker_height": 22.0, + "reference_marker_width": 10.0, + "reference_marker_height": 6.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SLAAR21-LCAM-C562.json b/configuration/camera_config/SLAAR21-LCAM-C562.json index 549139b..677a722 100644 --- a/configuration/camera_config/SLAAR21-LCAM-C562.json +++ b/configuration/camera_config/SLAAR21-LCAM-C562.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 364, - 250, - 468, - 358 + 540, + 373, + 554, + 382 ], "reference_marker_width": 104.0, "reference_marker_height": 108.0, diff --git a/configuration/camera_config/SLAAR21-LCAM-CS841.json b/configuration/camera_config/SLAAR21-LCAM-CS841.json index f0f408c..71b3c63 100644 --- a/configuration/camera_config/SLAAR21-LCAM-CS841.json +++ b/configuration/camera_config/SLAAR21-LCAM-CS841.json @@ -20,5 +20,12 @@ "name": "SLAAR21-LCAM-CS841", "protocol": "tcp", "source": "SLAAR21-LCAM-CS841", - "_debug": true + "_debug": true, + "alias": [ + "MIR_CEP (SLAAR21-LCAM-CS841)" + ], + "group": [ + "Bernina", + "Laser" + ] } \ No newline at end of file diff --git a/configuration/camera_config/permanent_instances.json b/configuration/camera_config/permanent_instances.json index 4e6c009..264b6ca 100644 --- a/configuration/camera_config/permanent_instances.json +++ b/configuration/camera_config/permanent_instances.json @@ -1,6 +1,11 @@ { "#S10BC02-DSRM310": "S10BC02-DSRM310", "#SAROP21-PPRM133": "SAROP21-PPRM133", + "#SATES21-ADTEST1-CAM1": "SATES21-ADTEST1-CAM1", + "#SATES21-ADTEST1-CAM2": "SATES21-ADTEST1-CAM2", + "#SATES21-ADTEST1-CAM3": "SATES21-ADTEST1-CAM3", + "#SATES21-ADTEST1-CAM4": "SATES21-ADTEST1-CAM4", + "#SATES21-ADTEST1-CAM5": "SATES21-ADTEST1-CAM5", "#SINBC02-DSRM310": "SINBC02-DSRM310", "S10BD01-DSCR030": "S10BD01-DSCR030", "SARCL01-DSCR170": "SARCL01-DSCR170", @@ -28,10 +33,6 @@ "SAROP31-PPRM150": "SAROP31-PPRM150", "SAROP31-PSCD153": "SAROP31-PSCD153", "SATBD02-DSCR050": "SATBD02-DSCR050", - "SATES21-ADTEST1-CAM1": "SATES21-ADTEST1-CAM1", - "SATES21-ADTEST1-CAM2": "SATES21-ADTEST1-CAM2", - "SATES21-ADTEST1-CAM3": "SATES21-ADTEST1-CAM3", - "SATES21-ADTEST1-CAM4": "SATES21-ADTEST1-CAM4", "SATES21-CAMS-PATT1": "SATES21-CAMS-PATT1", "SATES21-CAMS154-GIGE6": "SATES21-CAMS154-GIGE6", "SATES21-CAMS154-GIGE7": "SATES21-CAMS154-GIGE7", diff --git a/configuration/camera_config/servers.json b/configuration/camera_config/servers.json index 9063bfb..88b4e87 100644 --- a/configuration/camera_config/servers.json +++ b/configuration/camera_config/servers.json @@ -34,13 +34,16 @@ "expanding": false, "instances": [ "S10BC02-DSRM310", + "SARBD01-DSCR050", + "SARBD02-DSCR050", "SINDI02-DSCR075", "SINBC02-DSRM310", "SATBD01-DSCR120", "SARBD01-DSCR110", "S10BD01-DSCR030", "SATBD02-DSCR050", - "SARCL01-DSCR170" + "SARCL01-DSCR170", + "SARCL02-DSCR280" ] }, "http://sf-daqsync-11.psi.ch:8880": { @@ -113,6 +116,7 @@ "SARES20-PROF146-M1", "SLAAR02-LPMO01-C321", "SLAAR02-LPMO02-C322", + "#SLAAR21-LCAM-CS841", "SAROP21-PPRM133", "SLAAR21-LCAM-CS842", "SLAAR21-LCAM-CT1C1", @@ -156,6 +160,7 @@ "SATES21-ADTEST1-CAM2", "SATES21-ADTEST1-CAM3", "SATES21-ADTEST1-CAM4", + "SATES21-ADTEST1-CAM5", "SATOP11-PSAS079", "SATOP21-PMOS127B-2D", "SATOP31-PSRD175", diff --git a/configuration/pipeline_config/Bernina_mid_IR_CEP_analysis.json b/configuration/pipeline_config/Bernina_mid_IR_CEP_analysis.json new file mode 100644 index 0000000..4a3d9de --- /dev/null +++ b/configuration/pipeline_config/Bernina_mid_IR_CEP_analysis.json @@ -0,0 +1,43 @@ +{ + "pipeline_type": "stream", + "name": "Bernina_mid_IR_CEP_analysis", + "function": "Bernina_mid_IR_CEP_analysis.py", + "_bsread_address": "tcp://sf-daqsync-02:31853", + "bsread_channels": [ + "SAR-CVME-TIFALL5:EvtSet", + "SLAAR21-LCAM-CS841:x_profile" + ], + "mode": "PUSH", + "allow_type_changes": false, + "_debug": true, + "processing_threads": 2, + "no_client_timeout": 0, + "reload": true, + "abort_on_timeout": true, + "abort_on_error": false, + "debug": true, + "block": false, + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true, + "sig": "SLAAR21-LCAM-CS841:x_profile", + "events": "SAR-CVME-TIFALL5:EvtSet", + "dark_buffer_length": 4, + "calibration": [ + 8e-09, + 0.0001115, + 0 + ], + "sigma_px": 30, + "reflen": 150, + "bins": 100, + "fft_bins": 1000, + "distance": 50, + "is_midir_dark": true, + "event_code_midir_dark": 201, + "fit_data": true, + "padding": false, + "time_min": false, + "time_max": false, + "port": "9032" +} \ No newline at end of file diff --git a/configuration/pipeline_config/Bernina_mid_IR_CEP_populate_pvs.json b/configuration/pipeline_config/Bernina_mid_IR_CEP_populate_pvs.json new file mode 100644 index 0000000..2c73184 --- /dev/null +++ b/configuration/pipeline_config/Bernina_mid_IR_CEP_populate_pvs.json @@ -0,0 +1,20 @@ +{ + "name": "Bernina_mid_IR_CEP_populate_pvs", + "pipeline_type": "stream", + "bsread_address": "", + "bsread_channels": [ + "SARES20-CEP01:fit_phase", + "SARES20-CEP01:fit_amplitude", + "SARES20-CEP01:fit_fwhm", + "SARES20-CEP01:fit_frequency", + "SARES20-CEP01:fit_x0" + ], + "stream_timeout": 20, + "pv_channels": [ + "SLAAR21-MIRCEP:PHASE", + "SLAAR21-MIRCEP:AMPLITUDE" + ], + "function": "Bernina_mid_IR_CEP_populate_pvs.py", + "mode": "PUB", + "type": "stream" +} \ No newline at end of file diff --git a/configuration/pipeline_config/Bernina_mid_IR_CEP_projection.json b/configuration/pipeline_config/Bernina_mid_IR_CEP_projection.json new file mode 100644 index 0000000..a8c9fe4 --- /dev/null +++ b/configuration/pipeline_config/Bernina_mid_IR_CEP_projection.json @@ -0,0 +1,18 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SLAAR21-LCAM-CS841", + "name": "Bernina_mid_IR_CEP_projection", + "function": "Bernina_mid_IR_CEP_projection.py", + "mode": "PUSH", + "allow_type_changes": false, + "_debug": true, + "_processing_threads": 2, + "no_client_timeout": 0, + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SARBD02-DSCR051_sp.json b/configuration/pipeline_config/SARBD02-DSCR051_sp.json new file mode 100644 index 0000000..baa0e74 --- /dev/null +++ b/configuration/pipeline_config/SARBD02-DSCR051_sp.json @@ -0,0 +1,12 @@ +{ + "camera_calibration": null, + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "camera_name": "SARBD02-DSCR051", + "name": "SARBD02-DSCR051_sp", + "max_frame_rate": 5.1 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SARCL02-DSCR280_sp.json b/configuration/pipeline_config/SARCL02-DSCR280_sp.json index 13896f2..7f594b0 100644 --- a/configuration/pipeline_config/SARCL02-DSCR280_sp.json +++ b/configuration/pipeline_config/SARCL02-DSCR280_sp.json @@ -6,5 +6,6 @@ "image_good_region": null, "image_slices": null, "camera_name": "SARCL02-DSCR280", - "name": "SARCL02-DSCR280_sp" + "name": "SARCL02-DSCR280_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json index a205f41..d750da3 100644 --- a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json +++ b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json @@ -1,6 +1,6 @@ { "image_background_enable": "passive", - "image_background": "SARES11-SPEC125-M1_20241121_094305_572290", + "image_background": "SARES11-SPEC125-M1_20250201_153642_349861", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, diff --git a/configuration/pipeline_config/SARES11-SPEC125-M2_db.json b/configuration/pipeline_config/SARES11-SPEC125-M2_db.json index f10f37a..3d6e3aa 100644 --- a/configuration/pipeline_config/SARES11-SPEC125-M2_db.json +++ b/configuration/pipeline_config/SARES11-SPEC125-M2_db.json @@ -12,10 +12,10 @@ "mode": "PUSH", "allow_type_changes": false, "roi_signal": [ - 700, - 1300, + 1200, 1400, - 2000 + 848, + 1448 ], "roi_background": [ 0, diff --git a/configuration/pipeline_config/SARES21-PBPS141_proc.json b/configuration/pipeline_config/SARES21-PBPS141_proc.json index 83dd1ea..1f2d253 100644 --- a/configuration/pipeline_config/SARES21-PBPS141_proc.json +++ b/configuration/pipeline_config/SARES21-PBPS141_proc.json @@ -26,10 +26,10 @@ "down": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD2", "right": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD3", "left": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 2.4706101161799464e-05, - "down_calib": 2.224319211516208e-05, - "left_calib": 6.923236264022323e-05, - "right_calib": 4.3865559429761766e-05, + "up_calib": 9.569377990430622e-05, + "down_calib": 9.10641980741015e-05, + "left_calib": 0.0002543379887358792, + "right_calib": 0.0001403215721404428, "horiz_calib": -3.9446335571333027, "vert_calib": -7.009396901398793, "uJ_calib": 941.943984588351, @@ -94,5 +94,5 @@ 0.11052246554408188, 0.11072063526778356 ], - "calib_datetime": "2024-12-14 13:38:38" + "calib_datetime": "2025-02-04 10:38:38" } \ No newline at end of file diff --git a/configuration/pipeline_config/SARFE10-PBPS053_proc.json b/configuration/pipeline_config/SARFE10-PBPS053_proc.json index 54393dd..e1b14ac 100644 --- a/configuration/pipeline_config/SARFE10-PBPS053_proc.json +++ b/configuration/pipeline_config/SARFE10-PBPS053_proc.json @@ -26,12 +26,12 @@ "down": "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD2", "right": "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD3", "left": "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 7.422824889622594e-05, - "down_calib": 8.76181530794276e-05, - "left_calib": 0.0002547313806644617, - "right_calib": 0.00015550629116251527, - "horiz_calib": -3.61814760810708, - "vert_calib": -5.805628403047177, + "up_calib": 0.00013829131674353818, + "down_calib": 0.0001699166049303002, + "left_calib": 0.0005090965369217173, + "right_calib": 0.0002822696284654242, + "horiz_calib": -12610.610870857197, + "vert_calib": -5.60468323605931, "uJ_calib": 834.5191797495979, "threshold": 0, "queue_length": 5000, @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.082551959012514, - -0.00039066650318789913, - -0.08327875465311899 + 0.0003110304161815265, + 0.0008727618778698012, + 0.00026345143637281765 ], "calib_y_range": [ -0.3, @@ -79,20 +79,20 @@ 0.3 ], "calib_y_norm": [ - 0.05176595614209831, - -0.0003035962724308957, - -0.05158202935505826 + 0.05342287296039437, + 8.477180321132363e-05, + -0.053630456323182404 ], "calib_time": "2022-11-28 16:19:37", - "calib_datetime": "2024-11-18 12:45:10", + "calib_datetime": "2025-01-29 09:27:54", "calib_x_norm_std": [ - 0.03978894634880693, - 0.03917647311976521, - 0.04068762148653039 + 0.034715473382649, + 0.03558681803923851, + 0.035086184402555745 ], "calib_y_norm_std": [ - 0.0404015077325962, - 0.03440738347756294, - 0.043070158640609334 + 0.03742865145265283, + 0.03426774362198103, + 0.034107307070267115 ] } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-ATT01_proc.json b/configuration/pipeline_config/SAROP21-ATT01_proc.json index a332619..427af05 100644 --- a/configuration/pipeline_config/SAROP21-ATT01_proc.json +++ b/configuration/pipeline_config/SAROP21-ATT01_proc.json @@ -29,9 +29,9 @@ "reload": true, "dark_buffer_length": 3, "calibration": [ - -6.12272004e-19, - -5.59406908e-16, - 1.47168639e-12 + -7.19417023e-19, + -2.11969293e-16, + 1.27745934e-12 ], "roi": [ 600, diff --git a/configuration/pipeline_config/SAROP21-PBPS103_proc.json b/configuration/pipeline_config/SAROP21-PBPS103_proc.json index 0f53b48..2d780f7 100644 --- a/configuration/pipeline_config/SAROP21-PBPS103_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS103_proc.json @@ -10,19 +10,19 @@ "check_timestamp": true, "stream_timeout": 20, "queue_length": 5000, - "down_calib": 2.3055227044187093e-05, + "down_calib": 5.5271338052768646e-05, "xpos_odd_w_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-W", "ypos_all_y_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-Y", "ypos_all_w_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-W", "name": "SAROP21-PBPS103_proc", - "vert_calib": -3.5699946932617297, + "vert_calib": -3.9807417215664214, "bsread_address": "", "right": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD3", "ypos_dif_w_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-W", "ypos_odd_x_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-X", "function": "pbps_full", "port": "9009", - "left_calib": 1.237263363483627e-05, + "left_calib": 3.604824697374967e-05, "down": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD2", "ypos_odd_w_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-W", "xpos_odd_y_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-Y", @@ -32,7 +32,7 @@ "ypos_evn_x_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-X", "uJ_calib": 605.9512700123181, "xpos_evn_m_pvname": "SAROP21-PBPS103:XPOS-EVN-HIST-M", - "horiz_calib": -4.624077177319615, + "horiz_calib": -4.175061763210314, "ypos_all_m_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-M", "ypos_dif_m_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-M", "bsread_channels": [ @@ -45,7 +45,7 @@ "ypos_evn_w_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-W", "pipeline_type": "stream", "ypos_all_x_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-X", - "right_calib": 1.3543960336349628e-05, + "right_calib": 4.0304963475642095e-05, "xpos_all_m_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-M", "xpos_odd_m_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-M", "left": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD0", @@ -58,7 +58,7 @@ "ypos_evn_y_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-Y", "xpos_odd_x_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-X", "threshold": 0, - "up_calib": 2.2192261682627932e-05, + "up_calib": 5.3001316128682113e-05, "ypos_odd_m_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-M", "xpos_all_x_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-X", "up": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD1", @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.06504198929916899, - -0.00037671649680802346, - -0.06471363046922664 + 0.07157285036301936, + 0.0009591804161706151, + -0.07213759849478253 ], "calib_y_range": [ -0.3, @@ -79,19 +79,19 @@ 0.3 ], "calib_y_norm": [ - 0.09620221498791068, - 0.000914249037389552, - -0.07186526173200826 + 0.0759725283653206, + 4.616029717240383e-05, + -0.07475315090931972 ], "calib_x_norm_std": [ - 0.4319501839823468, - 0.42966366546873425, - 0.41432126450008017 + 0.4145522693878684, + 0.4202877333619035, + 0.41456184063790813 ], "calib_y_norm_std": [ - 0.4006992795066666, - 0.4175763601110324, - 0.4152970398611305 + 0.4247025133722662, + 0.4190715808241909, + 0.43243973416781073 ], - "calib_datetime": "2024-12-14 13:35:42" + "calib_datetime": "2025-02-04 07:43:18" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PBPS133_proc.json b/configuration/pipeline_config/SAROP21-PBPS133_proc.json index c4ed61b..4222764 100644 --- a/configuration/pipeline_config/SAROP21-PBPS133_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS133_proc.json @@ -27,12 +27,12 @@ "down": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 2.5511380728988724e-05, - "down_calib": 2.4791995160602545e-05, - "left_calib": 1.5370123013857334e-05, - "right_calib": 1.5193702076784592e-05, - "horiz_calib": -4.534843553081889, - "vert_calib": -4.3269603212535435, + "up_calib": 5.838256930010976e-05, + "down_calib": 5.656226328692814e-05, + "left_calib": 4.251148320184248e-05, + "right_calib": 4.290746473178029e-05, + "horiz_calib": -3.9629162576225854, + "vert_calib": -4.00319424718054, "uJ_calib": 605.4608924473305, "threshold": 0, "queue_length": 3000, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.06724539939843528, - -9.569664259961293e-05, - -0.06506346483840013 + 0.07453998597401498, + -0.0008795250165549497, + -0.07686366754652377 ], "calib_x_norm_std": [ - 0.46024145897167273, - 0.4418347310145162, - 0.45393690003400955 + 0.4381208675777489, + 0.4347076184147021, + 0.42503328441644145 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.06955128194983921, - -1.5093161113802529e-05, - -0.06911419114286918 + 0.07326631259404506, + -0.002640333146191335, + -0.07661399871550019 ], "calib_y_norm_std": [ - 0.4592781918677793, - 0.4421628788359616, - 0.43842651811133554 + 0.4356863724043072, + 0.45144610429008286, + 0.45181625007528115 ], - "calib_datetime": "2024-12-14 13:37:16" + "calib_datetime": "2025-02-04 07:40:27" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP31-PBPS113_proc.json b/configuration/pipeline_config/SAROP31-PBPS113_proc.json index c8cf350..db4a0e0 100644 --- a/configuration/pipeline_config/SAROP31-PBPS113_proc.json +++ b/configuration/pipeline_config/SAROP31-PBPS113_proc.json @@ -26,12 +26,12 @@ "down": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 6.112243180044631e-06, - "down_calib": 6.903488349231238e-06, - "left_calib": 1.4826568879316594e-05, - "right_calib": 1.669499473373086e-05, - "horiz_calib": -3.8546972980109744, - "vert_calib": -9.481130021012225, + "up_calib": 2.0663001325738166e-05, + "down_calib": 2.402537694855417e-05, + "left_calib": 5.218152156307452e-05, + "right_calib": 5.834052477535398e-05, + "horiz_calib": -3.771327659699711, + "vert_calib": -6.08541597358778, "uJ_calib": 941.943984588351, "threshold": 0, "queue_length": 300, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.07703441344318415, - 0.0003383787550382122, - -0.07861983217283357 + 0.0802116924027993, + 0.0005143083175209187, + -0.07888347358120712 ], "calib_x_norm_std": [ - 0.0391449328058549, - 0.038860745910053576, - 0.038590290050160014 + 0.03360835426368963, + 0.038265082191697865, + 0.03675609144464779 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.02431607522002863, - 0.00022169764088300094, - -0.03896752058239902 + 0.0511850204634102, + 0.00046261783581242737, + -0.04741136187169216 ], "calib_y_norm_std": [ - 0.03838679577153944, - 0.03615742902868593, - 0.03935126487068955 + 0.03575638783183132, + 0.03605698374111028, + 0.038302105512007384 ], - "calib_datetime": "2024-12-02 20:32:13" + "calib_datetime": "2025-02-05 10:23:15" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP31-PBPS149_proc.json b/configuration/pipeline_config/SAROP31-PBPS149_proc.json index 2d67a2d..b4b674b 100644 --- a/configuration/pipeline_config/SAROP31-PBPS149_proc.json +++ b/configuration/pipeline_config/SAROP31-PBPS149_proc.json @@ -27,12 +27,12 @@ "down": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 1.0648333133357636e-06, - "down_calib": 1.1619608846597561e-06, - "left_calib": 5.665196495300968e-07, - "right_calib": 7.619351533936384e-07, - "horiz_calib": -4.407085413339026, - "vert_calib": -4.425074700683255, + "up_calib": 1.6851641518400307e-05, + "down_calib": 1.731276521425032e-05, + "left_calib": 3.5225258482946746e-05, + "right_calib": 5.32543294704773e-05, + "horiz_calib": -3.7083644088588854, + "vert_calib": -6.385756369199804, "uJ_calib": 605.9512700123181, "threshold": 0.0, "queue_length": 300, @@ -71,14 +71,14 @@ 0.3 ], "calib_x_norm": [ - 0.06975180407503503, - 0.0024419852169023587, - -0.06639259607295536 + 0.08330142517421746, + 0.0005900059046785689, + -0.07849497179439337 ], "calib_x_norm_std": [ - 0.02713307608337581, - 0.026948505266373712, - 0.027683485418359032 + 0.04214173720839463, + 0.04071682040666387, + 0.03921332842278094 ], "calib_y_range": [ -0.3, @@ -86,14 +86,14 @@ 0.3 ], "calib_y_norm": [ - 0.07175361981329152, - 4.987914747499697e-05, - -0.06383731154598175 + 0.04703494881570425, + -0.00033516601182954854, + -0.04692416351340982 ], "calib_y_norm_std": [ - 0.039556416370008306, - 0.03513687349902875, - 0.03069969838835131 + 0.04079830358928786, + 0.04217188377789602, + 0.03974387367182228 ], - "calib_datetime": "2024-12-02 21:02:40" + "calib_datetime": "2025-02-05 10:24:47" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21_CAM154-GIGE1_sp.json b/configuration/pipeline_config/SAROP31-PSCR110_sp.json similarity index 73% rename from configuration/pipeline_config/SATES21_CAM154-GIGE1_sp.json rename to configuration/pipeline_config/SAROP31-PSCR110_sp.json index 2fb80d3..977b1d5 100644 --- a/configuration/pipeline_config/SATES21_CAM154-GIGE1_sp.json +++ b/configuration/pipeline_config/SAROP31-PSCR110_sp.json @@ -6,6 +6,6 @@ "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "camera_name": "SATES21_CAM154-GIGE1", - "name": "SATES21_CAM154-GIGE1_sp" + "camera_name": "SAROP31-PSCR110", + "name": "SAROP31-PSCR110_sp" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATBD02-DSCR050_sp.json b/configuration/pipeline_config/SATBD02-DSCR050_sp.json index 0ac5775..23a9d00 100644 --- a/configuration/pipeline_config/SATBD02-DSCR050_sp.json +++ b/configuration/pipeline_config/SATBD02-DSCR050_sp.json @@ -1,22 +1,18 @@ { "image_background_enable": false, - "image_background": "SATBD02-DSCR050_20240515_104756_839117", + "image_background": "SATBD02-DSCR050_20250216_143504_789375", "image_threshold": null, "image_region_of_interest": [ - 551, - 1346, - 98, - 2051 + 401, + 1729, + 339, + 1377 ], "image_good_region": { - "threshold": 0.05, - "gfscale": 5.0 - }, - "image_slices": { - "number_of_slices": 11, - "scale": 1.0, - "orientation": "vertical" + "threshold": 0.1, + "gfscale": 9.0 }, + "image_slices": null, "pipeline_type": "processing", "camera_name": "SATBD02-DSCR050", "name": "SATBD02-DSCR050_sp", diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM1_proc.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM1_proc.json new file mode 100644 index 0000000..ba61637 --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM1_proc.json @@ -0,0 +1,16 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "name": "SATES21-ADTEST1-CAM1_proc", + "camera_name": "SATES21-ADTEST1-CAM1", + "function": "Laser_Quick_Int.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false, + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json index 20ee0c3..4cbe170 100644 --- a/configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-ADTEST1-CAM1", - "name": "SATES21-ADTEST1-CAM1_sp" + "name": "SATES21-ADTEST1-CAM1_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM2_proc.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM2_proc.json new file mode 100644 index 0000000..2d7ba86 --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM2_proc.json @@ -0,0 +1,16 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "name": "SATES21-ADTEST1-CAM2_proc", + "camera_name": "SATES21-ADTEST1-CAM2", + "function": "Laser_Quick_Int.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false, + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json index fe39dce..e4343dc 100644 --- a/configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-ADTEST1-CAM2", - "name": "SATES21-ADTEST1-CAM2_sp" + "name": "SATES21-ADTEST1-CAM2_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM3_proc.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM3_proc.json new file mode 100644 index 0000000..9f62c0c --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM3_proc.json @@ -0,0 +1,16 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "name": "SATES21-ADTEST1-CAM3_proc", + "camera_name": "SATES21-ADTEST1-CAM3", + "function": "Laser_Quick_Int.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false, + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json index 2469bb8..0685cad 100644 --- a/configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-ADTEST1-CAM3", - "name": "SATES21-ADTEST1-CAM3_sp" + "name": "SATES21-ADTEST1-CAM3_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM4_proc.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM4_proc.json new file mode 100644 index 0000000..285e6bf --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM4_proc.json @@ -0,0 +1,16 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "name": "SATES21-ADTEST1-CAM4_proc", + "camera_name": "SATES21-ADTEST1-CAM4", + "function": "Laser_Quick_Int.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false, + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json index 9c7b317..333c170 100644 --- a/configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-ADTEST1-CAM4", - "name": "SATES21-ADTEST1-CAM4_sp" + "name": "SATES21-ADTEST1-CAM4_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM5_proc.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM5_proc.json new file mode 100644 index 0000000..498e35e --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM5_proc.json @@ -0,0 +1,16 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "name": "SATES21-ADTEST1-CAM5_proc", + "camera_name": "SATES21-ADTEST1-CAM5", + "function": "Laser_Quick_Int.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false, + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM5_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM5_sp.json new file mode 100644 index 0000000..fc28361 --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM5_sp.json @@ -0,0 +1,12 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATES21-ADTEST1-CAM5", + "name": "SATES21-ADTEST1-CAM5_sp", + "max_frame_rate": 5.1 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE10_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE10_sp.json index a3fc5f1..85c37e2 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE10_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE10_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE10", - "name": "SATES21-CAMS154-GIGE10_sp" + "name": "SATES21-CAMS154-GIGE10_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE12_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE12_sp.json index 4b934c4..b187278 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE12_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE12_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE12", - "name": "SATES21-CAMS154-GIGE12_sp" + "name": "SATES21-CAMS154-GIGE12_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE1_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE1_sp.json index 2ce77a7..0ce2760 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE1_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE1_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE1", - "name": "SATES21-CAMS154-GIGE1_sp" + "name": "SATES21-CAMS154-GIGE1_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE3_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE3_sp.json index d17d77c..08683d3 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE3_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE3_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE3", - "name": "SATES21-CAMS154-GIGE3_sp" + "name": "SATES21-CAMS154-GIGE3_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE4_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE4_sp.json index 23cbae7..a7ccac1 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE4_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE4_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE4", - "name": "SATES21-CAMS154-GIGE4_sp" + "name": "SATES21-CAMS154-GIGE4_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE5_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE5_sp.json index 43c7ae3..effef41 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE5_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE5_sp.json @@ -8,5 +8,6 @@ "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE5", "name": "SATES21-CAMS154-GIGE5_sp", - "processing_threads": 4 -} + "processing_threads": 4, + "max_frame_rate": 5.1 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE6_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE6_sp.json index 92f25d0..0b45950 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE6_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE6_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE6", - "name": "SATES21-CAMS154-GIGE6_sp" + "name": "SATES21-CAMS154-GIGE6_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE9_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE9_sp.json index 63eb5ff..3c733ee 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE9_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE9_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE9", - "name": "SATES21-CAMS154-GIGE9_sp" + "name": "SATES21-CAMS154-GIGE9_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json b/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json index 9dc1810..bd786d2 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json +++ b/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json @@ -1,6 +1,6 @@ { "image_background_enable": "passive", - "image_background": "SATES21-CAMS154-M1_20241020_145222_846372", + "image_background": "SATES21-CAMS154-M1_20250131_172243_522923", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -13,22 +13,22 @@ "allow_type_changes": false, "processing_threads": 4, "thread_buffer_size": 30, - "project_axis": 0, - "threshold": 10, - "roi_background": [ - 0, - 884, - 0, - 2463 - ], - "roi_signal": [ - 0, - 884, - 0, - 2463 - ], "reload": true, "enforce_pid": true, "enforce_timestamp": true, - "check_timestamp": true + "check_timestamp": true, + "threshold": 10, + "project_axis": 0, + "roi_signal": [ + 2, + 594, + 5, + 1412 + ], + "roi_background": [ + 2, + 594, + 5, + 1412 + ] } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-M2_sp.json b/configuration/pipeline_config/SATES21-CAMS154-M2_sp.json index 1d72b01..fe9ec40 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-M2_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-M2_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-M2", - "name": "SATES21-CAMS154-M2_sp" + "name": "SATES21-CAMS154-M2_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-PATT1_sp.json b/configuration/pipeline_config/SATES21-CAMS154-PATT1_sp.json index d30315e..4fa866b 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-PATT1_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-PATT1_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-PATT1", - "name": "SATES21-CAMS154-PATT1_sp" + "name": "SATES21-CAMS154-PATT1_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-PATT-M1_sp.json b/configuration/pipeline_config/SATES21-PATT-M1_sp.json index f75580c..c7ea274 100644 --- a/configuration/pipeline_config/SATES21-PATT-M1_sp.json +++ b/configuration/pipeline_config/SATES21-PATT-M1_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-PATT-M1", - "name": "SATES21-PATT-M1_sp" + "name": "SATES21-PATT-M1_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json b/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json index fe86a73..6e1a32d 100644 --- a/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json +++ b/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json @@ -1,31 +1,17 @@ { - "image_background_enable": "passive", - "image_background": "SATES24-CAMS161-M1_20241129_124611_561516", + "image_background_enable": false, + "image_background": null, "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "function": "spectrometer.py", + "function": "Laser_Quick_Int.py", "camera_name": "SATES24-CAMS161-M1", "name": "SATES24-CAMS161-M1_spec_db", "mode": "PUSH", "allow_type_changes": false, - "roi_signal": [ - 223, - 1249, - 243, - 1274 - ], "processing_threads": 4, "thread_buffer_size": 30, - "project_axis": 1, - "threshold": 10, - "roi_background": [ - 223, - 1249, - 243, - 1274 - ], "reload": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES24-CAMS162-M1_sp.json b/configuration/pipeline_config/SATES24-CAMS162-M1_sp.json index a074293..142ee05 100644 --- a/configuration/pipeline_config/SATES24-CAMS162-M1_sp.json +++ b/configuration/pipeline_config/SATES24-CAMS162-M1_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES24-CAMS162-M1", - "name": "SATES24-CAMS162-M1_sp" + "name": "SATES24-CAMS162-M1_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json index d1f5eb4..78c9e4b 100644 --- a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json +++ b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json @@ -2,12 +2,7 @@ "image_background_enable": false, "image_background": "SATES31-CAMS187-RIXS1_20240529_115656_199325", "image_threshold": null, - "image_region_of_interest": [ - 712, - 1438, - 304, - 62 - ], + "image_region_of_interest": null, "image_good_region": null, "image_slices": null, "pipeline_type": "processing", diff --git a/configuration/pipeline_config/SATOP11-PSAS079_psas.json b/configuration/pipeline_config/SATOP11-PSAS079_psas.json index 02827b6..62f9681 100644 --- a/configuration/pipeline_config/SATOP11-PSAS079_psas.json +++ b/configuration/pipeline_config/SATOP11-PSAS079_psas.json @@ -1,16 +1,13 @@ { "image_background_enable": false, "image_background": "SATOP11-PSAS079_20241208_143639_046414", - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null, "pipeline_type": "processing", "camera_name": "SATOP11-PSAS079", "name": "SATOP11-PSAS079_psas", - "function": "pmos132-2D.py", + "function": "pmos_2.py", "mode": "PUSH", "allow_type_changes": false, + "allow_shape_changes": false, "no_client_timeout": 0, "reload": true, "processing_threads": 6, @@ -22,5 +19,7 @@ "block": false, "enforce_pid": true, "enforce_timestamp": true, - "check_timestamp": true + "check_timestamp": true, + "e_axis_name": "SATOP11-PSAS079:SPECTRUM_X", + "e_int_name": "SATOP11-PSAS079:SPECTRUM_Y" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json b/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json index b90faac..e28c3a9 100644 --- a/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json +++ b/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json @@ -6,7 +6,7 @@ "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "camera_name": "SATOP21-PMOS127B-2D", + "camera_name": "SATOP21-PMOS127-2D", "e_axis": "SATOP21-PMOS127-2D:SPECTRUM_X", "int_axis": "SATOP21-PMOS127-2D:SPECTRUM_Y", "name": "SATOP21-PMOS127-2D_pmos", diff --git a/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json b/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json index 8f3f9ce..8ac0fc0 100644 --- a/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json +++ b/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json @@ -1,6 +1,6 @@ { "image_background_enable": true, - "image_background": "SATOP31-PMOS132-2D_20241128_153410_104874", + "image_background": "SATOP31-PMOS132-2D_20250216_112111_000879", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -8,14 +8,19 @@ "pipeline_type": "processing", "camera_name": "SATOP31-PMOS132-2D", "name": "SATOP31-PMOS132-2D_pmos", - "function": "pmos132-2D.py", + "function": "pmos_2.py", "mode": "PUSH", "allow_type_changes": false, + "allow_shape_changes": false, "no_client_timeout": 0, + "port": "9001", "reload": true, "processing_threads": 6, "thread_buffer_size": 30, "abort_on_error": false, - "pixel_bkg": 2, - "port": "9001" + "_enforce_pid": true, + "_enforce_timestamp": true, + "pixel_bkg": 1, + "e_axis_name": "SATOP31-PMOS132-2D:SPECTRUM_X", + "e_int_name": "SATOP31-PMOS132-2D:SPECTRUM_Y" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP31-PSRD132_pmos.json b/configuration/pipeline_config/SATOP31-PSRD132_pmos.json new file mode 100644 index 0000000..dbcab27 --- /dev/null +++ b/configuration/pipeline_config/SATOP31-PSRD132_pmos.json @@ -0,0 +1,26 @@ +{ + "image_background_enable": false, + "image_background": "SATOP31-PSRD132_20250216_120304_546817", + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATOP31-PSRD132", + "name": "SATOP31-PSRD132_pmos", + "function": "pmos_2.py", + "mode": "PUSH", + "allow_type_changes": false, + "allow_shape_changes": false, + "no_client_timeout": 0, + "port": "9007", + "reload": true, + "processing_threads": 6, + "thread_buffer_size": 30, + "abort_on_error": false, + "_enforce_pid": true, + "_enforce_timestamp": true, + "pixel_bkg": 2, + "e_axis_name": "SATOP31-PSRD132:SPECTRUM_X", + "e_int_name": "SATOP31-PSRD132:SPECTRUM_Y" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP31-PSRD175_pmos.json b/configuration/pipeline_config/SATOP31-PSRD175_pmos.json new file mode 100644 index 0000000..45fe8b7 --- /dev/null +++ b/configuration/pipeline_config/SATOP31-PSRD175_pmos.json @@ -0,0 +1,26 @@ +{ + "image_background_enable": false, + "image_background": "", + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATOP31-PSRD175", + "name": "SATOP31-PSRD175_pmos", + "function": "pmos_2.py", + "mode": "PUSH", + "allow_type_changes": false, + "allow_shape_changes": false, + "no_client_timeout": 0, + "port": "9009", + "reload": true, + "processing_threads": 6, + "thread_buffer_size": 30, + "abort_on_error": false, + "_enforce_pid": true, + "_enforce_timestamp": true, + "pixel_bkg": 2, + "e_axis_name": "SATOP31-PSRD175:SPECTRUM_X", + "e_int_name": "SATOP31-PSRD175:SPECTRUM_Y" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP31-PSRD175_pmos_sp.json b/configuration/pipeline_config/SATOP31-PSRD175_pmos_sp.json new file mode 100644 index 0000000..2387204 --- /dev/null +++ b/configuration/pipeline_config/SATOP31-PSRD175_pmos_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATOP31-PSRD175_pmos", + "name": "SATOP31-PSRD175_pmos_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json b/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json index 0f269c2..662517b 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json @@ -8,8 +8,8 @@ "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-CS841", "name": "SLAAR21-LCAM-CS841_proc", - "function": "pprm_simple.py", - "mode": "PUSH", + "function": "test_midir_projection.py", + "mode": "PUB", "allow_type_changes": false, "_debug": true, "_processing_threads": 2, diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 5714b51..41c5a95 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -18,6 +18,16 @@ "#SAROP21-PPRM102_proc": "SAROP21-PPRM102_proc", "#SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc", "#SATBD02-DSCR050_db": "SATBD02-DSCR050_db", + "#SATES21-ADTEST1-CAM1_proc": "SATES21-ADTEST1-CAM1_proc", + "#SATES21-ADTEST1-CAM1_sp": "SATES21-ADTEST1-CAM1_sp", + "#SATES21-ADTEST1-CAM2_proc": "SATES21-ADTEST1-CAM2_proc", + "#SATES21-ADTEST1-CAM2_sp": "SATES21-ADTEST1-CAM2_sp", + "#SATES21-ADTEST1-CAM3_proc": "SATES21-ADTEST1-CAM3_proc", + "#SATES21-ADTEST1-CAM3_sp": "SATES21-ADTEST1-CAM3_sp", + "#SATES21-ADTEST1-CAM4_proc": "SATES21-ADTEST1-CAM4_proc", + "#SATES21-ADTEST1-CAM4_sp": "SATES21-ADTEST1-CAM4_sp", + "#SATES21-ADTEST1-CAM5_proc": "SATES21-ADTEST1-CAM5_proc", + "#SATES21-ADTEST1-CAM5_sp": "SATES21-ADTEST1-CAM5_sp", "#SATES21-CAMS154-GIGE1_proc": "SATES21-CAMS154-GIGE1_proc", "#SATES21-CAMS154-GIGE2_proc": "SATES21-CAMS154-GIGE2_proc", "#SATES21-CAMS154-GIGE3_proc": "SATES21-CAMS154-GIGE3_proc", @@ -28,6 +38,7 @@ "#SATES30-RIXS-CAM01_sp": "SATES30-RIXS-CAM01_sp", "#SATMA02_calib": "SATMA02_calib", "#SINBC02-DSRM310_profiles": "SINBC02-DSRM310_profiles", + "#SLAAR21-LCAM-CS841_proc": "SLAAR21-LCAM-CS841_proc", "#SLG-LCAM-C103_proc": "SLG-LCAM-C103_proc", "#SLG-LCAM-C103_sp": "SLG-LCAM-C103_sp", "#jungfrau_proc": "jungfrau_proc", @@ -41,6 +52,9 @@ "#test_stream": "test_stream", "#test_tadej": "test_tadej", "#testdb_ib": "testdb_ib", + "Bernina_mid_IR_CEP_analysis": "Bernina_mid_IR_CEP_analysis", + "Bernina_mid_IR_CEP_populate_pvs": "Bernina_mid_IR_CEP_populate_pvs", + "Bernina_mid_IR_CEP_projection": "Bernina_mid_IR_CEP_projection", "Bernina_tt_kb_populate_pvs": "Bernina_tt_kb_populate_pvs", "S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles", "SARBD01-DSCR110_sp1": "SARBD01-DSCR110_sp_rep", @@ -75,10 +89,6 @@ "SAROP31-PPRM150_proc": "SAROP31-PPRM150_proc", "SATBD02-DSCR050_sp": "SATBD02-DSCR050_sp", "SATBD02-DSCR050_sp1": "SATBD02-DSCR050_sp_rep", - "SATES21-ADTEST1-CAM1_sp": "SATES21-ADTEST1-CAM1_sp", - "SATES21-ADTEST1-CAM2_sp": "SATES21-ADTEST1-CAM2_sp", - "SATES21-ADTEST1-CAM3_sp": "SATES21-ADTEST1-CAM3_sp", - "SATES21-ADTEST1-CAM4_sp": "SATES21-ADTEST1-CAM4_sp", "SATES21-CAMS-PATT1_spec_db": "SATES21-CAMS-PATT1_spec_db", "SATES21-CAMS154-GIGE9_proc": "SATES21-CAMS154-GIGE9_proc", "SATES21-CAMS154-M1_spec_db": "SATES21-CAMS154-M1_spec_db", @@ -95,12 +105,13 @@ "SATOP21-PMOS127-2D_pmos": "SATOP21-PMOS127-2D_pmos", "SATOP31-ATT01_proc": "SATOP31-ATT01_proc", "SATOP31-PMOS132-2D_pmos": "SATOP31-PMOS132-2D_pmos", + "SATOP31-PSRD132_pmos": "SATOP31-PSRD132_pmos", + "SATOP31-PSRD175_pmos": "SATOP31-PSRD175_pmos", "SINDI02-DSCR075_profiles": "SINDI02-DSCR075_profiles", "SLAAR02-LPMO01-C321_proc": "SLAAR02-LPMO01-C321_proc", "SLAAR02-LPMO02-C322_proc": "SLAAR02-LPMO02-C322_proc", "SLAAR21-LCAM-C561_proc": "SLAAR21-LCAM-C561_proc", "SLAAR21-LCAM-C562_proc": "SLAAR21-LCAM-C562_proc", - "SLAAR21-LCAM-CS841_proc": "SLAAR21-LCAM-CS841_proc", "SLAAR21-LCAM-CS842_proc": "SLAAR21-LCAM-CS842_proc", "SLAAR21-LCAM-CS843_proc": "SLAAR21-LCAM-CS843_proc", "SLAAR21-LCAM-CS844_proc": "SLAAR21-LCAM-CS844_proc", @@ -113,5 +124,6 @@ "simulation_3_sp": "simulation_3_sp", "simulation_sp": "simulation_sp", "test_furka": "test_furka", - "test_furka_proc": "test_furka_proc" + "test_furka_proc": "test_furka_proc", + "test_ivan": "test_ivan" } \ No newline at end of file diff --git a/configuration/pipeline_config/servers.json b/configuration/pipeline_config/servers.json index 9803529..584a97a 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -30,6 +30,8 @@ "SARFE10-PBPS053_proc:9004", "SAROP21-ATT01_proc:9003", "Bernina_tt_kb_populate_pvs:9030", + "Bernina_mid_IR_CEP_analysis:9032", + "Bernina_mid_IR_CEP_populate_pvs:9033", "#Bernina_tt_kb_restart_cam:9031", "#SAROP21-ATT01PD_proc:9003", "SATOP31-ATT01_proc:9021", @@ -92,6 +94,7 @@ "SLG-LCAM-C103", "SLG-LCAM-C111", "SLG-LCAM-C071", + "SARBD01-DSCR050", "SARBD02-DSCR050" ], "enabled": true, @@ -232,11 +235,11 @@ "enabled": true, "expanding": false, "instances": [ + "Bernina_mid_IR_CEP_projection:9021", "SARES20-CAMS142-M1_psen_db:9003", "SARES20-CAMS142-M4_psen_db:9001", "SARES20-CAMS142-M5_psen_db:8011", "SARES20-CAMS142-M5_psen_db_proxy:9011", - "Bernina_tt_test:9020", "SARES20-PROF142-M1_sp", "SARES20-PROF142-M1_proc:9016", "SARES20-PROF142-M1_ib:9036", @@ -248,7 +251,6 @@ "SARES20-PROF146-M1_sp", "SARES20-PROF146-M1_proc:9018", "SARES20-DSDPPRM_proc:9014", - "SLAAR21-LCAM-CS841_proc:9021", "SARES21-PBPS141_proc", "SLAAR21-LCAM-CS842_proc:9022", "SLAAR21-LCAM-CS843_proc:9023", @@ -322,13 +324,16 @@ "expanding": false, "instances": [ "SATOP11-PSAS079_psas:9019", + "SATOP31-PSRD132_pmos:9007", + "SATOP31-PSRD175_pmos:9009", "SATOP31-PMOS132-2D_sp", "SATOP21-PMOS127-2D_pmos:9017", "SATOP31-PMOS132-2D_pmos:9001", - "SATES21-ADTEST1-CAM1_sp", - "SATES21-ADTEST1-CAM2_sp", - "SATES21-ADTEST1-CAM3_sp", - "SATES21-ADTEST1-CAM4_sp" + "SATES21-ADTEST1-CAM1_proc:9071", + "SATES21-ADTEST1-CAM2_proc:9072", + "SATES21-ADTEST1-CAM3_proc:9073", + "SATES21-ADTEST1-CAM4_proc:9074", + "SATES21-ADTEST1-CAM5_proc:9075" ] }, "http://sf-daqsync-18.psi.ch:8881": { @@ -354,6 +359,7 @@ "SLG-LCAM-C082_proc:9005", "SLG-LCAM-C083_proc:9006", "SLG-LCAM-C091_proc:9007", + "test_ivan:9050", "test_tadej:9020", "DET-FURKA-1_sp" ] diff --git a/configuration/pipeline_config/test_ivan.json b/configuration/pipeline_config/test_ivan.json new file mode 100644 index 0000000..d75dbeb --- /dev/null +++ b/configuration/pipeline_config/test_ivan.json @@ -0,0 +1,9 @@ +{ + "name": "test_ivan", + "buffer_size": 0, + "pid_buffer": 0, + "pipeline_type": "fanin", + "input_mode": "PULL", + "input_stream": "tcp://*:8000", + "mode": "PUB" +} \ No newline at end of file diff --git a/configuration/user_scripts/Bernina_mid_IR_CEP_analysis.py b/configuration/user_scripts/Bernina_mid_IR_CEP_analysis.py new file mode 100644 index 0000000..8d9cd49 --- /dev/null +++ b/configuration/user_scripts/Bernina_mid_IR_CEP_analysis.py @@ -0,0 +1,213 @@ +from collections import deque +import numpy as np +from scipy.optimize import curve_fit +from scipy.special import erf +from scipy.stats import binned_statistic +from scipy.signal import hilbert, chirp, find_peaks, savgol_filter +from scipy import ndimage +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions +from logging import getLogger +import numpy as np + + +initialized = False +p0 = None + +def initialize(parameters, sig): + global initialized, buffer + buffer = deque(maxlen=parameters["dark_buffer_length"]) + buffer.append(np.ones(np.shape(sig))) + buffer.append(np.ones(np.shape(sig))) + initialized = True + +def do_fft(t, tr, lm=False, lx=False, padding=False, bins=None): + if bins is not None: + xbin = np.linspace(0,t[-1]+(t[1]-t[0])/2,bins+1) + tr, _, _ = binned_statistic(t, tr, statistic='mean', bins=xbin, range=None) + t = np.linspace(0,t[-1],bins) + if (lm and lx): + lm = np.argmin(abs(t-lm)); + lx = np.argmin(abs(t-lx)) + tr=tr[lm:lx] + t=t[lm:lx] + + if padding: + N = t.size + te = t[1]-t[0] + t = np.arange(N+pad)*te+t[0] + trp = np.zeros(N+pad) + trp[:N]=tr + tr=trp + + N = t.size + T = t[N-1]-t[0] + te = t[1]-t[0] + fe = 1.0/te + tfd=np.fft.fft(tr)/N + freq=np.arange(N)*1.0/T + tfd = tfd[:int(len(tfd)/2)] + freq = freq[:int(len(freq)/2)] + return freq, np.absolute(tfd), np.real(tfd), np.imag(tfd) + +def gauss(x, x0, fwhm, a): + return a*np.exp(-(x-x0)**2/fwhm**2*4*np.log(2)) + +def gauss_sin(x, x0, fwhm, a, f, phase): + return a*np.exp(-(x-x0)**2/fwhm**2*4*np.log(2))*np.sin(2*np.pi*f*(x-x0)+phase) + +def fit_data(x, y, bins=None, diag=False, sigma=None): + bounds=[[x[abs(y).argmax()]-0.1, 0.05, 0.005, 15., -np.inf], [x[abs(y).argmax()]+0.1, 2., 10., 35., np.inf]] + global p0 + if p0 is None or np.any([~(lb0] + idx_closest = np.argmin(np.abs(xp_pos-x0)) + weights=abs(y)[xp[:-1]]+abs(y)[xp[1:]] + f = 1/(dt*np.average(np.diff(xp), weights=weights)*2) + #f = 1/(dt*np.mean(np.diff(xp_pos[idx_closest-2:idx_closest+1]))) works but uses only two points + #f = 1/(dt*np.mean(np.diff(xp_pos))) <-- rather noisy + phase = f*(np.min(xp_pos[xp_pos>x0]-x0)*dt)*2*np.pi + x0 = x0*dt + fwhm = fwhm*dt + return x0, fwhm, a, f, phase + +def normstep(step): + """normalizing a test signal for np.correlate""" + step = step - np.mean(step) + step = step / np.sum(step**2) + return step + +def get_reference_function(sigma_px=30, reflen=150): + rng = reflen / np.sqrt(2) / sigma_px / 2 + ref = -erf(np.linspace(-rng, rng, reflen)) / 2 + ref = normstep(ref) + return ref + +def process(bsdata, pid, timestanp, parameters): + global initialized + + ## initialize all values sent to BS stream to None + x=None + sig=None + bg=None + time=None + ratio=None + freq=None + fft_frequency = None + fft_amplitude = None + fft_amplitude_real = None + fft_amplitude_imag = None + x0=None + fwhm=None + a=None + f=None + phase=None + c=None + + + ## params used for evaluation + calibration = parameters["calibration"] + padding = parameters["padding"] + lm = parameters["time_min"] + lx = parameters["time_max"] + + + ## get data and events for sorting + events = bsdata[parameters["events"]] + sig = bsdata[parameters["sig"]] + x = np.arange(0,len(sig)) + + if not initialized: + initialize(parameters, sig) + + is_midir_dark = parameters["is_midir_dark"] + is_midir_dark_evt = False + + # add to dark reference + if is_midir_dark: + is_midir_dark_evt = events[parameters["event_code_midir_dark"]] + if is_midir_dark_evt: + buffer.append(sig) + # or analyze + bg = np.mean(buffer, axis=0) + if not is_midir_dark_evt: + ratio = sig/bg + time = np.polyval(calibration, x) + #fft_frequency, fft_amplitude, fft_amplitude_real, fft_amplitude_imag = do_fft(time, ratio-1, lm=False, lx=False, padding=False, bins=parameters["fft_bins"]) + ref=get_reference_function(parameters["sigma_px"], parameters["reflen"]) + c = np.correlate(ratio-1, ref, "same") + if parameters["fit_data"]: + x0, fwhm, a, f, phase = fit_data(time, c, bins=parameters["bins"]) + else: + x0, fwhm, a, f, phase = find_signal(time, c, distance=parameters["distance"]) + + data = { + "SARES20-CEP01:spectrometer_x": x, + "SARES20-CEP01:spectrometer_signal": sig, + "SARES20-CEP01:spectrometer_background": bg, + "SARES20-CEP01:spectrometer_time": time, + "SARES20-CEP01:spectrometer_ratio": ratio, + "SARES20-CEP01:spectrometer_correlation": c, + "SARES20-CEP01:fft_frequency": fft_frequency, + "SARES20-CEP01:fft_amplitude_abs": fft_amplitude, + "SARES20-CEP01:fft_amplitude_real": fft_amplitude_real, + "SARES20-CEP01:fft_amplitude_imag": fft_amplitude_imag, + "SARES20-CEP01:fit_x0": x0, + "SARES20-CEP01:fit_fwhm": fwhm, + "SARES20-CEP01:fit_amplitude": a, + "SARES20-CEP01:fit_frequency": f, + "SARES20-CEP01:fit_phase": phase, + } + + return data + + + + + diff --git a/configuration/user_scripts/Bernina_mid_IR_CEP_populate_pvs.py b/configuration/user_scripts/Bernina_mid_IR_CEP_populate_pvs.py new file mode 100644 index 0000000..0d1109b --- /dev/null +++ b/configuration/user_scripts/Bernina_mid_IR_CEP_populate_pvs.py @@ -0,0 +1,26 @@ +import epics +from threading import Thread +from cam_server.utils import create_thread_pvs, epics_lock +initialized = False + +def initialize(params): + global initialized, pvs + epics.ca.clear_cache() + pvs = create_thread_pvs(params["pv_channels"]) + #pvs = create_thread_pvs([params["pv_phase"]])[0] + #pvs.wait_for_connection() + initialized = True + +def process(data, pid, timestanp, params): + global initialized, pvs + if not initialized: + initialize(params) + ret={} + for bs_ch, pv in zip(params["bsread_channels"], pvs): + pv.put(data[bs_ch]) + ret[bs_ch]=data[bs_ch] + #ret = {"hu": data["SARES20-CEP01:fit_phase"]} + #pvs.put(data["SARES20-CEP01:fit_phase"]) + #for bs_ch in params["pvs"].keys(): + # ret[bs_ch] = data[bs_ch] + return ret \ No newline at end of file diff --git a/configuration/user_scripts/Bernina_mid_IR_CEP_projection.py b/configuration/user_scripts/Bernina_mid_IR_CEP_projection.py new file mode 100644 index 0000000..f531bfb --- /dev/null +++ b/configuration/user_scripts/Bernina_mid_IR_CEP_projection.py @@ -0,0 +1,15 @@ +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions +from logging import getLogger +import numpy as np + +_logger = getLogger(__name__) + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata): + ret = OrderedDict() + prefix = parameters["camera_name"] + (x_profile, y_profile) = functions.get_x_y_profile(image) + x_profile = image[-1,:] + ret[prefix+":x_profile"] = x_profile + ret[prefix+":y_profile"] = y_profile + return ret \ No newline at end of file diff --git a/configuration/user_scripts/Laser_Quick_Int.py b/configuration/user_scripts/Laser_Quick_Int.py new file mode 100644 index 0000000..9fdbc90 --- /dev/null +++ b/configuration/user_scripts/Laser_Quick_Int.py @@ -0,0 +1,21 @@ +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions +from logging import getLogger + +_logger = getLogger(__name__) + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata): + ret = OrderedDict() + prefix = parameters["camera_name"] + (x_profile, y_profile) = functions.get_x_y_profile(image) + #_, _, _, x_fit_mean, x_fit_standard_deviation, _, _ = functions.gauss_fit(x_profile, x_axis) + #_, _, _, y_fit_mean, y_fit_standard_deviation, _, _ = functions.gauss_fit(y_profile, y_axis) + x_fwhm = functions.get_fw(x_axis,x_profile) + #y_fwhm = functions.get_fw(y_axis,y_profile) + intensity = x_profile.sum() + #ret[prefix+":intensity"] = intensity + ret[prefix+":test_int"] = int(intensity) + #ret[prefix+":x_fit_mean"] = x_fit_mean + #ret[prefix+":x_fwhm"] = x_fwhm + #ret[prefix+":x_fit_standard_deviation"] = x_fit_standard_deviation + return ret \ No newline at end of file diff --git a/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py b/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py index a2712a9..d9b19eb 100644 --- a/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py +++ b/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py @@ -74,8 +74,8 @@ def edge(filter_name, backgrounds, signals, peakback): # interpolate to get unevenly sampled in frequency space (back to original wavelength space) sig_uninterp = interpolate(nus_new, nus, sig_filtered[..., 0:2048]) + 1 # peak via the derivative - #sig_deriv = 20000 * gaussian_filter1d(sig_uninterp, 30, order=1) - sig_deriv = 20000*np.gradient(sig_uninterp) + sig_deriv = 20000 * gaussian_filter1d(sig_uninterp, 30, order=1) + #sig_deriv = 20000*np.gradient(sig_uninterp) sig_deriv -= peakback sig_deriv *= signal.tukey(2048) # just added Nov 20 2024 #peak_pos = 1024 - (np.argmax(sig_deriv[500:1500], axis=-1) + 500) diff --git a/configuration/user_scripts/SAROP21-ATT01_proc.py b/configuration/user_scripts/SAROP21-ATT01_proc.py index b0a0192..0d7f942 100644 --- a/configuration/user_scripts/SAROP21-ATT01_proc.py +++ b/configuration/user_scripts/SAROP21-ATT01_proc.py @@ -57,6 +57,7 @@ def get_max(c, dpx_poly=None, offset=0): return im + offset, mx def process(data, pid, timestanp, params): + global initialized if not initialized: initialize(params) diff --git a/configuration/user_scripts/midir_cep.py b/configuration/user_scripts/midir_cep.py new file mode 100644 index 0000000..a9182bf --- /dev/null +++ b/configuration/user_scripts/midir_cep.py @@ -0,0 +1,13 @@ +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions +from logging import getLogger + +_logger = getLogger(__name__) + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata): + ret = OrderedDict() + prefix = parameters["camera_name"] + (x_profile, y_profile) = functions.get_x_y_profile(image) + ret[prefix+":x_profile"] = x_profile + ret[prefix+":y_profile"] = y_profile + return ret \ No newline at end of file diff --git a/configuration/user_scripts/pmos_2.py b/configuration/user_scripts/pmos_2.py new file mode 100644 index 0000000..4a7d124 --- /dev/null +++ b/configuration/user_scripts/pmos_2.py @@ -0,0 +1,163 @@ +from logging import getLogger +from cam_server.pipeline.data_processing import functions +from cam_server.utils import create_thread_pvs, epics_lock +from collections import deque +import json +import numpy as np +import scipy.signal +import numba +import time +from threading import Thread + +numba.set_num_threads(4) + +_logger = getLogger(__name__) + +# Shared variables +channel_names = None +roi = [0, 0] +initialized = False +sent_pid = -1 +nrows = 1 +axis = None +buffer = deque(maxlen=5) + + +@numba.njit(parallel=False) +def get_spectrum(image, background): + """Extracts a spectrum from the image by subtracting background.""" + y, x = image.shape + profile = np.zeros(x, dtype=np.float64) + for i in numba.prange(y): + for j in range(x): + profile[j] += image[i, j] - background[i, j] + return profile + + +def update_PVs(buffer, output_pv_name, center_pv_name, fwhm_pv_name, fit_rms_pv_name, fit_res_pv_name, com_pv_name, std_pv_name, res_pv_name): + """Updates EPICS PVs using buffered processing.""" + [output_pv, center_pv, fwhm_pv, fit_rms_pv, fit_res_pv, com_pv, std_pv, res_pv] = create_thread_pvs( + [output_pv_name, center_pv_name, fwhm_pv_name, fit_rms_pv_name, fit_res_pv_name, com_pv_name, std_pv_name, res_pv_name] + ) + + while True: + time.sleep(0.1) + try: + rec = buffer.popleft() + except IndexError: + continue + try: + if output_pv and output_pv.connected and (rec[0] is not None): + output_pv.put(rec[0]) + if center_pv and center_pv.connected and (rec[1] is not None): + center_pv.put(rec[1]) + if fwhm_pv and fwhm_pv.connected and (rec[2] is not None): + fwhm_pv.put(rec[2]) + if com_pv and com_pv.connected and (rec[3] is not None): + com_pv.put(rec[3]) + if std_pv and std_pv.connected and (rec[4] is not None): + std_pv.put(rec[4]) + if fit_rms_pv and fit_rms_pv.connected and (rec[5] is not None): + fit_rms_pv.put(rec[5]) + if fit_res_pv and fit_res_pv.connected and (rec[6] is not None): + fit_res_pv.put(rec[6]) + if res_pv and res_pv.connected and (rec[7] is not None): + res_pv.put(rec[7]) + except Exception as e: + _logger.exception(f"Error updating channels: {e}") + + +def initialize(params): + """Initializes processing and starts the PV update thread.""" + global ymin_pv, ymax_pv, axis_pv, buffer, channel_names + + camera_name = params["camera_name"] + output_pv_name = params["e_int_name"] + axis_pv_name = params["e_axis_name"] + center_pv_name = camera_name + ":FIT-COM" + fwhm_pv_name = camera_name + ":FIT-FWHM" + fit_rms_pv_name = camera_name + ":FIT-RMS" + fit_res_pv_name = camera_name + ":FIT-RES" + ymin_pv_name = camera_name + ":SPC_ROI_YMIN" + ymax_pv_name = camera_name + ":SPC_ROI_YMAX" + com_pv_name = camera_name + ":SPECT-COM" + std_pv_name = camera_name + ":SPECT-RMS" + res_pv_name = camera_name + ":SPECT-RES" + + thread = Thread(target=update_PVs, args=(buffer, output_pv_name, center_pv_name, fwhm_pv_name, fit_rms_pv_name, fit_res_pv_name, com_pv_name, std_pv_name, res_pv_name)) + thread.start() + + channel_names = [ymin_pv_name, ymax_pv_name, axis_pv_name] + + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata=None, background=None): + """Processes the image and extracts spectrum features.""" + try: + global roi, initialized, sent_pid, nrows, axis, buffer + + if not initialized: + initialize(parameters) + initialized = True + [ymin_pv, ymax_pv, axis_pv] = create_thread_pvs(channel_names) + + camera_name = parameters["camera_name"] + + if ymin_pv and ymin_pv.connected: + roi[0] = ymin_pv.value + if ymax_pv and ymax_pv.connected: + roi[1] = ymax_pv.value + + if axis_pv and axis_pv.connected: + axis = axis_pv.value + else: + axis = None + + if axis is None or len(axis) < image.shape[1]: + _logger.warning("Invalid energy axis") + return None + + axis = axis[:image.shape[1]] + processing_image = image.astype(np.float32) - np.float32(parameters["pixel_bkg"]) + nrows, ncols = processing_image.shape + + background_image = parameters.pop('background_data', None) + if isinstance(background_image, np.ndarray) and background_image.shape == processing_image.shape: + spectrum = get_spectrum(processing_image, background_image) + else: + spectrum = np.sum(processing_image, axis=0) + + smoothed_spectrum = scipy.signal.savgol_filter(spectrum, 51, 3) + minimum, maximum = smoothed_spectrum.min(), smoothed_spectrum.max() + amplitude = maximum - minimum + skip = amplitude <= nrows * 1.5 + + offset, amplitude, center, sigma = functions.gauss_fit_psss(smoothed_spectrum[::2], axis[::2], offset=minimum, amplitude=amplitude, skip=skip, maxfev=10) + + spectrum_com = np.sum(axis * smoothed_spectrum) / np.sum(smoothed_spectrum) + spectrum_std = np.sqrt(np.sum((axis - spectrum_com) ** 2 * smoothed_spectrum)) + + processed_data = { + camera_name + ":SPECTRUM_Y": spectrum, + camera_name + ":SPECTRUM_Y_SUM": np.sum(spectrum), + camera_name + ":SPECTRUM_X": axis, + camera_name + ":FIT-COM": np.float64(center), + camera_name + ":FIT-FWHM": np.float64(2.355 * sigma), + camera_name + ":FIT-RMS": np.float64(sigma), + camera_name + ":FIT-RES": (np.float64(2.355 * sigma) / np.float64(center)) * 1000, + camera_name + ":SPECT-COM": spectrum_com, + camera_name + ":SPECT-RMS": spectrum_std, + camera_name + ":SPECT-RES": (np.float64(2.355 * spectrum_std) / np.float64(spectrum_com)) * 1000, + } + + if epics_lock.acquire(False): + try: + if pulse_id > sent_pid: + sent_pid = pulse_id + buffer.append((spectrum, center, 2.355 * sigma, spectrum_com, spectrum_std, sigma, (2.355 * sigma / center) * 1000, (2.355 * spectrum_std / spectrum_com) * 1000)) + finally: + epics_lock.release() + + return processed_data # Ensure the processed data is returned + except Exception as ex: + _logger.warning(str(ex)) + return {} diff --git a/configuration/user_scripts/psss_cam_swap.py b/configuration/user_scripts/psss_cam_swap.py new file mode 100644 index 0000000..cb4af5b --- /dev/null +++ b/configuration/user_scripts/psss_cam_swap.py @@ -0,0 +1,141 @@ +from logging import getLogger + +from cam_server.pipeline.data_processing import functions +from cam_server.utils import create_thread_pvs, epics_lock +from collections import defaultdict, deque + +import json + +import numpy as np +import numpy +import scipy.signal +import scipy.optimize +import numba +import time +import sys +from threading import Thread + +numba.set_num_threads(4) + +_logger = getLogger(__name__) + +channel_names = None +output_pv, center_pv, fwhm_pv, ymin_pv, ymax_pv, axis_pv = None, None, None, None, None, None +roi = [0, 0] +initialized = False +sent_pid = -1 +nrows = 1 +axis = None +buffer = deque(maxlen=5) + +NEW_CAMERA_NAME = "SARFE10-PSSS059-LB" +OLD_CAMERA_NAME = "SARFE10-PSSS059" + + +def update_PVs(buffer, output_pv_name, center_pv_name, fwhm_pv_name, fit_rms_pv_name, fit_res_pv_name, com_pv_name, std_pv_name, res_pv_name): + [output_pv, center_pv, fwhm_pv, fit_rms_pv, fit_res_pv, com_pv, std_pv, res_pv] = create_thread_pvs( + [output_pv_name, center_pv_name, fwhm_pv_name, fit_rms_pv_name, fit_res_pv_name, com_pv_name, std_pv_name, res_pv_name] + ) + + while True: + time.sleep(0.1) + try: + rec = buffer.popleft() + except: + continue + try: + if output_pv and output_pv.connected and (rec[0] is not None): + output_pv.put(rec[0]) + if center_pv and center_pv.connected and (rec[1] is not None): + center_pv.put(rec[1]) + if fwhm_pv and fwhm_pv.connected and (rec[2] is not None): + fwhm_pv.put(rec[2]) + if com_pv and com_pv.connected and (rec[3] is not None): + com_pv.put(rec[3]) + if std_pv and std_pv.connected and (rec[4] is not None): + std_pv.put(rec[4]) + if fit_rms_pv and fit_rms_pv.connected and (rec[5] is not None): + fit_rms_pv.put(rec[5]) + if fit_res_pv and fit_res_pv.connected and (rec[6] is not None): + fit_res_pv.put(rec[6]) + if res_pv and res_pv.connected and (rec[7] is not None): + res_pv.put(rec[7]) + except: + _logger.exception("Error updating channels") + + +def initialize(params): + global ymin_pv, ymax_pv, axis_pv, output_pv, center_pv, fwhm_pv, buffer + global channel_names, spectra_buffer + + camera_name = NEW_CAMERA_NAME # Use the new camera + output_pv_name = params["e_int_name"] + axis_pv_name = params["e_axis_name"] + center_pv_name = OLD_CAMERA_NAME + ":FIT-COM" # Keep old names + fwhm_pv_name = OLD_CAMERA_NAME + ":FIT-FWHM" + fit_rms_pv_name = OLD_CAMERA_NAME + ":FIT-RMS" + fit_res_pv_name = OLD_CAMERA_NAME + ":FIT-RES" + ymin_pv_name = OLD_CAMERA_NAME + ":SPC_ROI_YMIN" + ymax_pv_name = OLD_CAMERA_NAME + ":SPC_ROI_YMAX" + com_pv_name = OLD_CAMERA_NAME + ":SPECT-COM" + std_pv_name = OLD_CAMERA_NAME + ":SPECT-RMS" + res_pv_name = OLD_CAMERA_NAME + ":SPECT-RES" + + thread = Thread(target=update_PVs, args=(buffer, output_pv_name, center_pv_name, fwhm_pv_name, fit_rms_pv_name, fit_res_pv_name, com_pv_name, std_pv_name, res_pv_name)) + thread.start() + channel_names = [ymin_pv_name, ymax_pv_name, axis_pv_name] + + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata=None, background=None): + try: + global roi, initialized, sent_pid, nrows, axis + global channel_names, buffer + + if not initialized: + initialize(parameters) + initialized = True + [ymin_pv, ymax_pv, axis_pv] = create_thread_pvs(channel_names) + processed_data = dict() + camera_name = NEW_CAMERA_NAME # Use the new camera + + if ymin_pv and ymin_pv.connected: + roi[0] = ymin_pv.value + if ymax_pv and ymax_pv.connected: + roi[1] = ymax_pv.value + + if axis_pv and axis_pv.connected: + axis = axis_pv.value + else: + axis = None + + if axis is None: + _logger.warning("Energy axis not connected"); + return None + + if len(axis) < image.shape[1]: + _logger.warning("Energy axis length %d < image width %d", len(axis), image.shape[1]) + return None + + axis = axis[:image.shape[1]] + processing_image = image.astype(np.float32) - np.float32(parameters["pixel_bkg"]) + spectrum = np.sum(processing_image, axis=0) + smoothed_spectrum = scipy.signal.savgol_filter(spectrum, 51, 3) + + offset, amplitude, center, sigma = functions.gauss_fit_psss(smoothed_spectrum[::2], axis[::2], offset=smoothed_spectrum.min(), amplitude=smoothed_spectrum.max() - smoothed_spectrum.min(), skip=False, maxfev=10) + + processed_data[parameters["e_int_name"]] = spectrum + processed_data[OLD_CAMERA_NAME + ":FIT-COM"] = np.float64(center) + processed_data[OLD_CAMERA_NAME + ":FIT-FWHM"] = np.float64(2.355 * sigma) + processed_data[OLD_CAMERA_NAME + ":FIT-RMS"] = np.float64(sigma) + processed_data[OLD_CAMERA_NAME + ":FIT-RES"] = (np.float64(2.355 * sigma) / np.float64(center)) * 1000 + + if epics_lock.acquire(False): + try: + if pulse_id > sent_pid: + sent_pid = pulse_id + buffer.append((processed_data[parameters["e_int_name"]], processed_data[OLD_CAMERA_NAME + ":FIT-COM"], processed_data[OLD_CAMERA_NAME + ":FIT-FWHM"], processed_data[OLD_CAMERA_NAME + ":FIT-RES"])) + finally: + epics_lock.release() + return processed_data + except Exception as ex: + _logger.warning(str(sys.exc_info)) diff --git a/configuration/user_scripts/single_photon.c b/configuration/user_scripts/single_photon.c index 81d2761..a419bd5 100644 --- a/configuration/user_scripts/single_photon.c +++ b/configuration/user_scripts/single_photon.c @@ -11,7 +11,7 @@ const char *CHANNEL_NAMES[] = {"EVENT_NUM", "EVENT_I", "EVENT_J", "EVENT_CHARGE" // max number of events per frame -#define MAX_NUM_EVENTS 400 +#define MAX_NUM_EVENTS 600 #define EVENT_CHANNELS 7 double evt_p[EVENT_CHANNELS][MAX_NUM_EVENTS]; diff --git a/configuration/user_scripts/test_midir_projection.py b/configuration/user_scripts/test_midir_projection.py new file mode 100644 index 0000000..a9182bf --- /dev/null +++ b/configuration/user_scripts/test_midir_projection.py @@ -0,0 +1,13 @@ +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions +from logging import getLogger + +_logger = getLogger(__name__) + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata): + ret = OrderedDict() + prefix = parameters["camera_name"] + (x_profile, y_profile) = functions.get_x_y_profile(image) + ret[prefix+":x_profile"] = x_profile + ret[prefix+":y_profile"] = y_profile + return ret \ No newline at end of file diff --git a/configuration/user_scripts/test_tadej.py b/configuration/user_scripts/test_tadej.py index 958572f..7ba7122 100644 --- a/configuration/user_scripts/test_tadej.py +++ b/configuration/user_scripts/test_tadej.py @@ -1,7 +1,7 @@ count = 0 def process(data, pulse_id, timestamp, params): - global count + global count prefix = "SFTEST-TADEJ:" data={prefix+"INT":count} count=count+1