diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 59660b030..7caf6bfbd 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -55,7 +55,7 @@ lib: package # added install target, HBl install_lib: lib $(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: $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h index eb71ce119..d6cce32f5 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h @@ -407,7 +407,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing { // 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(int64_t, int ich=-1, int ichip=-1, int imod=-1)=0; virtual float getRateCorrectionTau()=0; virtual int* startAndReadAll()=0;