Skip to content

Remove reference to flow on CCD100 #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FreddieAkeroyd merged 2 commits into from
May 9, 2018
Merged

Remove reference to flow on CCD100 #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efe7ada
Remove reference to flow on CCD100
Tom-Willemsen May 3, 2018
de3d241
Categorize CCD
Tom-Willemsen May 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions base/uk.ac.stfc.isis.ibex.opis/resources/CCD100/CCD100.opi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ $(trace_0_y_pv_value)</tooltip>
</axis_1_axis_color>
<axis_0_scale_format></axis_0_scale_format>
<axis_1_log_scale>false</axis_1_log_scale>
<title>Flow vs Time</title>
<title>Reading vs Time</title>
<trace_0_visible>true</trace_0_visible>
<trace_1_name>$(trace_1_y_pv)</trace_1_name>
<trace_3_anti_alias>true</trace_3_anti_alias>
Expand Down Expand Up @@ -463,7 +463,7 @@ $(trace_0_y_pv_value)</tooltip>
<axis_0_minimum>0.0</axis_0_minimum>
<trace_2_y_axis_index>1</trace_2_y_axis_index>
<trace_1_update_delay>100</trace_1_update_delay>
<axis_1_axis_title>Flow</axis_1_axis_title>
<axis_1_axis_title>Reading</axis_1_axis_title>
<trace_2_x_pv_value />
<axis_1_auto_scale>true</axis_1_auto_scale>
<trace_1_line_width>1</trace_1_line_width>
Expand Down
4 changes: 2 additions & 2 deletions base/uk.ac.stfc.isis.ibex.opis/resources/CCD100/single_channel.opi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ $(pv_value)</tooltip>
<wuid>-1be97a08:160734ec8eb:-7f18</wuid>
<transparent>false</transparent>
<auto_size>false</auto_size>
<text>Flow set point $(N):</text>
<text>Set point $(N):</text>
<scripts />
<height>20</height>
<border_width>1</border_width>
Expand Down Expand Up @@ -240,7 +240,7 @@ $(pv_value)</tooltip>
<wuid>-1be97a08:160734ec8eb:-7f16</wuid>
<transparent>false</transparent>
<auto_size>false</auto_size>
<text>Flow reading $(N):</text>
<text>Reading $(N):</text>
<scripts />
<height>20</height>
<border_width>1</border_width>
Expand Down
4 changes: 4 additions & 0 deletions base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
<type>CCD100</type>
<path>CCD100/CCD100.opi</path>
<description>The OPI for a Chell CCD100</description>
<categories>
<category>Pressure sensors</category>
<category>Flow meters</category>
</categories>
<macros>
<macro>
<name>CCD_1</name>
Expand Down