small changes in makefile and replaced long long with int64_t

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@189 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2012-06-15 07:12:24 +00:00
parent c1c646db15
commit 84e113d447
2 changed files with 2 additions and 2 deletions

View File

@ -55,7 +55,7 @@ lib: package
# added install target, HBl # added install target, HBl
install_lib: lib install_lib: lib
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
cp -P libSlsDetector.so.1.0.1 libSlsDetector.so libSlsDetector.so.1 $(DESTDIR) cp -P libSlsDetector.so $(DESTDIR)
install_inc: install_inc:
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))

View File

@ -407,7 +407,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
// virtual float* convertAngles(float pos)=0; // virtual float* convertAngles(float pos)=0;
virtual int setThresholdEnergy(int, int im=-1, detectorSettings isettings=GET_SETTINGS)=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(int64_t, int ich=-1, int ichip=-1, int imod=-1)=0;
virtual float getRateCorrectionTau()=0; virtual float getRateCorrectionTau()=0;
virtual int* startAndReadAll()=0; virtual int* startAndReadAll()=0;