detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-15 22:31:32 +01:00
Code Issues Actions Packages Releases Activity

slsDetectorSoftware: removed warnings, and made compilable via make

Browse Source
This commit is contained in:
maliakal_d
2018-07-10 14:58:18 +02:00
parent f5a86bbfe1
commit c2b1eef75c
10 changed files with 161 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "51fd9ed423b7a8fb45a76b4f48316537c4fb0f5d"
#define GITREPUUID "f5a86bbfe1e4d0ec5e9296b84a3e1096fdc4a9a6"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3818
#define GITDATE 0x20180517
#define GITBRANCH "developer"
#define GITREV 0x3938
#define GITDATE 0x20180710
#define GITBRANCH "3.3.0-rc"

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -646,7 +646,8 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
strncpy(thisDetector->calDir, getenv("HOME"), MAX_STR_LENGTH-1);
thisDetector->calDir[MAX_STR_LENGTH-1] = 0;
thisDetector->nTrimEn = 0;
thisDetector->trimEnergies[100];
for(int i = 0; i < MAX_TRIMEN; ++i)
thisDetector->trimEnergies[i] = 0;
thisDetector->progressIndex = 0;
thisDetector->totalProgress = 1;
strcpy(thisDetector->filePath, "/");
@@ -876,6 +877,8 @@ void slsDetector::initializeMembers() {
case JUNGFRAUCTB:
fileIO::setFramesPerFile(JFRAU_MAX_FRAMES_PER_FILE);
break;
default:
break;
}

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -98,7 +98,7 @@ private:
int nTrimEn;
/** list of the energies at which the detector has been trimmed */
int trimEnergies[100];
int trimEnergies[MAX_TRIMEN];
/** indicator for the acquisition progress - set to 0 at the beginning
* of the acquisition and incremented when each frame is processed */

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -6355,7 +6355,7 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
}
char answer[100];
memset(answer, 0, 100);
sprintf(answer,"%s", myDet->setReceiverFramesPerFile());
sprintf(answer,"%d", myDet->setReceiverFramesPerFile());
return string(answer);
}