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.

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

Sync v3.4.1 #18

Open
wants to merge 22 commits into
base: lumentum-v3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2605c59
Sync branch 'master' into develop
liteGabrielAmorim Dec 6, 2024
976ee82
Initial ADPimega MEDM screens
liteAlvaroCosta Dec 6, 2024
cbbb62a
Merged in feature/basic-medm-gui (pull request #139)
liteAlvaroCosta Dec 9, 2024
ca85f72
Increase default precision for AcquireTime_RBV record
liteAlvaroCosta Dec 18, 2024
3fd192e
handle high perf stream data 12 and 24 bits
liteGabrielAmorim Dec 20, 2024
79504a7
Merged in bugfix/PIS-596-wrong-acquire-time-read-from-epics (pull req…
liteAlvaroCosta Dec 23, 2024
2bf72a4
removed global counter depth
liteGabrielAmorim Dec 27, 2024
543992d
new class for handle the circullar buffer
liteGabrielAmorim Dec 27, 2024
f2685bb
Merged in feature/handle_high_perf_stream_data (pull request #141)
liteGabrielAmorim Dec 27, 2024
6779b84
EPICS_BASE_VERSION updated to 7.0.8.1
liteGabrielAmorim Jan 30, 2025
37f712f
Merged in release/3.4.0 (pull request #142)
liteGabrielAmorim Feb 7, 2025
5b02c3c
Merged in release/3.4.0 (pull request #143)
liteGabrielAmorim Feb 7, 2025
7e7e714
Set PVs providing detector and vendor info
liteAlvaroCosta Feb 13, 2025
9a560a8
Merged in feature/SADP-685-add-missing-detector-info-pvs (pull reques…
liteAlvaroCosta Feb 14, 2025
f48265d
Fix: initializeBufferPool not being properly initialized.
liteGabrielAmorim Feb 18, 2025
420e488
ran pre-commit to pass jenkins build
liteGabrielAmorim Feb 18, 2025
7e8cc51
Merged in fix_buffer_initialization (pull request #145)
liteGabrielAmorim Feb 21, 2025
830959e
Added a return to the configureAlignment, this function is called by …
liteGabrielAmorim Mar 13, 2025
5845a3f
added error handling to configureAlignment
liteGabrielAmorim Mar 13, 2025
d0dc298
Merged in fix-sigill-on-capture (pull request #146)
liteGabrielAmorim Mar 13, 2025
8bc6770
Merged master into release/3.4.1
liteGabrielAmorim Mar 19, 2025
6e50879
Merged in release/3.4.1 (pull request #147)
liteGabrielAmorim Mar 19, 2025
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
2 changes: 1 addition & 1 deletion install/install_epics.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
ROOT_DIR=$PWD
EPICS_BASE_VERSION='7.0.8'
EPICS_BASE_VERSION='7.0.8.1'
SYNAPPPS_VERSION_1='6_3'
SYNAPPPS_VERSION='R6-3'
EPICS_INSTALL_PATH="/home/$USER/.local/share/epics"
Expand Down
6 changes: 6 additions & 0 deletions pimegaApp/Db/pimega.template
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ record(ao, "$(P)$(R)AcquireTime")
}


record(ai, "$(P)$(R)AcquireTime_RBV")
{
field(PREC, 6)
}


record(longout, "$(P)$(R)NumExposures")
{
field(DRVH, "2147483647")
Expand Down
12 changes: 12 additions & 0 deletions pimegaApp/op/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
TOP = ../..
include $(TOP)/configure/CONFIG

ADL_DIR = adl
UI_DIR = ui/autoconvert
EDL_DIR = edl/autoconvert
OPI_DIR = opi/autoconvert
BOB_DIR = bob/autoconvert

include $(CONFIG)/RULES_DIRS

-include $(SUPPORT)/configure/RULES_OPI
173 changes: 173 additions & 0 deletions pimegaApp/op/adl/ADPimega.adl
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@

file {
name="/home/pimega/adpimega/pimegaApp/op/adl/ADPimega.adl"
version=030120
}
display {
object {
x=520
y=90
width=715
height=700
}
clr=14
bclr=4
cmap=""
gridSpacing=5
gridOn=0
snapToGrid=0
}
"color map" {
ncolors=65
colors {
ffffff,
ececec,
dadada,
c8c8c8,
bbbbbb,
aeaeae,
9e9e9e,
919191,
858585,
787878,
696969,
5a5a5a,
464646,
2d2d2d,
000000,
00d800,
1ebb00,
339900,
2d7f00,
216c00,
fd0000,
de1309,
be190b,
a01207,
820400,
5893ff,
597ee1,
4b6ec7,
3a5eab,
27548d,
fbf34a,
f9da3c,
eeb62b,
e19015,
cd6100,
ffb0ff,
d67fe2,
ae4ebc,
8b1a96,
610a75,
a4aaff,
8793e2,
6a73c1,
4d52a4,
343386,
c7bb6d,
b79d5c,
a47e3c,
7d5627,
58340f,
99ffff,
73dfff,
4ea5f9,
2a63e4,
0a00b8,
ebf1b5,
d4db9d,
bbc187,
a6a462,
8b8239,
73ff6b,
52da3b,
3cb420,
289315,
1a7309,
}
}
rectangle {
object {
x=0
y=4
width=715
height=25
}
"basic attribute" {
clr=2
}
}
composite {
object {
x=6
y=35
width=350
height=340
}
"composite name"=""
"composite file"="ADSetup.adl"
}
composite {
object {
x=5
y=380
width=350
height=240
}
"composite name"=""
"composite file"="ADPimegaReadout.adl"
}
composite {
object {
x=360
y=35
width=350
height=400
}
"composite name"=""
"composite file"="ADPimegaCollect.adl"
}
composite {
object {
x=360
y=605
width=350
height=80
}
"composite name"=""
"composite file"="ADPlugins.adl"
}
composite {
object {
x=360
y=440
width=350
height=160
}
"composite name"=""
"composite file"="ADBuffers.adl"
}
text {
object {
x=0
y=5
width=715
height=25
}
"basic attribute" {
clr=54
}
textix="Area Detector Control - $(P)$(R)"
align="horiz. centered"
}
composite {
object {
x=5
y=625
width=350
height=60
}
"composite name"=""
"composite file"="ADDriverFile.adl"
}
Loading