detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 17:47:59 +02:00
Code Issues Actions Packages Releases Activity

removed unnecessary functions in listener and dataprocessor and ensure processedin measurement is not same saas processed frames in acqustion

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-05-17 15:37:51 +02:00
parent 001d6415bf
commit cb008bb700
5 changed files with 85 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
slsReceiverSoftware/include/DataProcessor.h
View File

@ -93,6 +93,11 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
*/
uint64_t GetProcessedAcquisitionIndex();
/**
* Get Current Frame Index thats been processed for each real time acquisition (eg. for each scan)
* @return -1 if no frames have been caught, else current frame index
*/
uint64_t GetProcessedMeasurementIndex();
//*** setters ***
/**
@ -250,33 +255,14 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
/** Fifo structure */
Fifo* fifo;
/** Data Stream Enable */
bool* dataStreamEnable;
/** Aquisition Started flag */
bool acquisitionStartedFlag;
/** Measurement Started flag */
bool measurementStartedFlag;
/**Number of complete frames caught for an entire acquisition (including all scans) */
uint64_t numTotalFramesCaught;
/** Number of complete frames caught for each real time acquisition (eg. for each scan) */
uint64_t numFramesCaught;
/** Frame Number of First Frame of an entire Acquisition (including all scans) */
uint64_t firstAcquisitionIndex;
/** Frame Number of First Frame for each real time acquisition (eg. for each scan) */
uint64_t firstMeasurementIndex;
/** Frame Number of latest processed frame number of an entire Acquisition (including all scans) */
uint64_t currentFrameIndex;
//individual members
/** File writer implemented as binary or hdf5 File */
File* file;
/** Data Stream Enable */
bool* dataStreamEnable;
/** File Format Type */
fileFormat* fileFormatType;
@ -284,6 +270,35 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
bool* fileWriteEnable;
//acquisition start
/** Aquisition Started flag */
bool acquisitionStartedFlag;
/** Measurement Started flag */
bool measurementStartedFlag;
/** Frame Number of First Frame of an entire Acquisition (including all scans) */
uint64_t firstAcquisitionIndex;
/** Frame Number of First Frame for each real time acquisition (eg. for each scan) */
uint64_t firstMeasurementIndex;
//for statistics
/**Number of complete frames caught for an entire acquisition (including all scans) */
uint64_t numTotalFramesCaught;
/** Number of complete frames caught for each real time acquisition (eg. for each scan) */
uint64_t numFramesCaught;
/** Frame Number of latest processed frame number of an entire Acquisition (including all scans) */
uint64_t currentFrameIndex;
//call back
/**
* Call back for raw data
* args to raw data ready callback are

35
slsReceiverSoftware/include/Listener.h
View File

@ -73,10 +73,10 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
bool GetMeasurementStartedFlag();
/**
* Get Total Packets caught in an acquisition
* @return Total Packets caught in an acquisition
* Get Packets caught in a real time acquisition (start and stop of receiver)
* @return Packets caught in a real time acquisition
*/
uint64_t GetTotalPacketsCaught();
uint64_t GetPacketsCaught();
/**
* Get Last Frame index caught
@ -217,12 +217,6 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
/** Detector Type */
detectorType myDetectorType;
/** Aquisition Started flag */
bool acquisitionStartedFlag;
/** Measurement Started flag */
bool measurementStartedFlag;
/** Receiver Status */
runStatus* status;
@ -244,11 +238,13 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
/** Dynamic Range */
uint32_t* dynamicRange;
/**Number of complete Packets caught for an entire acquisition (including all scans) */
volatile uint64_t numTotalPacketsCaught;
/** Number of complete Packets caught for each real time acquisition (eg. for each scan) */
volatile uint64_t numPacketsCaught;
// acquisition start
/** Aquisition Started flag */
bool acquisitionStartedFlag;
/** Measurement Started flag */
bool measurementStartedFlag;
/** Frame Number of First Frame of an entire Acquisition (including all scans) */
uint64_t firstAcquisitionIndex;
@ -256,14 +252,21 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
/** Frame Number of First Frame for each real time acquisition (eg. for each scan) */
uint64_t firstMeasurementIndex;
// for statistics
/** Number of complete Packets caught for each real time acquisition (eg. for each scan (start& stop of receiver)) */
volatile uint64_t numPacketsCaught;
/** Last Frame Index caught from udp network */
uint64_t lastCaughtFrameIndex;
// parameters to acquire image
/** Current Frame Index, default value is 0
* ( always check acquisitionStartedFlag for validity first)
*/
uint64_t currentFrameIndex;
/** Last Frame Index caught from udp network */
uint64_t lastCaughtFrameIndex;
/** True if there is a packet carry over from previous Image */
bool carryOverFlag;