Merge branch 'alpha' into mdsip-zombies

MDSplus · Dec 8, 2023 · e98a66c · e98a66c
2 parents b6e9575 + 41fe68c
commit e98a66c
Show file tree

Hide file tree

Showing 18 changed files with 2,285 additions and 345 deletions.
diff --git a/deploy/packaging/debian/idl.noarch b/deploy/packaging/debian/idl.noarch
@@ -26,6 +26,7 @@
 ./usr/local/mdsplus/idl/cw_wvedit.pro
 ./usr/local/mdsplus/idl/dsql.pro
 ./usr/local/mdsplus/idl/evaluate.pro
+./usr/local/mdsplus/idl/mds_keyword_set.pro
 ./usr/local/mdsplus/idl/mdscheckarg.pro
 ./usr/local/mdsplus/idl/mdsclose.pro
 ./usr/local/mdsplus/idl/mdsconnect.pro
@@ -36,7 +37,6 @@
 ./usr/local/mdsplus/idl/mdsevent.pro
 ./usr/local/mdsplus/idl/mdsgetmsg.pro
 ./usr/local/mdsplus/idl/mdsidlimage.pro
-./usr/local/mdsplus/idl/mds_keyword_set.pro
 ./usr/local/mdsplus/idl/mdsisclient.pro
 ./usr/local/mdsplus/idl/mdslogin.pro
 ./usr/local/mdsplus/idl/mdsopen.pro

diff --git a/deploy/packaging/debian/rfxdevices.noarch b/deploy/packaging/debian/rfxdevices.noarch
@@ -122,6 +122,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC_SERIAL.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPDAC.py
+./usr/local/mdsplus/pydevices/RfxDevices/RFX_TRIGUART.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RGA.py
 ./usr/local/mdsplus/pydevices/RfxDevices/SIG_SNAPSHOT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/SIS3820.py

diff --git a/deploy/packaging/redhat/idl.noarch b/deploy/packaging/redhat/idl.noarch
@@ -29,6 +29,7 @@
 ./usr/local/mdsplus/idl/cw_wvedit.pro
 ./usr/local/mdsplus/idl/dsql.pro
 ./usr/local/mdsplus/idl/evaluate.pro
+./usr/local/mdsplus/idl/mds_keyword_set.pro
 ./usr/local/mdsplus/idl/mdscheckarg.pro
 ./usr/local/mdsplus/idl/mdsclose.pro
 ./usr/local/mdsplus/idl/mdsconnect.pro
@@ -40,7 +41,6 @@
 ./usr/local/mdsplus/idl/mdsgetmsg.pro
 ./usr/local/mdsplus/idl/mdsidlimage.pro
 ./usr/local/mdsplus/idl/mdsisclient.pro
-./usr/local/mdsplus/idl/mds_keyword_set.pro
 ./usr/local/mdsplus/idl/mdslogin.pro
 ./usr/local/mdsplus/idl/mdsopen.pro
 ./usr/local/mdsplus/idl/mdsput.pro

diff --git a/deploy/packaging/redhat/rfxdevices.noarch b/deploy/packaging/redhat/rfxdevices.noarch
@@ -123,6 +123,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC_SERIAL.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPDAC.py
+./usr/local/mdsplus/pydevices/RfxDevices/RFX_TRIGUART.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RGA.py
 ./usr/local/mdsplus/pydevices/RfxDevices/SIG_SNAPSHOT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/SIS3820.py

diff --git a/device_support/redpitaya/AsyncStoreManager.cpp b/device_support/redpitaya/AsyncStoreManager.cpp
@@ -3,10 +3,10 @@
 pthread_mutex_t globalMutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t segmentMutex = PTHREAD_MUTEX_INITIALIZER;
 
-SaveItem::SaveItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode,
+SaveItem::SaveItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode,MDSplus::TreeNode *trigRecvNode,
                    MDSplus::Data *triggerTime, void *treePtr,
                    double *startTimes, double *endTimes, double freq, int blocksInSegment,
-                   MDSplus::TreeNode *resampledNode)
+                   char *trigReceived, MDSplus::TreeNode *resampledNode)
 {
   this->buffer = buffer;
   this->segmentSamples = segmentSamples;
@@ -23,11 +23,14 @@ SaveItem::SaveItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNod
   }
   this->freq = freq;
   this->resampledNode = resampledNode;
+  this->trigReceived = trigReceived;
+  this->trigRecvNode = trigRecvNode;
   nxt = 0;
 }
 
 void SaveItem::save()
 {
+
   MDSplus::Array *chanData =
       new MDSplus::Int16Array(buffer, segmentSamples);
 
@@ -63,10 +66,28 @@ void SaveItem::save()
     std::cout << "MAKE SEGMENT  SAMPLES:" << segmentSamples << std::endl;
     dataNode->makeSegment(startSegData, endSegData, timebase, chanData);
   }
-  catch (const MDSplus::MdsException &exc)
+  catch (MDSplus::MdsException &exc)
   {
     std::cout << "Error writing segment: " << exc.what() << std::endl;
   }
+
+
+   if(trigRecvNode)
+   {
+     MDSplus::Float64Array *trigFlagTimes = new MDSplus::Float64Array(startTimes, blocksInSegment);
+     MDSplus::Int8Array *trigFlags = new MDSplus::Int8Array(trigReceived, blocksInSegment);
+
+     std::cout << "MAKE SEGMENT  FLAGS:" << std::endl;
+
+     trigRecvNode->makeSegment(startSegData, endSegData, trigFlagTimes, trigFlags);
+     MDSplus::deleteData(trigFlagTimes);
+     MDSplus::deleteData(trigFlags);
+  }
+
+
+
+
+
   MDSplus::deleteData(chanData);
   MDSplus::deleteData(timebase);
   MDSplus::deleteData(startData);
@@ -76,8 +97,15 @@ void SaveItem::save()
   delete[] buffer;
   delete[] startTimes;
   delete[] endTimes;
+
+
 }
 
+
+
+
+
+
 SaveList::SaveList()
 {
   int status = pthread_mutex_init(&mutex, NULL);
@@ -87,14 +115,14 @@ SaveList::SaveList()
   threadCreated = false;
 }
 
-void SaveList::addItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode,
+void SaveList::addItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode,MDSplus::TreeNode *trigRecvNode,
                        MDSplus::Data *triggerTime, void *treePtr,
                        double *startTimes, double *endTimes, double freq, int blocksInSegment,
-                       MDSplus::TreeNode *resampledNode)
+                       char *trigReceived, MDSplus::TreeNode *resampledNode)
 
 {
   SaveItem *newItem = new SaveItem(
-      buffer, segmentSamples, dataNode, triggerTime, treePtr, startTimes, endTimes, freq, blocksInSegment, resampledNode);
+      buffer, segmentSamples, dataNode, trigRecvNode, triggerTime, treePtr, startTimes, endTimes, freq, blocksInSegment, trigReceived, resampledNode);
   pthread_mutex_lock(&mutex);
 
   if (saveHead == NULL)

diff --git a/device_support/redpitaya/AsyncStoreManager.h b/device_support/redpitaya/AsyncStoreManager.h
@@ -22,16 +22,18 @@ class SaveItem
   SaveItem *nxt;
   MDSplus::Data *triggerTime;
   MDSplus::TreeNode *dataNode;
+  MDSplus::TreeNode *trigRecvNode;
   MDSplus::TreeNode *resampledNode;
   double *startTimes, *endTimes;
   double freq;
   int blocksInSegment;
+  char *trigReceived;
 
 public:
 
-  SaveItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode, 
+  SaveItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode, MDSplus::TreeNode *trigRecvNode, 
                    MDSplus::Data *triggerTime, void *treePtr, 
-                  double *startTimes, double *endTimes, double freq, int blocksInSegment,
+                  double *startTimes, double *endTimes, double freq, int blocksInSegment, char *trigReceived,
                   MDSplus::TreeNode *resampledNode = NULL);
 
   void setNext(SaveItem *itm) { nxt = itm; }
@@ -69,9 +71,9 @@ class SaveList
 public:
   SaveList();
 
-  void addItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode,
+  void addItem(short *buffer, int segmentSamples, MDSplus::TreeNode *dataNode, MDSplus::TreeNode *trigRecvNode, 
                MDSplus::Data *triggerTime, void *treePtr, 
-               double *startTimes, double *endTimes, double freq, int blocksInSegment,
+               double *startTimes, double *endTimes, double freq, int blocksInSegment, char *trigReceived, 
                MDSplus::TreeNode *resampledNode = NULL);
 
   void executeItems();

diff --git a/device_support/redpitaya/Makefile b/device_support/redpitaya/Makefile
@@ -1,7 +1,7 @@
 
 CC=g++
 
-CFLAGS =  -fPIC  -o2  -Wall -DLINUX -I${MDSPLUS_DIR}/include -I. -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function
+CFLAGS =  -std=c++11 -fPIC  -o2  -Wall -DLINUX -I${MDSPLUS_DIR}/include -I. -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function
 LDFLAGS =  -L${MDSPLUS_DIR}/lib  -lpthread -lMdsObjectsCppShr