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

12
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -20,13 +20,6 @@ extern "C" {
#include <unistd.h>
#ifdef __MAKECINT__
#pragma link off class _FTCOMSTAT-;
#pragma link off class _FTDCB-;
#endif
//#include "MySocketTCP.h"
#include <iostream>
#include <fstream>
#include <iomanip>
@ -42,7 +35,6 @@ using namespace std;
#include "sls_detector_defs.h"
#include "slsDetectorBase.h"
#include "energyConversion.h"
#include "postProcessing.h"
#include "slsDetectorActions.h"
#define MAX_TIMERS 10
@ -57,7 +49,7 @@ using namespace std;
(used in the PSi command line interface)
*/
class slsDetectorUtils : public slsDetectorActions, public postProcessing, public slsDetectorBase {
class slsDetectorUtils : public slsDetectorActions, public slsDetectorBase {
@ -390,7 +382,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing, publi
// virtual float* convertAngles(float pos)=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;
virtual int setChannel(long long, int ich=-1, int ichip=-1, int imod=-1)=0;
virtual float getRateCorrectionTau()=0;
virtual int* startAndReadAll()=0;