mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-21 17:18:00 +02:00
Moench dacs defaults (#788)
* merge fix from 7.0.2: new jungfrau fw versions, incremented binary, hdf5 and json versions * moench: changed dac names and default values to old moench values * moench: remove interface clk polarity at start up * moench: default speed is half speed, default values for adc offset and adc phase for different speeds (only half speed confirmed), adc vref voltage to 2.0 like G1 * moench: connected adc pipeline to client * moench: receiver- default frames per file is 100k and discard partial frames as default * moench binary in * using tostring in gui for dacs * moved frame discard policy as a parameter to be configured with a default depending on detector * moench: 300 degrees for adc phase in full speed
This commit is contained in:
@ -502,8 +502,6 @@ class Module : public virtual slsDetectorDefs {
|
||||
* ************************************************/
|
||||
int getNumberOfAnalogSamples() const;
|
||||
void setNumberOfAnalogSamples(int value);
|
||||
int getADCPipeline() const;
|
||||
void setADCPipeline(int value);
|
||||
uint32_t getADCEnableMask() const;
|
||||
void setADCEnableMask(uint32_t mask);
|
||||
uint32_t getTenGigaADCEnableMask() const;
|
||||
@ -557,7 +555,7 @@ class Module : public virtual slsDetectorDefs {
|
||||
|
||||
/**************************************************
|
||||
* *
|
||||
* Moench *
|
||||
* Json Header specific *
|
||||
* *
|
||||
* ************************************************/
|
||||
std::map<std::string, std::string> getAdditionalJsonHeader() const;
|
||||
@ -572,6 +570,8 @@ class Module : public virtual slsDetectorDefs {
|
||||
* Advanced *
|
||||
* *
|
||||
* ************************************************/
|
||||
int getADCPipeline() const;
|
||||
void setADCPipeline(int value);
|
||||
void programFPGA(std::vector<char> buffer,
|
||||
const bool forceDeleteNormalFile);
|
||||
void resetFPGA();
|
||||
|
Reference in New Issue
Block a user