Skip to content

Commit

Permalink
Updating opi prefix to p99
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Herbert committed Nov 20, 2024
1 parent 3b00084 commit 955622f
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
42 changes: 21 additions & 21 deletions opi/p99-beamline.bob
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>p47-beamline</name>
<name>p99-beamline</name>
<width>1250</width>
<height>1000</height>
<grid_step_x>4</grid_step_x>
<grid_step_y>4</grid_step_y>
<widget type="label" version="2.0.0">
<name>Title</name>
<class>TITLE</class>
<text>P47 Beamline Synoptic</text>
<text>P99 Beamline Synoptic</text>
<x use_class="true">0</x>
<y use_class="true">0</y>
<width>1250</width>
Expand All @@ -28,7 +28,7 @@
<name>X Stage</name>
<macros>
<M>STAGE:X</M>
<P>BL47P-MO-MAP-01:</P>
<P>BL99P-MO-MAP-01:</P>
</macros>
<x>5</x>
<y>30</y>
Expand Down Expand Up @@ -150,7 +150,7 @@
<name>Rotation Stage</name>
<macros>
<M>STAGE:A</M>
<P>BL47P-MO-MAP-01:</P>
<P>BL99P-MO-MAP-01:</P>
</macros>
<x>5</x>
<y>204</y>
Expand Down Expand Up @@ -272,7 +272,7 @@
<name>Auto Generated Engineering Screens</name>
<macros>
<M>STAGE:A</M>
<P>BL47P-MO-MAP-01:</P>
<P>BL99P-MO-MAP-01:</P>
</macros>
<x>5</x>
<y>850</y>
Expand All @@ -290,16 +290,16 @@
<name>OpenDisplay</name>
<actions>
<action type="open_display">
<file>https://p47-opis.diamond.ac.uk/bl47p-ea-dcam-02/index.bob</file>
<file>https://p99-opis.diamond.ac.uk/bl47p-ea-dcam-02/index.bob</file>
<macros>
<P>BL47P-EA-DET-01</P>
<P>BL99P-EA-DET-01</P>
<R>:DET:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>BL47P-EA-DET-02</text>
<text>BL99P-EA-DET-02</text>
<x>153</x>
<y>10</y>
<width>205</width>
Expand All @@ -317,16 +317,16 @@
<name>OpenDisplay_1</name>
<actions>
<action type="open_display">
<file>https://p47-opis.diamond.ac.uk/bl47p-ea-dcam-01/index.bob</file>
<file>https://p99-opis.diamond.ac.uk/bl47p-ea-dcam-01/index.bob</file>
<macros>
<P>BL47P-EA-DET-01</P>
<P>BL99P-EA-DET-01</P>
<R>:TX:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>BL47P-EA-DET-01</text>
<text>BL99P-EA-DET-01</text>
<x>153</x>
<y>35</y>
<width>205</width>
Expand All @@ -344,16 +344,16 @@
<name>OpenDisplay_2</name>
<actions>
<action type="open_display">
<file>https://p47-opis.diamond.ac.uk/bl47p-mo-ioc-01/index.bob</file>
<file>https://p99-opis.diamond.ac.uk/bl47p-mo-ioc-01/index.bob</file>
<macros>
<P>BL47P-EA-DET-01</P>
<P>BL99P-EA-DET-01</P>
<R>:HDF5:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>BL47P-MO-MAP-01</text>
<text>BL99P-MO-MAP-01</text>
<x>153</x>
<y>60</y>
<width>205</width>
Expand All @@ -371,16 +371,16 @@
<name>OpenDisplay_3</name>
<actions>
<action type="open_display">
<file>https://p47-opis.diamond.ac.uk/bl47p-ea-panda-01/index.bob</file>
<file>https://p99-opis.diamond.ac.uk/bl47p-ea-panda-01/index.bob</file>
<macros>
<P>BL47P-EA-DET-01</P>
<P>BL99P-EA-DET-01</P>
<R>:HDF5:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>BL47P-MO-PANDA-01</text>
<text>BL99P-MO-PANDA-01</text>
<x>153</x>
<y>85</y>
<width>205</width>
Expand All @@ -391,7 +391,7 @@
<widget type="group" version="2.0.0">
<name>Sample Camera</name>
<macros>
<P>BL47P-EA-DET-01</P>
<P>BL99P-EA-DET-01</P>
<R>:DET:</R>
</macros>
<x>5</x>
Expand Down Expand Up @@ -719,7 +719,7 @@
</widget>
<widget type="image" version="2.0.0">
<name>Image</name>
<pv_name>pva://BL47P-EA-DET-01:TX:PVA</pv_name>
<pv_name>pva://BL99P-EA-DET-01:TX:PVA</pv_name>
<x>408</x>
<y>36</y>
<width>828</width>
Expand Down Expand Up @@ -758,7 +758,7 @@
</widget>
<widget type="image" version="2.0.0">
<name>Image_1</name>
<pv_name>pva://BL47P-EA-DET-02:TX:PVA</pv_name>
<pv_name>pva://BL99P-EA-DET-02:TX:PVA</pv_name>
<x>480</x>
<y>580</y>
<width>688</width>
Expand Down Expand Up @@ -800,7 +800,7 @@
<widget type="group" version="2.0.0">
<name>Overview Camera</name>
<macros>
<P>BL47P-EA-DET-02</P>
<P>BL99P-EA-DET-02</P>
<R>:DET:</R>
</macros>
<x>5</x>
Expand Down
8 changes: 4 additions & 4 deletions opi/phoebus-launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ workspace=$(realpath ${thisdir}/..)
if module load phoebus 2>/dev/null; then
echo "Using phoebus module"

# settings for p47
# settings for p99
settings="
-resource ${workspace}/opi/p47-beamline.opi
-resource ${workspace}/opi/p99-beamline.opi
-settings ${workspace}/opi/settings.ini
"

Expand Down Expand Up @@ -52,9 +52,9 @@ else
-v=${workspace}:/workspace
"

# settings for p47
# settings for p99
settings="
-resource /workspace/opi/p47-beamline.opi
-resource /workspace/opi/p99-beamline.opi
-settings /workspace/opi/settings.ini
"

Expand Down

0 comments on commit 955622f

Please sign in to comment.