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

Updates/fixes to the driver, works at NSLS2 #5

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

Updates/fixes to the driver, works at NSLS2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d549b3
Added debugging messages as well comments; commented out and marked …
Feb 12, 2020
f017353
removed unused code related to polling. This code was commented out …
oksanagit Feb 13, 2020
b8b7bfd
fixed save/restore: set_requestfile_path should use not , cleanned a…
oksanagit Feb 14, 2020
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
10 changes: 3 additions & 7 deletions iocs/mythenIOC/iocBoot/iocMythen/auto_settings.req
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
file "ADBase_settings.req", P=$(P), R=cam1:
$(P)cam1:AcquireTime.PREC
file "NDFile_settings.req", P=$(P), R=cam1:
file "mythen_settings.req", P=$(P), R=cam1:
file "NDPluginBase_settings.req", P=$(P), R=image1:
file "NDStdArrays_settings.req", P=$(P), R=image1:
file "commonPlugin_settings.req", P=$(P)

file "mythen_settings.req", P=$(P), R=cam1:
file "NDStdArrays_settings.req", P=$(P), R=image1:
file "commonPlugin_settings.req", P=$(P)
2 changes: 1 addition & 1 deletion iocs/mythenIOC/iocBoot/iocMythen/st.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dbLoadRecords("$(ADCORE)/db/NDStdArrays.template", "P=$(PREFIX),R=image1:,PORT=I
# Load asynRecord records on Mythen communication
dbLoadRecords("$(ASYN)/db/asynRecord.db", "P=$(PREFIX),R=asyn_1,PORT=IP_M1K,ADDR=0,OMAX=256,IMAX=256")

set_requestfile_path("$(TOP)/mythenApp/Db")
set_requestfile_path("$(ADMYTHEN)/mythenApp/Db")

iocInit()

Expand Down
97 changes: 47 additions & 50 deletions mythenApp/src/mythen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
* 2015-07-15 M. Moore ANL - APS/XSD/DET: Modified acquire sequence to handle trigger time outs
* 2015-08-05 M. Moore ANL - APS/XSD/DET: Changed how readout timeouts are handled to be timeout+acquiretime
* Handles ImageMode correctly, so that if you have single acquire it only acquires one image
* 2020-02-13 Oksana Ivashkevych - NSLS2: Added asynPrint instead of printf for debugging, added comments about API specifics.
* Removed unused code related to polling, removed some commented out code.
* Fixed ADStatus updates from driver to the parent.
* mode "corrected" works well with soft triggers, mode "raw" does not work and need some work,
* external triggers has not been tested
*
*/

Expand Down Expand Up @@ -91,7 +96,6 @@ class mythen : public ADDriver {
virtual void report(FILE *fp, int details);

epicsInt32 dataCallback(epicsInt32 *pData); /* This should be private but is called from C so must be public */
void pollTask();
void acquisitionTask();
void shutdown();

Expand Down Expand Up @@ -232,6 +236,9 @@ asynStatus mythen::sendCommand()
"%s:%s: error, expected 0, received %d\n",
driverName, functionName, aux);
}
asynPrint(pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s: send status aux = %d\n",
driverName, functionName, aux);
return status;
}

Expand All @@ -240,7 +247,7 @@ asynStatus mythen::writeReadMeter()
{
size_t nread;
size_t nwrite;
asynStatus status;
asynStatus status = asynSuccess;
int eomReason;
const char *functionName="writeReadMeter";

Expand All @@ -258,6 +265,8 @@ asynStatus mythen::writeReadMeter()
inString_, sizeof(int), M1K_TIMEOUT, &nwrite, &nread, &eomReason);
}
}
asynPrint(pasynUserSelf, ASYN_TRACEIO_DRIVER, "%s:%s: sent this string to the driver outString_ = %s, inString_ = %s, status = %d\n",
driverName, functionName, outString_, inString_, status);
if(status != asynSuccess)
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: error!\n",driverName, functionName);
Expand All @@ -267,30 +276,27 @@ asynStatus mythen::writeReadMeter()
/** Starts and stops the acquisition. **/
asynStatus mythen::setAcquire(epicsInt32 value)
{
size_t nread;
size_t nwrite;
asynStatus status = asynSuccess;
epicsInt32 eomReason;
static const char *functionName = "setAcquire";
// printf("setAcquire %d\n",value);
if (value == 0) {
// while (1) {
// // Repeat sending STOP until we get only a 0 back
// status = pasynOctetSyncIO->setInputEos(pasynUserMeter_, "", 0);
// if (status) break;
status = pasynOctetSyncIO->writeRead(pasynUserMeter_, "-stop", strlen(outString_),
inString_, sizeof(epicsInt32), M1K_TIMEOUT, &nwrite, &nread, &eomReason);
setIntegerParam(ADStatus, getStatus());
// if (status == asynSuccess || status == asynTimeout) break;
// }
asynPrint(pasynUserSelf, ASYN_TRACEIO_DRIVER, "%s:%s setAcquire to %d\n",driverName, functionName, value);
if (value == 0) {
// -stop command will stop acquision of the next frame. Like windshield wipers in 2020, they shoud finish thier cleanning cycle.
// If acquisition time is rather long, sending -stop command will time out for 5 sec, and the acquision will be finished anyways
// getStatus() function of this driver queries its status.
setIntegerParam(ADStatus, ADStatusAborting);
callParamCallbacks();
strcpy(outString_, "-stop");
this->sendCommand();
acquiring_ = 0;
setIntegerParam(ADStatus, getStatus());
callParamCallbacks();
} else {
if(!(acquiring_)) {
strcpy(outString_,"-start");
this->sendCommand();
// Notify the read thread that acquisition has started
epicsEventSignal(startEventId_);

epicsEventSignal(startEventId_);
// Status is being updated by the caller
acquiring_ = 1;
}
}
Expand Down Expand Up @@ -516,12 +522,13 @@ epicsInt32 mythen::getStatus()
aux = stringToInt32(this->inString_);
int m_status = aux & 1; // Acquire running status (non-zero)
int t_status = aux & (1<<3); // Waiting for trigger (non-zero)
int d_status = aux & (1<<16); // No Data Available when not zero
int d_status = aux & (1<<16); // No Data Available(empty buffer) when not zero
int triggerWaitCnt=0;
double triggerWait;

//printf("Mythen Status - M:%d\tT:%d\tD:%d\n",m_status,t_status, d_status);

asynPrint(pasynUserSelf, ASYN_TRACEIO_DRIVER,
"Mythen Status - M:%d\tT:%d\tD:%d\n", m_status,t_status, d_status);
/* Oksana 2/13/20 this section of code does not mame sence, commenting out for now.
if (m_status || !d_status ) {
detStatus = ADStatusAcquire;

Expand All @@ -540,12 +547,17 @@ epicsInt32 mythen::getStatus()
triggerWaitCnt++;

}

if (!d_status)
detStatus = ADStatusReadout;
if (triggerWaitCnt==MAX_TRIGGER_TIMEOUT_COUNT)
detStatus = ADStatusError;
}
*/
if (m_status){
detStatus = ADStatusAcquire;
if (t_status)
detStatus = ADStatusWaiting;
}
else
detStatus = ADStatusIdle;

Expand Down Expand Up @@ -808,34 +820,12 @@ void acquisitionTaskC(void *drvPvt)
pPvt->acquisitionTask();
}

void pollTaskC(void *drvPvt)
{
mythen *pPvt = (mythen*)drvPvt;
pPvt->pollTask();
}

void mythen::shutdown()
{
// if (pDetector)
// delete pDetector;
}

void mythen::pollTask()
{
// int acquire;
/* Poll detector running status every second*/
while (1) {
epicsThreadSleep(1);

/* Update detector status */
this->lock();
// int detStatus = pDetector->getDetectorStatus();
// setIntegerParam(ADStatus, detStatus);
callParamCallbacks();
this->unlock();
}
}

void mythen::acquisitionTask()
{
size_t nread, nread_expect;
Expand All @@ -857,32 +847,35 @@ void mythen::acquisitionTask()
/* If we are not acquiring then wait for a semaphore that is given when acquisition is started */
if (!acquire || !acquiring_) {
setIntegerParam(ADStatus, ADStatusIdle);
callParamCallbacks();
/* Release the lock while we wait for an event that says acquire has started, then lock again */
asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW,
"%s:%s: waiting for acquire to start\n", driverName, functionName);
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s: Waiting for acquire to start\n", driverName, functionName);
this->unlock();
eventStatus = epicsEventWait(this->startEventId_);
// setStringParam(ADStatusMessage, "Acquiring data");
// setIntegerParam(ADNumImagesCounter, 0);
// getIntegerParam(ADAcquire, &acquire);


//printf("Read Mode: %d\tnModules: %d\t chanperline: %d\n", readmode_,this->nmodules,chanperline_);
//printf("Read Mode: %d\tnModules: %d\t chanperline: %d\n", readmode_,this->nmodules,chanperline_);
if (readmode_==0) //Raw Mode
nread_expect = sizeof(epicsInt32)*this->nmodules*(1280/chanperline_);
else
nread_expect = sizeof(epicsInt32)*this->nmodules*(1280);

dataOK = 1;

eventStatus = getStatus();
setIntegerParam(ADStatus, eventStatus);
callParamCallbacks();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s: getStatus() = %d, acquire = %d , acquiring_ = %d \n", driverName, functionName, eventStatus, acquire, acquiring_);

if (eventStatus!=ADStatusError) {

getDoubleParam(ADAcquireTime,&acquireTime);
// printf("Acquisition start - expect %d\n",nread_expect);
asynPrint(pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s: Acquisition start - expect %lu\n",driverName, functionName, nread_expect);
// Work on the cases of what are you getting from getstatus
do {
nread=0;
Expand All @@ -896,6 +889,9 @@ void mythen::acquisitionTask()

//printf("nread_expected=%d, nread=%d, status=%d, timeout=%f, eomReason=%d\n",
// (int)nread_expect, (int)nread, status, M1K_TIMEOUT+acquireTime, eomReason);
asynPrint(pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s: returned from pasynOctetSyncIO->writeRead: nread_expected=%d, nread=%d, status=%d, timeout=%f, eomReason=%d\n",
driverName, functionName, (int)nread_expect, (int)nread, status, M1K_TIMEOUT+acquireTime, eomReason);

if(nread == nread_expect) {
this->lock();
Expand All @@ -904,6 +900,7 @@ void mythen::acquisitionTask()
if (!dataOK) {
eventStatus = getStatus();
setIntegerParam(ADStatus, eventStatus);
callParamCallbacks();
}

}
Expand Down Expand Up @@ -941,7 +938,7 @@ void mythen::acquisitionTask()
driverName, functionName);
acquiring_ = 0;
setAcquire(0);
setIntegerParam(ADAcquire, 0);
setIntegerParam(ADAcquire, getStatus());
callParamCallbacks();
}
}
Expand Down