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

some more changes in the acquisition function

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@172 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-04-13 15:26:36 +00:00
parent ab4e569b6c
commit 1b6f8259c7
10 changed files with 249 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
slsDetectorSoftware/slsDetector/slsDetectorActions.h
View File

@ -3,7 +3,7 @@
#include "sls_detector_defs.h"
#include "postProcessing.h"
#include <string>
#include <fstream>
@ -20,7 +20,7 @@ using namespace std;
*/
class slsDetectorActions : public slsDetectorDefs {
class slsDetectorActions : public postProcessing {
public :
/** default constructor */
slsDetectorActions(){};
@ -179,8 +179,35 @@ class slsDetectorActions : public slsDetectorDefs {
float getCurrentScanVariable(int index) {return currentScanVariable[index];};
// int getScanPrecision(int index) {return scanPrecision[index];};
/**
set dacs value
\param val value (in V)
\param index DAC index
\param imod module number (if -1 alla modules)
\returns current DAC value
*/
virtual float setDAC(float val, dacIndex index , int imod=-1)=0;
virtual int setThresholdEnergy(int, int im=-1, detectorSettings isettings=GET_SETTINGS)=0;
virtual int setChannel(long long, int ich=-1, int ichip=-1, int imod=-1)=0;
int setStartIndex(int i=-1){if (i>=0) {startIndex=i; lastIndex=startIndex; nowIndex=startIndex;};return startIndex;};
int setLastIndex(int i=-1){if (i>=0 && i>lastIndex) lastIndex=i; return lastIndex;};
protected:
int executeScan(int level, int istep);
int executeAction(int level);
/** action mask */
int *actionMask;
/** array of action scripts */
@ -222,7 +249,13 @@ class slsDetectorActions : public slsDetectorDefs {
private:
int startIndex;
int lastIndex;
int nowIndex;
string fName;