From 94979b58247328e010140180c597b89e55f27859 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 11 Jan 2019 11:11:50 +0100 Subject: [PATCH 1/2] changes to moench --- .../moenchDetectorServer/slsDetectorServer_defs.h | 6 ------ slsSupportLib/include/versionAPI.h | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index 961b559a0..a7cd843d2 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -40,12 +40,6 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, #define DYNAMIC_RANGE (16) #define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8) #define CLK_FREQ (156.25) /* MHz */ -#define I2C_POWER_VIO_DEVICE_ID (0x40) -#define I2C_POWER_VA_DEVICE_ID (0x41) -#define I2C_POWER_VB_DEVICE_ID (0x42) -#define I2C_POWER_VC_DEVICE_ID (0x43) -#define I2C_POWER_VD_DEVICE_ID (0x44) -#define I2C_SHUNT_RESISTER_OHMS (0.005) /** Default Parameters */ #define DEFAULT_DATA_BYTES (NCHIP * NCHAN * NUM_BITS_PER_PIXEL) diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 9026563e7..d46621ea6 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -4,5 +4,5 @@ #define APIJUNGFRAU 0x181102 #define APIGOTTHARD 0x190108 #define APICTB 0x180101 -#define APIMOENCH 0x180101 +#define APIMOENCH 0x181108 From de2ebad2ed07a85f70b40490b4e07d46b3ac1ff6 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 11 Jan 2019 11:19:16 +0100 Subject: [PATCH 2/2] receiver: removed unused silentmode from DataStreamer --- slsReceiverSoftware/include/DataStreamer.h | 6 +----- slsReceiverSoftware/src/DataStreamer.cpp | 3 +-- slsReceiverSoftware/src/slsReceiverImplementation.cpp | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/slsReceiverSoftware/include/DataStreamer.h b/slsReceiverSoftware/include/DataStreamer.h index 8f5720490..4b6ecec1f 100644 --- a/slsReceiverSoftware/include/DataStreamer.h +++ b/slsReceiverSoftware/include/DataStreamer.h @@ -29,10 +29,9 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject { * @param fi pointer to file index * @param fd flipped data enable for x and y dimensions * @param ajh additional json header - * @param sm pointer to silent mode */ DataStreamer(int ind, Fifo* f, uint32_t* dr, std::vector* r, - uint64_t* fi, int* fd, char* ajh, bool* sm); + uint64_t* fi, int* fd, char* ajh); /** * Destructor @@ -189,9 +188,6 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject { /** additional json header */ char* additionJsonHeader; - /** Silent Mode */ - bool* silentMode; - /** Aquisition Started flag */ bool acquisitionStartedFlag; diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp index 35515e998..4267567fa 100644 --- a/slsReceiverSoftware/src/DataStreamer.cpp +++ b/slsReceiverSoftware/src/DataStreamer.cpp @@ -16,7 +16,7 @@ const std::string DataStreamer::TypeName = "DataStreamer"; DataStreamer::DataStreamer(int ind, Fifo* f, uint32_t* dr, std::vector* r, - uint64_t* fi, int* fd, char* ajh, bool* sm) : + uint64_t* fi, int* fd, char* ajh) : ThreadObject(ind), runningFlag(0), generalData(0), @@ -28,7 +28,6 @@ DataStreamer::DataStreamer(int ind, Fifo* f, uint32_t* dr, std::vector* r, fileIndex(fi), flippedData(fd), additionJsonHeader(ajh), - silentMode(sm), acquisitionStartedFlag(false), measurementStartedFlag(false), firstAcquisitionIndex(0), diff --git a/slsReceiverSoftware/src/slsReceiverImplementation.cpp b/slsReceiverSoftware/src/slsReceiverImplementation.cpp index 7e1a91993..885e9e974 100644 --- a/slsReceiverSoftware/src/slsReceiverImplementation.cpp +++ b/slsReceiverSoftware/src/slsReceiverImplementation.cpp @@ -655,7 +655,7 @@ int slsReceiverImplementation::setDataStreamEnable(const bool enable) { for ( int i = 0; i < numThreads; ++i ) { try { dataStreamer.push_back(sls::make_unique(i, fifo[i].get(), &dynamicRange, - &roi, &fileIndex, flippedData, additionalJsonHeader, &silentMode)); + &roi, &fileIndex, flippedData, additionalJsonHeader)); dataStreamer[i]->SetGeneralData(generalData); dataStreamer[i]->CreateZmqSockets(&numThreads, streamingPort, streamingSrcIP); }