Skip to content

Commit 7eddb2c

Browse files
authored
Update with alarm config
Added block level alarm config information
1 parent 2f9e233 commit 7eddb2c

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

doc/system_components/BlockServer.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Note: This PV is currently used by the web dashboard
107107
Command: caget -S %MYPVPREFIX%CS:BLOCKSERVER:ALL_COMPONENT_DETAILS
108108
Returns a list of the available components with all their details, as if reading e.g. the current configuration. Read as compressed then hexed JSON (CHAR waveform)
109109
[{
110-
"blocks": [{"log_rate": 30, "log_deadband": 0.0, "component": null, "runcontrol": false, "visible": true, "pv": "TE:NDLT882:DAE:BEAMCURRENT", "name": "BEAMCURR", "highlimit": 0.0, "log_periodic": true, "lowlimit": 0.0, "local": true}],
110+
"blocks": [{"log_rate": 30, "log_deadband": 0.0, "component": null, "runcontrol": false, "visible": true, "pv": "TE:NDLT882:DAE:BEAMCURRENT", "name": "BEAMCURR", "highlimit": 0.0, "log_periodic": true, "lowlimit": 0.0, "local": true, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"}],
111111
"groups": [{"component": null, "blocks": ["BEAMCURR"], "name": "NONE"}],
112112
"iocs": [{"macros": [], "pvs": [{"name": "NEW_PV", "value": "NEW_VALUE"}], "name": "GALIL_01", "autostart": false, "pvsets": [], "component": null, "restart": false, "simlevel": "recsim"}],
113113
"description": "pong",
@@ -149,9 +149,9 @@ Note: This PV is currently used by the web dashboard
149149
{"simlevel": "devsim", "autostart": true, "restart": false, "pvsets": [{"name": "SET", "enabled": "true"}], "pvs": [], "macros": [], "name": "SIMPLE2", "component": null}
150150
],
151151
"blocks":
152-
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0},
153-
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0},
154-
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0}
152+
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
153+
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
154+
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"}
155155
],
156156
"components":
157157
[{"name": "comp1"}],
@@ -174,9 +174,9 @@ Note: This PV is currently used by the web dashboard
174174
{"simlevel": "devsim", "autostart": true, "restart": false, "pvsets": [{"name": "SET", "enabled": "true"}], "pvs": [], "macros": [], "name": "SIMPLE2", "component": null}
175175
],
176176
"blocks":
177-
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0},
178-
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0},
179-
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0}
177+
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
178+
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
179+
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"}
180180
],
181181
"components":
182182
[{"name": "comp1"}],
@@ -199,9 +199,9 @@ Note: This PV is currently used by the web dashboard
199199
{"simlevel": "devsim", "autostart": true, "restart": false, "pvsets": [{"name": "SET", "enabled": "true"}], "pvs": [], "macros": [], "name": "SIMPLE2", "component": null}
200200
],
201201
"blocks":
202-
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0},
203-
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0},
204-
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0}
202+
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
203+
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
204+
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"}
205205
],
206206
"components": [],
207207
"groups":
@@ -356,9 +356,9 @@ Some of these commands take a few seconds to process, so if done using caput it
356356
{"simlevel": "recsim", "autostart": true, "restart": false, "pvsets": [{"name": "SET", "enabled": "true"}], "pvs": [], "macros": [], "name": "SIMPLE2", "component": null}
357357
],
358358
"blocks":
359-
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0},
360-
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0},
361-
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0}
359+
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
360+
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
361+
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"}
362362
],
363363
"components":
364364
[{"name": "comp1"}],
@@ -384,9 +384,9 @@ Some of these commands take a few seconds to process, so if done using caput it
384384
{"simlevel": "recsim", "autostart": true, "restart": false, "pvsets": [{"name": "SET", "enabled": "true"}], "pvs": [], "macros": [], "name": "SIMPLE2", "component": null}
385385
],
386386
"blocks":
387-
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0},
388-
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0},
389-
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0}
387+
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
388+
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
389+
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"}
390390
],
391391
"components":
392392
[{"name": "comp1"}],
@@ -412,9 +412,9 @@ Some of these commands take a few seconds to process, so if done using caput it
412412
{"simlevel": "recsim", "autostart": true, "restart": false, "pvsets": [{"name": "SET", "enabled": "true"}], "pvs": [], "macros": [], "name": "SIMPLE2", "component": null}
413413
],
414414
"blocks":
415-
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0},
416-
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0},
417-
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0}
415+
[{"name": "testblock1", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 10, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
416+
{"name": "testblock2", "local": true, "pv": "NDWXXX:xxxx:SIMPLE:VALUE1", "component": null, "visible": true, "log_periodic": true, "log_rate": 5, "log_deadband": 0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"},
417+
{"name": "testblock3", "local": true, "pv": "NDWXXX:xxxx:EUROTHERM1:RBV", "component": null, "visible": true, "log_periodic": false, "log_rate": 0, "log_deadband": 1.0, "alarmenabled": true, "alarmlatched": true, "alarmdelay": 25.0, "alarmguidance": "Some guidance"}
418418
],
419419
"groups":
420420
[{"blocks": ["testblock1"], "name": "Group1", "component": null},
@@ -486,4 +486,4 @@ When log_periodic is false the block value will be archived whenever the block c
486486

487487
The file watcher has been removed in https://github.com/ISISComputingGroup/EPICS-inst_servers/pull/139
488488

489-
Instead, we now have a much simpler system. A background python thread running as part of the blockserver checks if there are any uncommitted changes at a set interval. If it sees any changes, it does the equivalent of a `git add -A`, `git commit`, `git push`. This means that we get a backup at 5 minute intervals of the configuration area
489+
Instead, we now have a much simpler system. A background python thread running as part of the blockserver checks if there are any uncommitted changes at a set interval. If it sees any changes, it does the equivalent of a `git add -A`, `git commit`, `git push`. This means that we get a backup at 5 minute intervals of the configuration area

0 commit comments

Comments
 (0)