merge fix

This commit is contained in:
2021-10-19 14:54:39 +02:00
495 changed files with 4031 additions and 1935 deletions

View File

@ -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 *