Skip to content

Add FWClear for all detectors #98

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

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

Add FWClear for all detectors #98

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
0626e20
Make FWClear available for all detectors
ericonr Apr 23, 2026
c31a05d
Make FWClear a bo record
ericonr Apr 23, 2026
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
7 changes: 3 additions & 4 deletions docs/ADEiger/eiger.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,7 @@ can be given with the command::
sudo setcap cap_setuid,cap_setgid+ep eigerDetectorApp

All files on the detector disk can be deleted at once by processing
the FWClear PV. This is only available with the Eiger1 and Simplon API version
1.6.0.
the FWClear PV.

If the last data file of a series won't be full (e.g.
series_1_data_000002.h5 with 20 images) then it will only appear on
Expand Down Expand Up @@ -725,9 +724,9 @@ FileWriter Interface
- FWAutoRemove, FWAutoRemove_RBV
- bo, bi
* - filewriter/config/clear
- Writing to this PV clears *all* files on the detector server disk. Eiger1 only.
- Writing to this PV clears *all* files on the detector server disk.
- FWClear
- ao
- bo

Stream Interface
~~~~~~~~~~~~~~~~
Expand Down
11 changes: 0 additions & 11 deletions eigerApp/Db/eiger1.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,3 @@ record(ai, "$(P)$(R)DCUBufferFree_RBV")
field(VAL, "0")
field(PREC, "1")
}

####################
# FileWriter Setup #
####################

# FileWriter clear all files
record(ao, "$(P)$(R)FWClear") {
field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))CLEAR")
field(DESC, "Clear files in the detector")
}
9 changes: 9 additions & 0 deletions eigerApp/Db/eigerBase.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,15 @@ record(bi,"$(P)$(R)FWAutoRemove_RBV") {
field(SCAN, "I/O Intr")
}

# FileWriter clear all files
record(bo, "$(P)$(R)FWClear") {
field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))CLEAR")
field(DESC, "Clear files in the detector")
field(ZNAM, "Clear")
field(ONAM, "Clear")
}

# FileWriter free buffer space
record(ai, "$(P)$(R)FWFree_RBV")
{
Expand Down
4 changes: 2 additions & 2 deletions eigerApp/src/eigerDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ eigerDetector::eigerDetector (const char *portName, const char *serverHostname,
mFWImgNumStart = mParams.create(EigFWImgNumStartStr, asynParamInt32, SSFWConfig, "image_nr_start");
mFWState = mParams.create(EigFWStateStr, asynParamOctet, SSFWStatus, "state");
mFWFree = mParams.create(EigFWFreeStr, asynParamFloat64, SSFWStatus, "buffer_free");
mFWClear = mParams.create(EigFWClearStr, asynParamInt32, SSFWCommand, "clear");

// Monitor API Parameters
mMonitorEnable = mParams.create(EigMonitorEnableStr, asynParamInt32, SSMonConfig, "mode");
Expand Down Expand Up @@ -385,7 +386,6 @@ eigerDetector::eigerDetector (const char *portName, const char *serverHostname,
mParams.getByIndex(i)->setEnumValues(linkEnum);
}
mDCUBufFree = mParams.create(EigDCUBufFreeStr, asynParamFloat64, SSDetStatus, "builder/dcu_buffer_free");
mFWClear = mParams.create(EigFWClearStr, asynParamInt32, SSFWCommand, "clear");
}
else if (mEigerModel == Eiger2 || mEigerModel == Pilatus4)
{
Expand Down Expand Up @@ -516,7 +516,7 @@ asynStatus eigerDetector::writeInt32 (asynUser *pasynUser, epicsInt32 value)
}
setIntegerParam(ADAcquire, value);
}
else if (mAPIVersion == API_1_6_0 && function == mFWClear->getIndex())
else if (function == mFWClear->getIndex())
{
status = (asynStatus) mFWClear->put(1);
mFWFree->fetch();
Expand Down