Skip to content

Mitica update #2402

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
AndreaRigoni merged 8 commits into from
Oct 22, 2021
Merged

Mitica update #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
495a9e7
Fix : Asynchronous data segments acquisition fixed.
Oct 11, 2021
6695154
Fix: Add device reset, nisync_reset, in init operation
Oct 11, 2021
3658198
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into Mitic…
Oct 11, 2021
0c4dda0
Added devices
Oct 14, 2021
8a5ec56
Add3ed MARTe2 devices
AndreaRigoni Oct 14, 2021
52af6eb
Fix: Added delay of 500ms in the trigger method to ensure the correct…
Oct 14, 2021
20c678e
Updared interface
Oct 21, 2021
e91ab79
Updated deployment
AndreaRigoni Oct 21, 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
2 changes: 2 additions & 0 deletions deploy/packaging/debian/rfxdevices.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_COMPONENT.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_CONVERSION.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DUTY_CYCLE.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_IN.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_OUT.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EXPR.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_FFT.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_GAM.py
Expand Down
2 changes: 2 additions & 0 deletions deploy/packaging/redhat/rfxdevices.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_COMPONENT.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_CONVERSION.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DUTY_CYCLE.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_IN.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_OUT.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EXPR.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_FFT.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_GAM.py
Expand Down
108 changes: 59 additions & 49 deletions device_support/national/cRioFAUfunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "cRioFAUfunction.h"
//#include <time.h>
#include <thread>

using namespace MDSplus;

Expand Down Expand Up @@ -50,25 +52,26 @@ class FAUSaveItem
void save()
{

#include <time.h>

struct timespec before, after;
long elapsed_nsecs;
//struct timespec before, after;
//long elapsed_nsecs;

/* handle connection */


Tree *tree = new Tree(((Tree *)treePtr)->getName(), ((Tree *)treePtr)->getShot());

try
{

clock_gettime(CLOCK_REALTIME, &before);
//clock_gettime(CLOCK_REALTIME, &before);

for (int j = 0; j < nDio; j++)
{
TreeNode *currNode =
new TreeNode(((int *)dataNids)[j], (Tree *)treePtr);
new TreeNode(((int *)dataNids)[j], (Tree *)tree);
timeArrData = new Float64Array(&time[j * currSize], currSizeA[j]);
start = new Float64(time[j * currSize]);
end = new Float64(time[(currSizeA[j] - 1) + j * currSize]);
end = new Float64(time[(currSizeA[j] - 1) + j * currSize]);

dataArrData = new Uint8Array(&data[j * currSize], currSizeA[j]);
currNode->makeSegment(start, end, timeArrData, dataArrData);
Expand All @@ -86,9 +89,10 @@ class FAUSaveItem
free(time);
free(data);

/*
clock_gettime(CLOCK_REALTIME, &after);

/*

elapsed_nsecs = (after.tv_sec - before.tv_sec) * 1000000000 +
(after.tv_nsec - before.tv_nsec);

Expand All @@ -108,22 +112,31 @@ extern "C" void *FAUhandleSave(void *listPtr);
class FAUSaveList
{
public:
pthread_cond_t FAUitemAvailable;
pthread_t thread;
bool threadCreated;
FAUSaveItem *saveHead, *saveTail;
bool stopReq;
pthread_mutex_t mutex;
pthread_cond_t FAUitemAvailable;

public:
FAUSaveList()
{
int status = pthread_mutex_init(&mutex, NULL);
printf("pthread_mutex_init status %d\n", status);

status = pthread_cond_init(&FAUitemAvailable, NULL);
printf("pthread_cond_init status %d %p\n", status, &FAUitemAvailable);

saveHead = saveTail = NULL;
stopReq = false;
threadCreated = false;
}
~FAUSaveList()
{
printf("Destructor\n");
}

void addItem(uint8_t *value, double *time, double trigTime, int *currSizeA,
int currSize, size_t nDio, int *dataNids, Tree *treePtr)
{
Expand All @@ -145,29 +158,30 @@ class FAUSaveList
void executeItems()
{
int __count = 0;
// printf("Start executeItems\n");
printf("Start executeItems\n");

while (true)
{
// printf("Get mutex executeItems\n");
//printf("Get mutex executeItems\n");
pthread_mutex_lock(&mutex);
if (stopReq && saveHead == NULL)
{
// printf("Stop executeItems\n");
printf("Stop executeItems\n");
pthread_mutex_unlock(&mutex);
pthread_exit(NULL);
}

while (saveHead == NULL)
{
// printf("Wait executeItems %p\n", &FAUitemAvailable);
//printf("Wait executeItems %p %p\n", this_id, &FAUitemAvailable);
pthread_cond_wait(&FAUitemAvailable, &mutex);
if (stopReq && saveHead == NULL)
{
// printf("Stop executeItems\n");
printf("Stop executeItems\n");
pthread_mutex_unlock(&mutex);
pthread_exit(NULL);
}
// printf("Exit Wait executeItems\n");
printf("Exit Wait executeItems\n");
}
FAUSaveItem *currItem = saveHead;
saveHead = saveHead->getNext();
Expand Down Expand Up @@ -195,12 +209,14 @@ class FAUSaveList

void start()
{
printf("START SAVE THREAD\n");
pthread_create(&thread, NULL, FAUhandleSave, (void *)this);
threadCreated = true;
}

void stop()
{
printf("START SAVE THREAD TERMINATED\n");
printf("STOP SAVE THREAD %p %p\n");
printf("Pendig Items %d\n", getItemPending());
stopReq = true;
pthread_cond_signal(&FAUitemAvailable);
Expand All @@ -209,7 +225,7 @@ class FAUSaveList
printf("Join thread\n");
pthread_join(thread, NULL);
}
printf("EXIT SAVE THREAD TERMINATED\n");
printf("EXIT SAVE THREAD\n");
}
};

Expand Down Expand Up @@ -464,7 +480,7 @@ NiFpga_Status pauseFauAcquisition(NiFpga_Session session)

int fauQueuedAcqData(NiFpga_Session session, void *fauList, double tickPeriod,
double trigTime, size_t maxSamp, size_t nDio,
void *treePtr, void *dataNidPtr, uint8_t *stopFlag)
void *treePtr, void *dataNidPtr, int *stopFlag)
{

NiFpga_Status status = NiFpga_Status_Success;
Expand All @@ -484,58 +500,54 @@ int fauQueuedAcqData(NiFpga_Session session, void *fauList, double tickPeriod,
maxSamp = MIN_SEGMENT;

data = (uint8_t *)calloc(maxSamp * nDio, sizeof(uint8_t));
time = (double *)calloc(maxSamp, sizeof(double));
time = (double *) calloc(maxSamp, sizeof(double));

while ((!*(uint8_t *)stopFlag) == 1)

while ((!*(int *)stopFlag) == 1)
{
currSize = readFauFifoData(session, data, time, tickPeriod, &maxSamp, nDio,
stopFlag);

currSize = readFauFifoData(session, data, time, tickPeriod, &maxSamp, nDio, stopFlag);

printf("curr size %d nDio %d maxSamp %d \n", currSize, nDio, maxSamp);
if (currSize > 0)
{
printf("\rFau Acq %c", simb[__count++ % 5]);
fflush(stdout);

// printf("curr size %d nDio %d maxSamp %d \n", currSize, nDio, maxSamp);
//printf("\rFau Acq %c", simb[__count++ % 5]);
//fflush(stdout);

uint8_t b;
uint8_t *dataQ = (uint8_t *)calloc(currSize * nDio, sizeof(uint8_t));
double *timeQ = (double *)calloc(currSize * nDio, sizeof(double));
int *currSizeA = (int *)calloc(nDio, sizeof(int));
double *timeQ = (double *) calloc(currSize * nDio, sizeof(double));
int *currSizeA = (int *) calloc(nDio, sizeof(int));

for (int i = 0; i < currSize; i++)
{
for (int j = 0; j < nDio; j++)
{

b = data[i + j * maxSamp];
if (i == 0 || i == (currSize - 1) ||
(i >= 1 && data[(i - 1) + j * maxSamp] != b))
if (i == 0 || i == (currSize - 1) || (i >= 1 && data[(i - 1) + j * maxSamp] != b))
{
dataQ[currSizeA[j] + j * currSize] = b;
timeQ[currSizeA[j] + j * currSize] = time[i] + trigTime;
currSizeA[j]++;
}
}
}

((FAUSaveList *)fauList)
->addItem(dataQ, timeQ, trigTime, currSizeA, currSize, nDio, dataNids,
(Tree *)treePtr);
((FAUSaveList *)fauList)->addItem(dataQ, timeQ, trigTime, currSizeA, currSize, nDio, dataNids, (Tree *)treePtr);
}
}

free(data);
free(time);

printf("EXIT from fauQueuedAcqData %d \n", (!*(int *)stopFlag));
printf("EXIT from fauQueuedAcqData %d \n", (*(int *)stopFlag));

return 0;
}

int fauSaveAcqData(NiFpga_Session session, double tickPeriod, double trigTime,
size_t maxSamp, size_t nDio, void *treePtr, void *dataNidPtr,
uint8_t *stopFlag)
int *stopFlag)
{
NiFpga_Status status = NiFpga_Status_Success;
int currSize = 0;
Expand All @@ -546,10 +558,9 @@ int fauSaveAcqData(NiFpga_Session session, double tickPeriod, double trigTime,
int *dataNids = (int *)dataNidPtr;

data = (uint8_t *)calloc(maxSamp * nDio, sizeof(uint8_t));
time = (double *)calloc(maxSamp, sizeof(double));
time = (double *) calloc(maxSamp, sizeof(double));

currSize = readFauFifoData(session, data, time, tickPeriod, &maxSamp, nDio,
stopFlag);
currSize = readFauFifoData(session, data, time, tickPeriod, &maxSamp, nDio, stopFlag);

timeDio = (double *)calloc(currSize * nDio, sizeof(double));
currSizeA = (int *)calloc(nDio, sizeof(int));
Expand All @@ -559,8 +570,7 @@ int fauSaveAcqData(NiFpga_Session session, double tickPeriod, double trigTime,
for (int j = 0; j < nDio; j++)
{
b = data[i + j * maxSamp];
if (i == 0 || i == (currSize - 1) ||
(i >= 1 && data[(i - 1) + j * maxSamp] != b))
if (i == 0 || i == (currSize - 1) || (i >= 1 && data[(i - 1) + j * maxSamp] != b))
{
data[currSizeA[j] + j * maxSamp] = b;
timeDio[currSizeA[j] + j * currSize] = time[i] + trigTime;
Expand Down Expand Up @@ -600,7 +610,7 @@ int fauSaveAcqData(NiFpga_Session session, double tickPeriod, double trigTime,
end = new Float64(timeDio[(currSizeA[j] - 1) + j * currSize]);

dataArrData = new Uint8Array(&data[j * maxSamp], currSizeA[j]);
// currNode[j]->beginSegment(start, end, timeArrData, dataArrData);
// currNode[j]->beginSegment(start, end, timeArrData, dataArrData);
currNode[j]->makeSegment(start, end, timeArrData, dataArrData);

delete dataArrData;
Expand All @@ -623,7 +633,7 @@ int fauSaveAcqData(NiFpga_Session session, double tickPeriod, double trigTime,

int readFauFifoData(NiFpga_Session session, uint8_t *data, double *time,
double tickPeriod, size_t *maxSampPtr, size_t nDio,
uint8_t *stopFlag)
int *stopFlag)
{
NiFpga_Status status = NiFpga_Status_Success;
size_t currSize = 0;
Expand All @@ -650,26 +660,26 @@ int readFauFifoData(NiFpga_Session session, uint8_t *data, double *time,
noDataCount = 0;
// while( currSize < maxSamp && count < MAX_COUNT && !( count > MAX_COUNT/2 &&
// currSize > MIN_SEGMENT ) )
while (currSize < maxSamp && count < MAX_COUNT && currSize < MIN_SEGMENT &&
*(int *)stopFlag == 0)
while (currSize < maxSamp && count < MAX_COUNT && currSize < MIN_SEGMENT && *(int *)stopFlag == 0)
{

count++;
/*
if( __count % 10000 == 0 )
/*
if( __count % 1 == 0 )
{
printf("+");
fflush(stdout);
}
__count++;
*/
// Read elements in the queue
*/
// Read number of elements in the queue
NiFpga_MergeStatus(
&status,
NiFpga_ReadFifoU64(
session, NiFpga_FAU_cRIO_FPGA_TargetToHostFifoU64_AcquisitionFIFOR,
&dummy, 0, 0, &nElem));


if (NiFpga_IsError(status))
{
printf("Read Error\n");
Expand Down
8 changes: 4 additions & 4 deletions device_support/national/cRioFAUfunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ extern "C"
NiFpga_Status startFauFpga(NiFpga_Session session);
int readFauFifoData(NiFpga_Session session, uint8_t *data, double *time,
double tickPeriod, size_t *maxSamp, size_t nDio,
uint8_t *stopFlag);
int *stopFlag);
int fauSaveAcqData(NiFpga_Session session, double tickPeriod, double trigTime,
size_t maxSamp, size_t nDio, void *treePtr, void *dataNidPtr,
uint8_t *stopFlag);
int *stopFlag);
// int fauQueuedAcqData(NiFpga_Session session, void *fauList, uint8_t *data,
// double *time, double tickPeriod, size_t maxSamp, size_t nDio, void *treePtr,
// void *dataNidPtr, uint8_t *stopFlag);
// void *dataNidPtr, int *stopFlag);
int fauQueuedAcqData(NiFpga_Session session, void *fauList, double tickPeriod,
double trigTime, size_t maxSamp, size_t nDio,
void *treePtr, void *dataNidPtr, uint8_t *stopFlag);
void *treePtr, void *dataNidPtr, int *stopFlag);
NiFpga_Status getFauAcqState(NiFpga_Session session, uint16_t *acqState);
uint16_t IsFauFIFOOverflow(NiFpga_Session session);
NiFpga_Status startFauAcquisition(NiFpga_Session session);
Expand Down
3 changes: 3 additions & 0 deletions epics/archiver/ChannelArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ public void run()

if( shot > 0 )
{
System.out.println("Experiment "+expName);
tree = new Tree(expName, shot);
isTrendShot = false;
}
Expand Down Expand Up @@ -1308,6 +1309,8 @@ public static void main(java.lang.String[] args)
System.out.println("gov.aps.jca.Context.auto_addr_list " + jca.getProperty("gov.aps.jca.Context.auto_addr_list"));
System.out.println("gov.aps.jca.Context.addr_list " + jca.getProperty("gov.aps.jca.Context.addr_list"));

System.out.println("Experiment "+experiment);

tree = new Tree(experiment, -1);
if(createPulse)
tree.createPulse(shot);
Expand Down
Loading