Skip to content
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

Jump to bottom

CI: update to 2021-3.1 envs #14

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

CI: update to 2021-3.1 envs #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b3a4e3
CI: update to 2021-3.1 envs
tacaswell Dec 31, 2021
4fa7e74
CI: be more forgiving about connection timeouts
tacaswell Dec 31, 2021
407ca3b
CI: fix template names
tacaswell Dec 31, 2021
f22c735
MNT: simplify fixing prosillica ports
tacaswell Dec 31, 2021
fdabcd0
MNT: hide action-at-a-distance configuration loading
tacaswell Dec 31, 2021
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
13 changes: 2 additions & 11 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,9 @@ resources:
endpoint: github

jobs:
- template: collection-2021-1.2.yml@templates
- template: nsls2-collection-2021-3.1-py37.yml@templates
parameters:
beamline_acronym: CMS
- template: nsls2-collection-2021-2.2.yml@templates
parameters:
beamline_acronym: CMS
- template: nsls2-collection-2021-2.2-py39.yml@templates
parameters:
beamline_acronym: CMS
- template: nsls2-collection-2021-3.0-py37.yml@templates
parameters:
beamline_acronym: CMS
- template: nsls2-collection-2021-3.0-py39.yml@templates
- template: nsls2-collection-2021-3.1-py39.yml@templates
parameters:
beamline_acronym: CMS
2 changes: 1 addition & 1 deletion startup/00-startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _epicssignal_get(self, *, as_string=None, connection_timeout=1.0, **kwargs):

# Increase the timeout for EpicsSignal.get()
# This beamline was occasionally getting ReadTimeoutErrors
EpicsSignal.set_defaults(timeout=10)
EpicsSignal.set_defaults(timeout=10, connection_timeout=10)

# We have commented this because we would like to identify the PVs that are causing problems.
# Then the controls group can investigate why it is not working as expected.
Expand Down
8 changes: 4 additions & 4 deletions startup/21-fix-area-detector-ports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
for cam_number, fs in zip([1,2,3,4,5], [fs1, fs2, fs3, fs4, fs5]):
for fs in [fs1, fs2, fs3, fs4, fs5]:
G, port_dict = fs.get_asyn_digraph()
cam = port_dict['cam{:02}'.format(cam_number)]
cam_port = fs.cam.port_name.get()
for v in port_dict.values():
try:
if v.nd_array_port.get() == 'CAM':
v.nd_array_port.set('cam{:02}'.format(cam_number))
if v.nd_array_port.get() == "CAM":
v.nd_array_port.put(cam_port)
except AttributeError:
pass
fs.validate_asyn_ports()
5 changes: 4 additions & 1 deletion startup/97-user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
#tags_default = ['CFN Soft-Bio']


config_load()
try:
config_load()
except FileNotFoundError:
...


if False:
Expand Down