mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-17 07:17:13 +02:00
merge fix
This commit is contained in:
@ -1,3 +1,5 @@
|
||||
// SPDX-License-Identifier: LGPL-3.0-or-other
|
||||
// Copyright (C) 2021 Contributors to the SLS Detector Package
|
||||
#pragma once
|
||||
#include "SharedMemory.h"
|
||||
#include "sls/ClientSocket.h"
|
||||
@ -152,6 +154,8 @@ class Module : public virtual slsDetectorDefs {
|
||||
void setDynamicRange(int dr);
|
||||
timingMode getTimingMode() const;
|
||||
void setTimingMode(timingMode value);
|
||||
speedLevel getReadoutSpeed() const;
|
||||
void setReadoutSpeed(speedLevel value);
|
||||
int getClockDivider(int clkIndex) const;
|
||||
void setClockDivider(int clkIndex, int value);
|
||||
int getClockPhase(int clkIndex, bool inDegrees) const;
|
||||
@ -393,7 +397,7 @@ class Module : public virtual slsDetectorDefs {
|
||||
void setGainMode(const gainMode mode);
|
||||
int getFilterCell() const;
|
||||
void setFilterCell(int value);
|
||||
|
||||
|
||||
/**************************************************
|
||||
* *
|
||||
* Gotthard Specific *
|
||||
|
Reference in New Issue
Block a user