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

removed gotthard functions not used

Browse Source
This commit is contained in:
maliakal_d
2019-08-20 18:18:34 +02:00
parent 11c1fb0e11
commit 28963e313b
19 changed files with 54 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
slsDetectorSoftware/include/Detector.h
View File

@ -778,10 +778,10 @@ class Detector {
*/
void setROI(defs::ROI value, int moduleId);
/** [Gotthard] TODO: check with jiaguo if he needs any of these functions */
/** [Gotthard] TODO: check with jiaguo if he needs any of these functions // TODO remove */
Result<ns> getExptimeLeft(Positions pos = {}) const;
/** [Gotthard] */
/** [Gotthard] TODO remove */
Result<ns> getPeriodLeft(Positions pos = {}) const;
/** [Gotthard] */
@ -793,30 +793,10 @@ class Detector {
Positions pos = {});
/** [Gotthard] */
void loadDarkImage(const std::string &fname, int module_id = -1);
Result<int> getImageTestMode(Positions pos = {});
/** [Gotthard] */
void loadGainImage(const std::string &fname, int module_id = -1);
/**
* [Gotthard] subset modules not allowed
* @param startACQ if start acq after reading counter
*/
void getCounterMemoryBlock(const std::string &fname, bool startACQ,
Positions pos = {});
/**
* [Gotthard]
* @param startACQ if start acq after resetting counter
* TODO! does it make sense to call one detector?
*/
void resetCounterBlock(bool startACQ, Positions pos = {});
/** [Gotthard] */
Result<int> getDigitalTestBit(Positions pos = {});
/** [Gotthard] */
Result<int> setDigitalTestBit(const int value, Positions pos = {});
/** [Gotthard] If 1, adds channel intensity with precalculated values. Default is 0 */
Result<int> setImageTestMode(const int value, Positions pos = {});
/**************************************************
* *

29
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -1229,39 +1229,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
int setFlowControl10G(int enable = -1, int detPos = -1); //
/**
* Execute a digital test (Gotthard)
* Execute a digital test (Gotthard, Jungfrau, CTB)
* @param mode testmode type
* @param value 1 to set or 0 to clear the digital test bit
* @param value 1 to set or 0 to clear the image test bit (Gotthard)
* @param detPos -1 for all detectors in list or specific detector position
* @returns result of test
*/
int digitalTest(digitalTestMode mode, int ival = -1, int detPos = -1);
/**
* Load dark or gain image to detector (Gotthard)
* @param index image type
* @param fname file name from which to load image
* @param detPos -1 for all detectors in list or specific detector position
*/
void loadImageToDetector(imageType index, const std::string &fname,
int detPos = -1); //
/**
* Writes the counter memory block from the detector (Gotthard)
* @param fname file name to load data from
* @param startACQ is 1 to start acquisition after reading counter
* @param detPos -1 for all detectors in list or specific detector position
*/
void writeCounterBlockFile(const std::string &fname, int startACQ = 0,
int detPos = -1);
/**
* Resets counter in detector (Gotthard)
* @param startACQ is 1 to start acquisition after resetting counter
* @param detPos -1 for all detectors in list or specific detector position
*/
void resetCounterBlock(int startACQ = 0, int detPos = -1); //
/**
* Set/get counter bit in detector (Eiger)
* @param i is -1 to get, 0 to reset and any other value to set the counter

36
slsDetectorSoftware/include/slsDetector.h
View File

@ -979,47 +979,13 @@ class slsDetector : public virtual slsDetectorDefs {
int64_t getReceiverRealUDPSocketBufferSize() const;
/**
* Execute a digital test (Gotthard, Mythen)
* Execute a digital test (Gotthard, Jungfrau, CTB)
* @param mode testmode type
* @param value 1 to set or 0 to clear the digital test bit
* @returns result of test
*/
int digitalTest(digitalTestMode mode, int ival = -1);
/**
* Load dark or gain image to detector (Gotthard)
* @param index image type, 0 for dark image and 1 for gain image
* @param fname file name from which to load image
*/
void loadImageToDetector(imageType index, const std::string &fname);
/**
* Called from loadImageToDetector to send the image to detector
* @param index image type, 0 for dark image and 1 for gain image
* @param imageVals image
*/
void sendImageToDetector(imageType index, int16_t imageVals[]);
/**
* Writes the counter memory block from the detector (Gotthard)
* @param fname file name to load data from
* @param startACQ is 1 to start acquisition after reading counter
*/
void writeCounterBlockFile(const std::string &fname, int startACQ = 0);
/**
* Gets counter memory block in detector (Gotthard)
* @param image counter memory block from detector
* @param startACQ 1 to start acquisition afterwards, else 0
*/
void getCounterBlock(int16_t image[], int startACQ = 0);
/**
* Resets counter in detector
* @param startACQ is 1 to start acquisition after resetting counter
*/
void resetCounterBlock(int startACQ = 0);
/**
* Set/get counter bit in detector (Gotthard)
* @param i is -1 to get, 0 to reset and any other value to set the counter

2
slsDetectorSoftware/include/slsDetectorCommand.h
View File

@ -73,7 +73,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
static std::string helpSpeed(int action);
static std::string helpAdvanced(int action);
static std::string helpConfiguration(int action);
static std::string helpImage(int action);
static std::string helpCounter(int action);
static std::string helpADC(int action);
static std::string helpTempControl(int action);
@ -134,7 +133,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
std::string cmdSpeed(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdAdvanced(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdConfiguration(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdImage(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdCounter(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdADC(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdTempControl(int narg, const char * const args[], int action, int detPos = -1);