May 2023

configuration/camera_config/SARES20-CAMS142-M1.json

@@ -16,7 +16,7 @@
  "rotate": 0,
  "roi": null,
  "image_background": null,
- "source_type": "bsread",
+ "source_type": "epics",
  "forwarder_port": 9002,
  "prefix": "SARES20-CAMS142-M1",
  "name": "SARES20-CAMS142-M1",

configuration/camera_config/SARES20-CAMS142-M3.json

@@ -1,13 +1,13 @@
 {
  "camera_calibration": {
   "reference_marker": [
-   338,
-   502,
-   441,
-   606
+   1209,
+   892,
+   1328,
+   1050
   ],
-  "reference_marker_width": 413.0,
-  "reference_marker_height": 419.0,
+  "reference_marker_width": 231.0,
+  "reference_marker_height": 307.0,
   "angle_horizontal": 0.0,
   "angle_vertical": 0.0
  },
@@ -25,6 +25,6 @@
   "Bernina"
  ],
  "alias": [
-  "SAMPLECAM_INLINE (SARES20-CAMS142-M3)"
+  "CAMERA_BSSS (SARES20-CAMS142-M3)"
  ]
 }

configuration/camera_config/SARES20-PROF141-M1.json

@@ -1,13 +1,13 @@
 {
  "camera_calibration": {
   "reference_marker": [
-   260,
-   176,
-   424,
-   334
+   316,
+   228,
+   386,
+   294
   ],
-  "reference_marker_width": 500.0,
-  "reference_marker_height": 500.0,
+  "reference_marker_width": 200.0,
+  "reference_marker_height": 200.0,
   "angle_horizontal": 0.0,
   "angle_vertical": 0.0
  },

configuration/camera_config/SARES20-PROF142-M1.json

@@ -1,13 +1,13 @@
 {
  "camera_calibration": {
   "reference_marker": [
-   428,
-   166,
-   559,
-   245
+   164,
+   37,
+   564,
+   431
   ],
-  "reference_marker_width": 100.0,
-  "reference_marker_height": 60.0,
+  "reference_marker_width": 300.0,
+  "reference_marker_height": 300.0,
   "angle_horizontal": 0.0,
   "angle_vertical": 0.0
  },

configuration/camera_config/SAROP21-PPRM133.json

@@ -23,6 +23,7 @@
   "Photonics",
   "Bernina"
  ],
+ "forwarder_port": 9019,
  "alias": [
   "PROF_OPT (SAROP21-PPRM133)"
  ]

configuration/camera_config/SAROP31-PPRM113.json

@@ -16,7 +16,7 @@
  "rotate": 0,
  "roi": null,
  "image_background": null,
- "source_type": "bsread",
+ "source_type": "epics",
  "name": "SAROP31-PPRM113",
  "source": "SAROP31-PPRM113",
  "forwarder_port": 9000,

configuration/camera_config/SATES30-CAMS182-GIGE2.json

@@ -1,10 +1,10 @@
 {
  "camera_calibration": {
   "reference_marker": [
-   1021,
-   400,
-   1687,
-   1072
+   396,
+   30,
+   1579,
+   1218
   ],
   "reference_marker_width": 5000.0,
   "reference_marker_height": 5000.0,
@@ -16,8 +16,8 @@
  "rotate": 0,
  "roi": null,
  "image_background": null,
- "forwarder_port": 9005,
  "source_type": "bsread",
+ "forwarder_port": 9005,
  "source": "SATES30-CAMS182-GIGE2",
  "name": "SATES30-CAMS182-GIGE2",
  "prefix": "SATES30-CAMS182-GIGE2",

configuration/camera_config/SLAAR21-LCAM-C562.json

@@ -0,0 +1,16 @@
+{
+ "camera_calibration": null,
+ "mirror_x": false,
+ "mirror_y": false,
+ "rotate": 0,
+ "roi": null,
+ "image_background": null,
+ "source_type": "bsread",
+ "source": "SLAAR21-LCAM-C562",
+ "group": [
+  "Laser",
+  "Bernina"
+ ],
+ "alias": [],
+ "name": "SLAAR21-LCAM-C562"
+}

configuration/camera_config/permanent_instances.json

@@ -1,5 +1,6 @@
 {
     "#S10BC02-DSRM310": "S10BC02-DSRM310",
+    "#SAROP21-PPRM133": "SAROP21-PPRM133",
     "#SINBC02-DSRM310": "SINBC02-DSRM310",
     "S10BD01-DSCR030": "S10BD01-DSCR030",
     "SARCL01-DSCR170": "SARCL01-DSCR170",

configuration/camera_config/servers.json

@@ -84,7 +84,8 @@
             "SARES20-PROF142-M1",
             "SARES20-PROF146-M1",
             "SLAAR02-LPMO01-C321",
-            "SLAAR02-LPMO02-C322"
+            "SLAAR02-LPMO02-C322",
+            "SAROP21-PPRM133"
         ]
     },
     "http://sf-daqsync-15.psi.ch:8880": {

configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json

@@ -1,12 +1,12 @@
 {
  "image_background_enable": "passive",
- "image_background": "SARES11-SPEC125-M1_20230130_180205_925481",
+ "image_background": "SARES11-SPEC125-M1_20230507_163124_994260",
  "image_threshold": null,
  "image_region_of_interest": null,
  "image_good_region": null,
  "image_slices": null,
  "pipeline_type": "processing",
- "function": "psen_min_processing.py",
+ "function": "SARES11-SPEC125-M1_tt.py",
  "camera_name": "SARES11-SPEC125-M1",
  "name": "SARES11-SPEC125-M1_psen_db",
  "mode": "PUSH",
@@ -26,9 +26,6 @@
  "send_buffer_size": 50,
  "block": false,
  "debug": true,
- "bsread_channels": [
-  "SAR-CVME-TIFALL4:EvtSet"
- ],
  "bsread_image_buf": 1000,
  "bsread_data_buf": 1000,
  "abort_on_timeout": true,

configuration/pipeline_config/SARES20-PROF142-M1_proc.json

@@ -9,5 +9,8 @@
  "camera_name": "SARES20-PROF142-M1",
  "name": "SARES20-PROF142-M1_proc",
  "function": "bernina",
+ "processing_threads": 3,
+ "thread_buffer_size": 20,
+ "send_buffer_size": 50,
  "mode": "PUSH"
-}
+}

configuration/pipeline_config/SARFE10-PBPS053_proc.json

@@ -17,12 +17,12 @@
  "down": "SARFE10-CVME-PHO6212:Lnk9Ch13-DATA-SUM",
  "right": "SARFE10-CVME-PHO6212:Lnk9Ch14-DATA-SUM",
  "left": "SARFE10-CVME-PHO6212:Lnk9Ch15-DATA-SUM",
- "up_calib": 0.29332902630344176,
- "down_calib": 0.30758809127657744,
- "left_calib": 0.8548507102577435,
- "right_calib": 0.5254048353918549,
- "horiz_calib": -3.9686377191422566,
- "vert_calib": -6.757177531835748,
+ "up_calib": 0.19215574732326865,
+ "down_calib": 0.19161095135374767,
+ "left_calib": 0.4934418822887078,
+ "right_calib": 0.3066554301618752,
+ "horiz_calib": -3.9880710835817026,
+ "vert_calib": -15.697106429975813,
  "uJ_calib": 834.5191797495979,
  "threshold": 0,
  "queue_length": 5000,
@@ -60,9 +60,9 @@
   0.3
  ],
  "calib_x_norm": [
-  0.07725444027758947,
-  -0.0008820870911578288,
-  -0.0739309393064352
+  0.07446858822356554,
+  -0.0004189459440790225,
+  -0.07598008418603895
  ],
  "calib_y_range": [
   -0.3,
@@ -70,20 +70,20 @@
   0.3
  ],
  "calib_y_norm": [
-  0.044622126986971204,
-  -0.0008061137879948807,
-  -0.04417234336298802
+  0.020097238728032586,
+  0.00016566847491786981,
+  -0.018126366538108462
  ],
  "calib_time": "2022-11-28 16:19:37",
- "calib_datetime": "2023-03-20 14:25:54",
+ "calib_datetime": "2023-04-24 14:21:56",
  "calib_x_norm_std": [
-  0.09961747340145947,
-  0.10733784051069324,
-  0.0929030520787079
+  0.042364754079521505,
+  0.04270600465262558,
+  0.0422035733818831
  ],
  "calib_y_norm_std": [
-  0.09287619707647062,
-  0.092107183273319,
-  0.09302589672639311
+  0.030202455249566967,
+  0.029892666541751815,
+  0.02977800503470968
  ]
 }

configuration/pipeline_config/SAROP11-PBPS110_proc.json

@@ -19,12 +19,12 @@
  "down": "SAROP11-CVME-PBPS2:Lnk9Ch11-DATA-SUM",
  "right": "SAROP11-CVME-PBPS2:Lnk9Ch14-DATA-SUM",
  "left": "SAROP11-CVME-PBPS2:Lnk9Ch15-DATA-SUM",
- "up_calib": 0.6296855239312056,
- "down_calib": 0.6822391000717031,
- "left_calib": 0.4013112158986877,
- "right_calib": 0.43663511455622184,
- "horiz_calib": -4.489940533745727,
- "vert_calib": 4.432874535470348,
+ "up_calib": 5.487581379365339,
+ "down_calib": 6.5694290116170215,
+ "left_calib": 4.714773884372932,
+ "right_calib": 4.9736472409598855,
+ "horiz_calib": -4.131288944529578,
+ "vert_calib": 4.049881575553348,
  "uJ_calib": 605.4608924473305,
  "threshold": 0,
  "queue_length": 5000,
@@ -62,9 +62,9 @@
   0.3
  ],
  "calib_x_norm": [
-  0.06455376367074324,
-  -0.004423482191118885,
-  -0.06907829570520817
+  0.07278482085737828,
+  -0.0017416239288806006,
+  -0.0724483032489582
  ],
  "calib_y_range": [
   -0.3,
@@ -72,19 +72,19 @@
   0.3
  ],
  "calib_y_norm": [
-  -0.06564181411065985,
-  -0.0008317809501211942,
-  0.06971053913078763
+  -0.07336254243962131,
+  -8.194435002014264e-05,
+  0.07478993777654896
  ],
- "calib_datetime": "2023-03-20 14:28:15",
+ "calib_datetime": "2023-05-02 10:03:37",
  "calib_x_norm_std": [
-  0.05738778249204604,
-  0.06125085163512557,
-  0.06392592319735892
+  0.34896495425949153,
+  0.3465786065853364,
+  0.3533058711330921
  ],
  "calib_y_norm_std": [
-  0.07023632581683162,
-  0.07117317113274499,
-  0.08021938968881043
+  0.36123317759031476,
+  0.3686631181263256,
+  0.3699799416188129
  ]
 }

configuration/pipeline_config/SAROP11-PBPS122_proc.json

@@ -18,12 +18,12 @@
  "down": "SAROP11-CVME-PBPS1:Lnk9Ch5-DATA-SUM",
  "right": "SAROP11-CVME-PBPS1:Lnk9Ch3-DATA-SUM",
  "left": "SAROP11-CVME-PBPS1:Lnk9Ch7-DATA-SUM",
- "up_calib": 4.856902438997528,
- "down_calib": 3.6407001867683255,
- "left_calib": 2.5431847379184935,
- "right_calib": 2.258752231178428,
- "horiz_calib": -4.923045366857815,
- "vert_calib": 5.191012812577014,
+ "up_calib": 0.4329961889591279,
+ "down_calib": 0.2756326807724613,
+ "left_calib": 0.1406206505323777,
+ "right_calib": 0.15756942651115974,
+ "horiz_calib": -4.876669457859753,
+ "vert_calib": 4.488795635241031,
  "uJ_calib": 605.9512700123181,
  "threshold": 0,
  "queue_length": 1000,
@@ -66,14 +66,14 @@
   0.3
  ],
  "calib_x_norm": [
-  0.06097587138301983,
-  -0.0005498292535706359,
-  -0.06089990982331022
+  0.06102824731429228,
+  0.00032712258840935504,
+  -0.062006542142880566
  ],
  "calib_x_norm_std": [
-  0.12938263783219212,
-  0.13160024776911167,
-  0.1278339097734837
+  0.026422934812807983,
+  0.02682069865643594,
+  0.02751673371576091
  ],
  "calib_y_range": [
   -0.3,
@@ -81,15 +81,15 @@
   0.3
  ],
  "calib_y_norm": [
-  -0.054567022258138184,
-  0.003407500099057587,
-  0.061017358220810655
+  -0.06709969882361287,
+  0.0001840678686854743,
+  0.06656644433725355
  ],
  "calib_y_norm_std": [
-  0.14051543884010068,
-  0.14684107677948718,
-  0.1415533936562058
+  0.03227012592314867,
+  0.03187009289621266,
+  0.03207746565524218
  ],
- "calib_datetime": "2023-03-20 14:30:57",
+ "calib_datetime": "2023-05-03 11:58:24",
  "reload": true
 }

configuration/pipeline_config/SAROP21-PBPS103_proc.json

@@ -1,17 +1,17 @@
 {
- "down_calib": 0.925051999223361,
+ "down_calib": 0.05773750366645945,
  "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": -4.152380380460691,
+ "vert_calib": -4.013266539044132,
  "bsread_address": "",
  "right": "SAROP21-CVME-PBPS1:Lnk9Ch2-DATA-SUM",
  "ypos_dif_w_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-W",
  "ypos_odd_x_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-X",
  "function": "pbps.py",
  "port": "9009",
- "left_calib": 0.592104590438952,
+ "left_calib": 0.033940788499696006,
  "down": "SAROP21-CVME-PBPS1:Lnk9Ch3-DATA-SUM",
  "ypos_odd_w_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-W",
  "xpos_odd_y_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-Y",
@@ -23,7 +23,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.531983059644944,
+ "horiz_calib": 4.422571387563297,
  "ypos_all_m_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-M",
  "ypos_dif_m_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-M",
  "bsread_channels": [
@@ -37,7 +37,7 @@
  "pipeline_type": "stream",
  "stream_timeout": 20,
  "ypos_all_x_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-X",
- "right_calib": 0.5373571035335166,
+ "right_calib": 0.030184745278420903,
  "xpos_all_m_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-M",
  "xpos_odd_m_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-M",
  "left": "SAROP21-CVME-PBPS1:Lnk9Ch1-DATA-SUM",
@@ -51,7 +51,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": 0.8728614328997423,
+ "up_calib": 0.05333779168125384,
  "ypos_odd_m_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-M",
  "xpos_all_x_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-X",
  "up": "SAROP21-CVME-PBPS1:Lnk9Ch4-DATA-SUM",
@@ -62,9 +62,9 @@
   0.3
  ],
  "calib_x_norm": [
-  -0.06797377853298164,
-  -0.0009580296260295205,
-  0.06441859630678808
+  -0.06746482707403895,
+  0.0004445333663804517,
+  0.06820285297455421
  ],
  "calib_y_range": [
   -0.3,
@@ -72,19 +72,19 @@
   0.3
  ],
  "calib_y_norm": [
-  0.07236402801811882,
-  -0.000407067239587218,
-  -0.07213140472772038
+  0.07421884402169887,
+  -9.213746650202566e-05,
+  -0.07528530531967688
  ],
  "calib_x_norm_std": [
-  0.3940719769827127,
-  0.42532517996523833,
-  0.42020614864443373
+  0.01260021920786719,
+  0.013510267720896078,
+  0.011985970517095955
  ],
  "calib_y_norm_std": [
-  0.42239995772576555,
-  0.4500649064126412,
-  0.41921484991436164
+  0.015069277154299072,
+  0.015346341477740713,
+  0.015281728159302189
  ],
- "calib_datetime": "2023-03-14 07:11:51"
+ "calib_datetime": "2023-05-09 09:56:48"
 }

configuration/pipeline_config/SAROP31-PBPS149_proc.json

@@ -17,12 +17,12 @@
  "down": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD2",
  "right": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD3",
  "left": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD0",
- "up_calib": 6.432612873830011e-06,
- "down_calib": 6.072071603811415e-06,
- "left_calib": 1.6284081932120653e-05,
- "right_calib": 1.503947199662346e-05,
- "horiz_calib": -3.814404543017813,
- "vert_calib": -6.296827134124412,
+ "up_calib": 1.508662346943942e-06,
+ "down_calib": 1.612838087958512e-06,
+ "left_calib": 8.288800811575718e-07,
+ "right_calib": 8.588190343731463e-07,
+ "horiz_calib": -4.612748469769838,
+ "vert_calib": -4.2123940480695445,
  "uJ_calib": 605.9512700123181,
  "threshold": 0.0,
  "queue_length": 5000,
@@ -61,14 +61,14 @@
   0.3
  ],
  "calib_x_norm": [
-  0.07865718285455997,
-  0.001302420914521733,
-  -0.07864128751830261
+  0.06510022968417475,
+  -0.00020972107922603213,
+  -0.06497406418469041
  ],
  "calib_x_norm_std": [
-  0.21792281240335584,
-  0.221813763400327,
-  0.2291839932442578
+  0.027264758010278046,
+  0.030226724851444217,
+  0.027674513899714915
  ],
  "calib_y_range": [
   -0.3,
@@ -76,14 +76,14 @@
   0.3
  ],
  "calib_y_norm": [
-  0.047239397573796076,
-  -9.493284078221608e-05,
-  -0.048046686547589174
+  0.06945988844641009,
+  -0.0007141178504136682,
+  -0.07297692851637332
  ],
  "calib_y_norm_std": [
-  0.2332859328988798,
-  0.22648051418694554,
-  0.22181527176057714
+  0.02898536535723783,
+  0.02802813913376357,
+  0.027555030271288982
  ],
- "calib_datetime": "2023-03-12 00:17:10"
+ "calib_datetime": "2023-04-29 12:57:42"
 }

configuration/pipeline_config/SATBD02-DSCR050_sp.json

@@ -3,17 +3,16 @@
  "image_background": "SATBD02-DSCR050_20221013_123827_350915",
  "image_threshold": null,
  "image_region_of_interest": [
-  94,
-  1700,
-  521,
-  1145
+  175,
+  1602,
+  389,
+  1464
  ],
- "image_good_region": null,
- "image_slices": {
-  "number_of_slices": 10,
-  "scale": 1.8,
-  "orientation": "horizontal"
+ "image_good_region": {
+  "threshold": 0.1,
+  "gfscale": 10.0
  },
+ "image_slices": null,
  "pipeline_type": "processing",
  "camera_name": "SATBD02-DSCR050",
  "name": "SATBD02-DSCR050_sp",

configuration/pipeline_config/SATES21-CAMS-PATT1_spec_db.json

@@ -1,6 +1,6 @@
 {
  "image_background_enable": "passive",
- "image_background": "SATES21-CAMS-PATT1_20221212_052802_874620",
+ "image_background": "SATES21-CAMS-PATT1_20230504_151024_448849",
  "image_threshold": null,
  "image_region_of_interest": null,
  "image_good_region": null,
@@ -19,15 +19,15 @@
  "port": "9003",
  "threshold": 1,
  "roi_background": [
-  53,
-  2135,
-  7,
-  2475
+  22,
+  1036,
+  3,
+  2519
  ],
  "roi_signal": [
-  53,
-  2135,
-  7,
-  2475
+  22,
+  1036,
+  3,
+  2519
  ]
 }

configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json

@@ -1,6 +1,6 @@
 {
  "image_background_enable": "passive",
- "image_background": "SATES21-CAMS154-M1_20221127_034759_069113",
+ "image_background": "SATES21-CAMS154-M1_20230502_141426_180792",
  "image_threshold": null,
  "image_region_of_interest": null,
  "image_good_region": null,
@@ -14,10 +14,10 @@
  "thread_buffer_size": 30,
  "project_axis": 0,
  "roi_signal": [
-  0,
-  1547,
-  0,
-  187
+  20,
+  200,
+  500,
+  1650
  ],
  "threshold": 5
 }

configuration/pipeline_config/SATES21-CAMS154-PATT1_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": "SATES21-CAMS154-PATT1",
+ "name": "SATES21-CAMS154-PATT1_sp"
+}

configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json

@@ -1,6 +1,6 @@
 {
  "image_background_enable": "passive",
- "image_background": "SATES24-CAMS161-M1_20221127_034815_681843",
+ "image_background": "SATES24-CAMS161-M1_20230504_140735_343566",
  "image_threshold": null,
  "image_region_of_interest": null,
  "image_good_region": null,
@@ -12,12 +12,18 @@
  "mode": "PUSH",
  "roi_signal": [
   0,
-  1099,
+  694,
   0,
-  1783
+  2317
  ],
  "processing_threads": 4,
  "thread_buffer_size": 30,
  "project_axis": 0,
- "threshold": 5
+ "threshold": 0,
+ "roi_background": [
+  0,
+  694,
+  0,
+  2317
+ ]
 }

configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json

@@ -1,6 +1,6 @@
 {
- "image_background_enable": false,
- "image_background": "SATOP31-PMOS132-2D_20220607_121502_104208",
+ "image_background_enable": true,
+ "image_background": "SATOP21-PMOS127-2D_20230503_074443_285170",
  "image_threshold": null,
  "image_region_of_interest": null,
  "image_good_region": null,
@@ -9,12 +9,11 @@
  "camera_name": "SATOP21-PMOS127-2D",
  "name": "SATOP21-PMOS127-2D_pmos",
  "function": "pmos132-2D.py",
- "mode": "PUB",
+ "mode": "PUSH",
  "no_client_timeout": 0,
  "reload": true,
  "processing_threads": 6,
  "thread_buffer_size": 30,
  "abort_on_error": false,
- "pixel_bkg": 1,
- "port": "9001"
+ "pixel_bkg": 1
 }

configuration/pipeline_config/SATOP21-PSCA162_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": "SATOP21-PSCA162",
+ "name": "SATOP21-PSCA162_sp"
+}

configuration/pipeline_config/SLAAR21-LCAM-C561_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",
+ "camera_name": "SLAAR21-LCAM-C561",
+ "name": "SLAAR21-LCAM-C561_proc",
+ "function": "pprm_simple.py",
+ "mode": "PUSH",
+ "_debug": true,
+ "_processing_threads": 2,
+ "no_client_timeout": 0
+}

configuration/pipeline_config/SLAAR21-LCAM-C562_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",
+ "camera_name": "SLAAR21-LCAM-C562",
+ "name": "SLAAR21-LCAM-C562_proc",
+ "function": "pprm_simple.py",
+ "mode": "PUSH",
+ "_debug": true,
+ "_processing_threads": 2,
+ "no_client_timeout": 0
+}

configuration/pipeline_config/SLAAR21-LCAM-C562_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": "SLAAR21-LCAM-C562",
+ "name": "SLAAR21-LCAM-C562_sp"
+}

configuration/pipeline_config/permanent_instances.json

@@ -1,6 +1,5 @@
 {
     "#S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles",
-    "#SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db",
     "#SARES11-SPEC125-M1_test": "SARES11-SPEC125-M1_test",
     "#SARES11-SPEC125-M2_psen_db1": "SARES11-SPEC125-M2_psen_db",
     "#SARES12-CAMS128-M1_psen_db": "SARES12-CAMS128-M1_psen_db",
@@ -8,7 +7,7 @@
     "#SARES20-DSDPPRM_proc": "SARES20-DSDPPRM_proc",
     "#SAROP11-ATT01_proc": "SAROP11-ATT01_proc",
     "#SAROP21-PPRM102_proc": "SAROP21-PPRM102_proc",
-    "#SAROP21-PPRM113_proc": "SAROP21-PPRM113_proc",
+    "#SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc",
     "#SINBC02-DSRM310_profiles": "SINBC02-DSRM310_profiles",
     "#jungfrau_proc": "jungfrau_proc",
     "#test_merge": "test_merge",
@@ -19,11 +18,13 @@
     "#testdb_ib": "testdb_ib",
     "S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles",
     "SARCL01-DSCR170_profiles": "SARCL01-DSCR170_profiles",
+    "SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db",
     "SARES11-XMI125-C4P1_db": "SARES11-XMI125-C4P1_db",
     "SARES20-CAMS142-M3_proc": "SARES20-CAMS142-M3_proc",
     "SARES20-CAMS142-M5_psen_db": "SARES20-CAMS142-M5_psen_db",
     "SARES20-CAMS142-M5_psen_db_proxy": "SARES20-CAMS142-M5_psen_db_proxy",
     "SARES20-PROF141-M1_proc": "SARES20-PROF141-M1_proc",
+    "SARES20-PROF142-M1_proc": "SARES20-PROF142-M1_proc",
     "SARES30-CAMS156-XE_proc": "SARES30-CAMS156-XE_proc",
     "SARFE10-PBPS053_proc": "SARFE10-PBPS053_proc",
     "SARFE10-PPRM064_proc": "SARFE10-PPRM064_proc",
@@ -35,10 +36,10 @@
     "SAROP21-PBPS103_proc": "SAROP21-PBPS103_proc",
     "SAROP21-PBPS133_proc": "SAROP21-PBPS133_proc",
     "SAROP21-PBPS138_proc": "SAROP21-PBPS138_proc",
+    "SAROP21-PPRM113_proc": "SAROP21-PPRM113_proc",
     "SAROP21-PPRM138_proc": "SAROP21-PPRM138_proc",
     "SAROP31-PBPS113_proc": "SAROP31-PBPS113_proc",
     "SAROP31-PBPS149_proc": "SAROP31-PBPS149_proc",
-    "SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc",
     "SAROP31-PPRM150_proc": "SAROP31-PPRM150_proc",
     "SATBD02-DSCR050_db": "SATBD02-DSCR050_db",
     "SATBD02-DSCR050_sp1": "SATBD02-DSCR050_sp",
@@ -53,6 +54,8 @@
     "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",

configuration/pipeline_config/servers.json

@@ -44,7 +44,7 @@
             "SAROP21-PBPS133_proc:9008",
             "SARFE10-PPRM064_ib:9015",
             "SATOP31-PMOS132-2D_sp",
-            "SATOP21-PMOS127-2D_pmos",
+            "SATOP21-PMOS127-2D_pmos:9017",
             "SARFE10-PPRM064_sp",
             "SARFE10-PPRM064_proc:9014",
             "SATOP31-PMOS132-2D_pmos:9001",
@@ -109,7 +109,6 @@
     "http://sf-daqsync-11.psi.ch:8881": {
         "cameras": [
             "SARFE10-PSSS059",
-            "SARES20-PROF142-M1",
             "SARES20-CAMS142-M3"
         ],
         "enabled": true,
@@ -166,7 +165,7 @@
             "SARES11-SPEC125-M1_psen_ib:9000",
             "SARES11-SPEC125-M1_psen_db:9001",
             "#SARES11-SPEC125-M1_test:9009",
-            "SARES11-SPEC125-M2_psen_ib:9010",
+            "#SARES11-SPEC125-M2_psen_ib:9010",
             "#SARES11-SPEC125-M2_psen_db:9011",
             "#SARES12-CAMS128-M1_psen_ib:9002",
             "#SARES12-CAMS128-M1_psen_db:9003",
@@ -186,7 +185,7 @@
             "SARES20-PROF146-M1",
             "SAROP21-PPRM102",
             "SAROP21-PPRM138",
-            "SAROP31-PPRM113",
+            "SAROP21-PPRM133",
             "SARES20-DSDPPRM",
             "SLAAR21-LCAM-CS841",
             "SLAAR21-LCAM-CS842",
@@ -227,6 +226,8 @@
             "SLAAR21-LCAM-CS844_proc:9024",
             "SLAAR02-LPMO01-C321_proc:9025",
             "SLAAR02-LPMO02-C322_proc:9026",
+            "SLAAR21-LCAM-C561_proc:9027",
+            "SLAAR21-LCAM-C562_proc:9028",
             "#arrival_time_proc:9008",
             "test_arrival"
         ]
@@ -258,8 +259,7 @@
             "SARES30-CAMS156-XE",
             "SARES30-CAMS156-PCO1",
             "SAROP31-PPRM113",
-            "SAROP31-PPRM150",
-            "SAROP21-PPRM133"
+            "SAROP31-PPRM150"
         ],
         "enabled": true,
         "expanding": false,

configuration/user_scripts/SARES11-SPEC125-M1_tt.py

@@ -13,7 +13,8 @@ _logger = getLogger(__name__)
 # Alvra spectral encoder constants/waveforms
 px2fs = 1.91 # calibration from ...
 #lambdas = 528.34 + 0.0261*np.arange(0,2048) # calibration from 2021-10-06
-lambdas = np.linspace(510.57796, 628.63459, num=2048) # calibration from 2022-05-18
+lambdas = np.linspace(504.17385, 608.07410, num=2048) # calibration from 2023-04-25
+#lambdas = np.linspace(510.57796, 628.63459, num=2048) # calibration from 2022-05-18
 nus = 299792458 / (lambdas * 10**-9) # frequency space, uneven
 nus_new = np.linspace(nus[0], nus[-1], num=2048, endpoint=True) # frequency space, even
 filters = {
@@ -90,10 +91,10 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata
     background_mode = parameters.get("image_background_enable")
     roi_signal = parameters.get("roi_signal")
     project_axis = parameters.get("project_axis", 0)
-    events = bsdata["SAR-CVME-TIFALL4:EvtSet"]
-    laser_off = int(events[21])
-    laser_on = int(events[18])
-    fel_on = int(events[13])
+#    events = bsdata["SAR-CVME-TIFALL4:EvtSet"]
+#    laser_off = int(events[21])
+#    laser_on = int(events[18])
+#    fel_on = int(events[13])
      
     # maintain the structure of processing_parameters
     background_shape = None
@@ -120,7 +121,6 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata
         "status": status,
         "background_name": background_name,
         "roi_signal": roi_signal,
-        "laser": laser_on
     }
 
     processing_parameters = json.dumps(processing_parameters)

configuration/user_scripts/psen_min_processing.py

@@ -30,10 +30,9 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata
  
     processed_data = dict()
 
-    if bsdata is not None:
-        processed_data.update(bsdata)
-
-    event = processed_data.get("SAR-CVME-TIFALL4:EvtSet", None)    
+    #if bsdata is not None:
+        #processed_data.update(bsdata)
+    #event = processed_data.get("SAR-CVME-TIFALL4:EvtSet", None)
 
     image_property_name = parameters["camera_name"]
     roi_signal = parameters.get("roi_signal", DEFAULT_ROI_SIGNAL)

configuration/user_scripts/psss_2.py

@@ -188,7 +188,7 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata
     processed_data[camera_name + ":FIT-RES"] = (np.float64(2.355 * sigma)/np.float64(center))*1000
     processed_data[camera_name + ":SPECT-COM"] = spectrum_com
     processed_data[camera_name + ":SPECT-RMS"] = spectrum_std
-    processed_data[camera_name + ":SPECT-RES"] = np.float64(spectrum_std/spectrum_com)*1000
+    processed_data[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: