Skip to content

Commit 7f6b5c0

Browse files
OCoppingOCopping
authored
Add DEVSTA PV generation (#130)
2 parents 51f2792 + f1f53d6 commit 7f6b5c0

24 files changed

Lines changed: 516 additions & 144 deletions

‎example-synoptic/b23-services/config/devsta.db‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
###################################################
2+
## THIS FILE HAS BEEN AUTOGENERATED; DO NOT EDIT ##
3+
###################################################
4+
5+
record(calc, "BL23B-OP-MR-03:DEVSTA")
6+
{
7+
field(ACKT, "NO")
8+
field(CALC, "(A|B|C|D|E|F|G|H|I|J|K|L)>0?1:0")
9+
field(INPA, "BL23B-OP-MR-03:MP:BUSY NPP NMS")
10+
field(INPB, "BL23B-OP-MR-03:MP:DMOV.SEVR NPP MS")
11+
field(INPC, "BL23B-OP-MR-03:MP:SELECT.SEVR NPP MS")
12+
field(INPD, "BL23B-OP-MR-03:PITCH.MOVN NPP MS")
13+
field(INPE, "BL23B-OP-MR-03:YAW.MOVN NPP MS")
14+
field(INPF, "")
15+
field(INPG, "")
16+
field(INPH, "")
17+
field(INPI, "")
18+
field(INPJ, "")
19+
field(INPK, "")
20+
field(INPL, "")
21+
field(SCAN, "1 second")
22+
}

‎example-synoptic/b23-services/synoptic/IMG1.bob‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<width>351</width>
99
<height>432</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>mks937a.mks937aImg</name>
11+
<name>BL23B-VA-IMG-01</name>
1212
<width>301</width>
1313
<height>382</height>
1414
<file>techui-support/bob/mks937a/mks937aImg.bob</file>
1515
<macros>
1616
<P>BL23B-VA-IMG-01</P>
17+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-img-01</IOC>
1718
</macros>
1819
<x>0</x>
1920
<y>0</y>

‎example-synoptic/b23-services/synoptic/IMG11.bob‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<width>351</width>
99
<height>432</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>mks937a.mks937aImg</name>
11+
<name>BL23B-VA-IMG-11</name>
1212
<width>301</width>
1313
<height>382</height>
1414
<file>techui-support/bob/mks937a/mks937aImg.bob</file>
1515
<macros>
1616
<P>BL23B-VA-IMG-11</P>
17+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-img-11</IOC>
1718
</macros>
1819
<x>0</x>
1920
<y>0</y>

‎example-synoptic/b23-services/synoptic/IMG12.bob‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<width>351</width>
99
<height>432</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>mks937a.mks937aImg</name>
11+
<name>BL23B-VA-IMG-12</name>
1212
<width>301</width>
1313
<height>382</height>
1414
<file>techui-support/bob/mks937a/mks937aImg.bob</file>
1515
<macros>
1616
<P>BL23B-VA-IMG-12</P>
17+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-img-12</IOC>
1718
</macros>
1819
<x>0</x>
1920
<y>0</y>

‎example-synoptic/b23-services/synoptic/IONP1.bob‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<width>351</width>
99
<height>293</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>digitelMpc.digitelMpcIonp</name>
11+
<name>BL23B-VA-IONP-01</name>
1212
<width>301</width>
1313
<height>243</height>
1414
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
1515
<macros>
1616
<P>BL23B-VA-IONP-01</P>
17+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-01</IOC>
1718
</macros>
1819
<x>0</x>
1920
<y>0</y>

‎example-synoptic/b23-services/synoptic/IONP11.bob‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<width>351</width>
99
<height>293</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>digitelMpc.digitelMpcIonp</name>
11+
<name>BL23B-VA-IONP-11</name>
1212
<width>301</width>
1313
<height>243</height>
1414
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
1515
<macros>
1616
<P>BL23B-VA-IONP-11</P>
17+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-11</IOC>
1718
</macros>
1819
<x>0</x>
1920
<y>0</y>

‎example-synoptic/b23-services/synoptic/IONP12.bob‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<width>351</width>
99
<height>293</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>digitelMpc.digitelMpcIonp</name>
11+
<name>BL23B-VA-IONP-12</name>
1212
<width>301</width>
1313
<height>243</height>
1414
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
1515
<macros>
1616
<P>BL23B-VA-IONP-12</P>
17+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-12</IOC>
1718
</macros>
1819
<x>0</x>
1920
<y>0</y>

‎example-synoptic/b23-services/synoptic/IONP21.bob‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<width>351</width>
99
<height>293</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>digitelMpc.digitelMpcIonp</name>
11+
<name>BL23B-VA-IONP-21</name>
1212
<width>301</width>
1313
<height>243</height>
1414
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
1515
<macros>
1616
<P>BL23B-VA-IONP-21</P>
17+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-21</IOC>
1718
</macros>
1819
<x>0</x>
1920
<y>0</y>

‎example-synoptic/b23-services/synoptic/JsonMap.json‎

Lines changed: 64 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -317,76 +317,6 @@
317317
"name": "PIRG2"
318318
}
319319
},
320-
{
321-
"file": "MOD2.bob",
322-
"children": [
323-
{
324-
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
325-
"macros": {
326-
"P": "BL23B-DI-MOD-02",
327-
"R": ":CAM:"
328-
}
329-
},
330-
{
331-
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
332-
"macros": {
333-
"P": "BL23B-DI-MOD-02",
334-
"R": ":ROI:"
335-
}
336-
},
337-
{
338-
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
339-
"macros": {
340-
"P": "BL23B-DI-MOD-02",
341-
"R": ":STAT:"
342-
}
343-
},
344-
{
345-
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
346-
"macros": {
347-
"P": "BL23B-DI-MOD-02",
348-
"R": ":HDF5:"
349-
}
350-
}
351-
]
352-
},
353-
{
354-
"file": "MOD1.bob",
355-
"children": [
356-
{
357-
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
358-
"duplicate": true,
359-
"macros": {
360-
"P": "BL23B-DI-MOD-01",
361-
"R": ":CAM:"
362-
}
363-
},
364-
{
365-
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
366-
"duplicate": true,
367-
"macros": {
368-
"P": "BL23B-DI-MOD-01",
369-
"R": ":ROI:"
370-
}
371-
},
372-
{
373-
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
374-
"duplicate": true,
375-
"macros": {
376-
"P": "BL23B-DI-MOD-01",
377-
"R": ":STAT:"
378-
}
379-
},
380-
{
381-
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
382-
"duplicate": true,
383-
"macros": {
384-
"P": "BL23B-DI-MOD-01",
385-
"R": ":HDF5:"
386-
}
387-
}
388-
]
389-
},
390320
{
391321
"file": "IMG11.bob",
392322
"macros": {
@@ -501,11 +431,73 @@
501431
},
502432
{
503433
"file": "MOD1.bob",
504-
"duplicate": true
434+
"children": [
435+
{
436+
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
437+
"macros": {
438+
"P": "BL23B-DI-MOD-01",
439+
"R": ":CAM:"
440+
}
441+
},
442+
{
443+
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
444+
"macros": {
445+
"P": "BL23B-DI-MOD-01",
446+
"R": ":ROI:"
447+
}
448+
},
449+
{
450+
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
451+
"macros": {
452+
"P": "BL23B-DI-MOD-01",
453+
"R": ":STAT:"
454+
}
455+
},
456+
{
457+
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
458+
"macros": {
459+
"P": "BL23B-DI-MOD-01",
460+
"R": ":HDF5:"
461+
}
462+
}
463+
]
505464
},
506465
{
507466
"file": "MOD2.bob",
508-
"duplicate": true
467+
"children": [
468+
{
469+
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
470+
"duplicate": true,
471+
"macros": {
472+
"P": "BL23B-DI-MOD-02",
473+
"R": ":CAM:"
474+
}
475+
},
476+
{
477+
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
478+
"duplicate": true,
479+
"macros": {
480+
"P": "BL23B-DI-MOD-02",
481+
"R": ":ROI:"
482+
}
483+
},
484+
{
485+
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
486+
"duplicate": true,
487+
"macros": {
488+
"P": "BL23B-DI-MOD-02",
489+
"R": ":STAT:"
490+
}
491+
},
492+
{
493+
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
494+
"duplicate": true,
495+
"macros": {
496+
"P": "BL23B-DI-MOD-02",
497+
"R": ":HDF5:"
498+
}
499+
}
500+
]
509501
}
510502
]
511503
}

‎example-synoptic/b23-services/synoptic/M3.bob‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,50 @@
88
<width>255</width>
99
<height>540</height>
1010
<widget type="embedded" version="2.0.0">
11-
<name>:Y</name>
11+
<name>Y</name>
1212
<width>205</width>
1313
<height>120</height>
1414
<file>techui-support/bob/pmac/motor_embed.bob</file>
1515
<macros>
1616
<P>BL23B-OP-MR-03</P>
17-
<M>:Y</M>
17+
<M>Y</M>
18+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-op-mr-03</IOC>
1819
</macros>
1920
<x>0</x>
2021
<y>0</y>
2122
</widget>
2223
<widget type="embedded" version="2.0.0">
23-
<name>:YAW</name>
24+
<name>YAW</name>
2425
<width>205</width>
2526
<height>120</height>
2627
<file>techui-support/bob/pmac/motor_embed.bob</file>
2728
<macros>
2829
<P>BL23B-OP-MR-03</P>
29-
<M>:YAW</M>
30+
<M>YAW</M>
31+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-op-mr-03</IOC>
3032
</macros>
3133
<x>0</x>
3234
<y>150</y>
3335
</widget>
3436
<widget type="embedded" version="2.0.0">
35-
<name>:PITCH</name>
37+
<name>PITCH</name>
3638
<width>205</width>
3739
<height>120</height>
3840
<file>techui-support/bob/pmac/motor_embed.bob</file>
3941
<macros>
4042
<P>BL23B-OP-MR-03</P>
41-
<M>:PITCH</M>
43+
<M>PITCH</M>
44+
<IOC>https://b23-opis.diamond.ac.uk/bl23b-op-mr-03</IOC>
4245
</macros>
4346
<x>0</x>
4447
<y>300</y>
4548
</widget>
4649
<widget type="action_button" version="2.0.0">
47-
<name>pmac.GeoBrick</name>
50+
<name>BL23B-MO-PMAC-01</name>
4851
<width>100</width>
4952
<height>40</height>
50-
<pv_name>BL23B-MO-PMAC-01</pv_name>
51-
<text>pmac.GeoBrick</text>
53+
<pv_name/>
54+
<text>BL23B-MO-PMAC-01</text>
5255
<actions>
5356
<action type="open_display">
5457
<description>Open Display</description>

0 commit comments

Comments
 (0)