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

merge from refgui. not completed

Browse Source
This commit is contained in:
maliakal_d
2019-04-12 09:12:44 +02:00
parent 74f2783b10
commit 9543171504
552 changed files with 8396 additions and 16164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
slsReceiverSoftware/CMakeLists.txt Normal file → Executable file
View File

9
slsReceiverSoftware/gitInfo.txt
View File

@@ -1,9 +0,0 @@
Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: def79807f6f40ed1797b8154240adbc0e35c95e0
Revision: 840
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4039
Last Changed Date: 2018-10-02 10:40:58.000000002 +0200

0
slsReceiverSoftware/include/BinaryFile.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/BinaryFileStatic.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/DataProcessor.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/DataStreamer.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/Fifo.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/File.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/GeneralData.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/HDF5File.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/HDF5FileStatic.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/Listener.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/ThreadObject.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/circularFifo.h Normal file → Executable file
View File

6
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@@ -1,6 +0,0 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "def79807f6f40ed1797b8154240adbc0e35c95e0"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4039
#define GITDATE 0x20181002
#define GITBRANCH "refactor"

6
slsReceiverSoftware/include/gitInfoReceiverTmp.h
View File

@@ -1,6 +0,0 @@
#define GITURL ""
#define GITREPUUID ""
#define GITAUTH ""
#define GITREV ""
#define GITDATE ""
#define GITBRANCH ""

0
slsReceiverSoftware/include/slsReceiver.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/slsReceiverImplementation.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/slsReceiverTCPIPInterface.h Normal file → Executable file
View File

0
slsReceiverSoftware/include/slsReceiverUsers.h Normal file → Executable file
View File

0
slsReceiverSoftware/slsReceiverUsers.doxy Normal file → Executable file
View File

0
slsReceiverSoftware/src/BinaryFile.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/DataProcessor.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/DataStreamer.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/Fifo.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/File.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/HDF5File.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/Listener.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/ThreadObject.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/src/main.cpp Normal file → Executable file
View File

7
slsReceiverSoftware/src/slsReceiver.cpp Normal file → Executable file
View File

@@ -16,7 +16,7 @@
#include "slsReceiver.h"
#include "slsReceiverTCPIPInterface.h"
#include "sls_detector_exceptions.h"
#include "gitInfoReceiver.h"
#include "versionAPI.h"
#include "logger.h"
slsReceiver::slsReceiver(int argc, char *argv[]):
@@ -25,7 +25,6 @@ slsReceiver::slsReceiver(int argc, char *argv[]):
// options
std::map<std::string, std::string> configuration_map;
int tcpip_port_no = 1954;
int64_t tempval = 0;
//parse command line for config
static struct option long_options[] = {
@@ -58,9 +57,7 @@ slsReceiver::slsReceiver(int argc, char *argv[]):
break;
case 'v':
tempval = GITREV;
tempval = (tempval <<32) | GITDATE;
std::cout << "SLS Receiver " << GITBRANCH << " (0x" << std::hex << tempval << ")" << std::endl;
std::cout << "SLS Receiver " << GITBRANCH << " (0x" << std::hex << APIRECEIVER << ")" << std::endl;
throw sls::RuntimeError();
case 'h':

0
slsReceiverSoftware/src/slsReceiverImplementation.cpp Normal file → Executable file
View File

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp Normal file → Executable file
View File

@@ -7,7 +7,6 @@
#include "slsReceiverImplementation.h"
#include "MySocketTCP.h"
#include "ServerInterface.h"
#include "gitInfoReceiver.h"
#include "slsReceiverUsers.h"
#include "slsReceiver.h"
#include "versionAPI.h"
@@ -103,8 +102,7 @@ void slsReceiverTCPIPInterface::stop(){
int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
int64_t retval = GITDATE & 0xFFFFFF;
return retval;
return APIRECEIVER;
}

0
slsReceiverSoftware/src/slsReceiverUsers.cpp Normal file → Executable file
View File

0
slsReceiverSoftware/tests/CMakeLists.txt Normal file → Executable file
View File

0
slsReceiverSoftware/tests/test-GeneralData.cpp Normal file → Executable file
View File

7
slsReceiverSoftware/updateAPIVersion.sh
View File

@@ -1,7 +0,0 @@
SRCFILE=include/gitInfoReceiver.h
DSTFILE=include/versionAPI.h
SRCPATTERN=GITDATE
DSTPATTERN=APIRECEIVER
awk -v a="$SRCFILE" -v b="$DSTFILE" -v c="$SRCPATTERN" -v d="$DSTPATTERN" 'FNR==NR&&$2==c{x=$3} NR!=FNR{if($2==d){$3="0x"substr(x,5)}print > b}' $SRCFILE $DSTFILE

28
slsReceiverSoftware/updateGitVersion.sh
View File

@@ -1,28 +0,0 @@
MAINDIR=slsDetectorPackage
SPECDIR=slsReceiverSoftware
TMPFILE=include/gitInfoReceiverTmp.h
INCLFILE=include/gitInfoReceiver.h
WD=$PWD
#evaluate the variables
EVALFILE=../evalVersionVariables.sh
source $EVALFILE
#get modified date
#RDATE1='git log --pretty=format:"%ci" -1'
RDATE1="find . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|build|.git|updateGitVersion' | head -n 1"
RDATE=`eval $RDATE1`
NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then
echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
cd ..
./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE
cd $WD
fi