solved conflicts from merge of version being used to binary

2025-04-24 23:30:03 +02:00 · 2017-12-06 19:07:06 +01:00 · 2017-12-06 19:07:06 +01:00 · 24c305ec59
commit 24c305ec59
parent 2f3dc8d109 bf9905ad2a
47 changed files with 292 additions and 356 deletions
--- a/genVersionHeader.sh
+++ b/genVersionHeader.sh
@ -21,5 +21,5 @@ echo "Updating $fout"
 #awk 'NR==FNR {if ($3=="Date:") {l[FNR]=$4; gsub("-","",l[FNR]);} else { if (match($0,"Rev")) {l[FNR]=$(NF);} else {l[FNR]="\""$(NF)"\"";};};next} {$0=$1" "$2" "l[FNR]}1' $fin $ftmp > $fout

 awk 'BEGIN {l[0]=0; "date +%Y%m%d" | getline l[1]; l[2]="\"/\""; l[3]="\"nobody\""; l[3]="\"nobody\""; l[4]="\"0000-0000-0000\"";} \
-NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";};next;} 
-{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];}}1' $fin $ftmp > $fout
+NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";} else if (match($0,"Branch")) {l[5]="\""$(NF)"\"";};next;} 
+{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];} else if (match($2,"BRANCH")) {$0=$1" "$2" "l[5];}}1' $fin $ftmp > $fout
--- a/slsDetectorGui/gitInfo.txt
+++ b/slsDetectorGui/gitInfo.txt
@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorGui 
 URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
-Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 
-Revision: 437 
+Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99 
+Revision: 439 
 Branch: 3.0.1 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 3185 
-Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/qTabSettings.cpp
+Last Changed Rev: 3187 
+Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/qTabSettings.cpp
--- a/slsDetectorGui/include/gitInfoGui.h
+++ b/slsDetectorGui/include/gitInfoGui.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
-//#define SVNREV 0x3185
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x3185
-#define SVNDATE 0x20171206
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3187
+#define GITDATE 0x20171206
+#define GITBRANCH "3.0.1"
--- a/slsDetectorGui/include/gitInfoGuiTmp.h
+++ b/slsDetectorGui/include/gitInfoGuiTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorGui/include/qDetectorMain.h
+++ b/slsDetectorGui/include/qDetectorMain.h
@ -55,10 +55,11 @@ public:
 	 *  This is mainly used to create detector object and all the tabs
 	 *   @param argc number of command line arguments for server options
 	 *   @param argv server options
-	 *   @param app the qapplication
+	 *   @param app the qapplication3
+	 *   @param ret OK or FAIL of constructor (from command line arguments)
 	 *   @param parent makes the parent window 0 by default
 	 *   */
-	qDetectorMain(int argc, char **argv, QApplication *app, QWidget *parent = 0);
+	qDetectorMain(int argc, char **argv, QApplication *app, int& ret, QWidget *parent = 0);

 	/**Destructor
 	 * */
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/slsDetectorGui/src/qDetectorMain.cpp
@ -36,7 +36,10 @@ int main (int argc, char **argv) {
  //	QApplication *theApp = new QApplication(argc, argv);
 	theApp->setStyle(new QPlastiqueStyle);//not default when desktop is windows
 	theApp->setWindowIcon(QIcon( ":/icons/images/mountain.png" ));
-	qDetectorMain *det=new qDetectorMain(argc, argv, theApp,0);
+	int ret = 1;
+	qDetectorMain *det=new qDetectorMain(argc, argv, theApp,ret,0);
+	if (ret == 1)
+		return EXIT_FAILURE;
 	det->show();
 	//theApp->connect( theApp, SIGNAL(lastWindowClosed()), theApp, SLOT(quit()));
 	return theApp->exec();
@ -46,75 +49,82 @@ int main (int argc, char **argv) {
 //-------------------------------------------------------------------------------------------------------------------------------------------------


-qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, QWidget *parent) :
+qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, int& ret, QWidget *parent) :
 				QMainWindow(parent), theApp(app),myDet(0),detID(0),myPlot(0),tabs(0),isDeveloper(0){
-//	bool found;
-	int c;
-	string configFName = "";
-	optind=1;
-	// Getting all the command line arguments
-	while(1) {
+
+	// options
+	string fname = "";
+	int64_t tempval = 0;
+
+	//parse command line for config
 	static struct option long_options[] = {
+			// These options set a flag.
+			//{"verbose", no_argument,       &verbose_flag, 1},
+			// These options don’t set a flag. We distinguish them by their indices.
 			{ "developer", no_argument,       0, 'd' },
 			{ "config",    required_argument, 0, 'f' },
 			{ "id",        required_argument, 0, 'i' },
-			{ "f",         required_argument, 0, 'f' },
+			{"version",    no_argument,  	  0, 'v'},
 			{ "help",      no_argument,       0, 'h' },
 			{ 0,           0,                 0,  0  }
 	};
-		c = getopt_long (argc, argv, "hdf:i:", long_options, NULL);
-		if (c == -1) break;
+
+
+	// getopt_long stores the option index here.
+	int option_index = 0;
+	int c = 0;
+
+	while ( c != -1 ){
+		c = getopt_long (argc, argv, "hvdf:i:", long_options, &option_index);
+
+		// Detect the end of the options.
+		if (c == -1)
+			break;

 		switch(c){
+
+		case 'f':
+			fname=string(optarg);
+#ifdef VERYVERBOSE
+			cout << long_options[option_index].name << " " << optarg << endl;
+#endif
+			break;
+
 		case 'd' :
 			isDeveloper = 1;
 			break;
-			case 'f' :
-				configFName=string(optarg);
-				break;
+
 		case 'i' :
 			detID=atoi(optarg);
 			break;
+
+		case 'v':
+			tempval = GITREV;
+			tempval = (tempval <<32) | GITDATE;
+			cout << "SLS Detector GUI " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
+			return;
+
 		case 'h':
 		default:
-				cout << endl;
-				cout << "\t" << argv[0] << " [ARGUMENT]..." << endl;
-				cout << endl;
-				cout << "Possible Arguments are:" << endl;
-				cout << "\t-d, --developer \t\t : \t Enables the developer tab" << endl;
-				cout << "\t-f, --f, --config fname\t\t : \t Loads config file fname" << endl;
-				cout << "\t-i, --id NUMBER \t\t : \t Sets the multi detector id to NUMBER (the default is 0). "
-					"Required only when more than one multi detector object is needed." << endl;
-				exit(-1);
+			string help_message = "\n"
+					+ string(argv[0]) + "\n"
+					+ "Usage: " + string(argv[0]) + " [arguments]\n"
+					+ "Possible arguments are:\n"
+					+ "\t-d, --developer           : Enables the developer tab\n"
+					+ "\t-f, --f, --config <fname> : Loads config from file\n"
+					+ "\t-i, --id <i>              : Sets the multi detector id to i. Default: 0. Required \n"
+					+ "\t                            only when more than one multi detector object is needed.\n\n";
+			cout << help_message << endl;
+			return;
+
 		}
 	}
-	if (optind < argc) {
-		cout << "invalid option, try --help" << endl;
-		exit(-1);
-	}
-/*
-	for(int iarg=1; iarg<argc; iarg++){
-		found = false;
-		if(!strcasecmp(argv[iarg],"--developer"))					{isDeveloper=1;found = true;}
-		if((!strcasecmp(argv[iarg],"--id")) && (iarg+1 < argc))		{detID=atoi(argv[iarg+1]);iarg++;found = true;}
-		if((!strcasecmp(argv[iarg],"--config")) && (iarg+1 < argc))	{configFName=string(argv[iarg+1]);iarg++;found = true;}
-		if((!strcasecmp(argv[iarg],"--f")) && (iarg+1 < argc))		{configFName=string(argv[iarg+1]);iarg++;found = true;}
-		if(!found){
-			cout << "Possible Arguments are:" << endl;
-			cout << "--developer \t\t : \t Enables the developer tab" << endl;
-			cout << "--f [fname]\t\t : \t Loads config file fname" << endl;
-			cout << "--config [fname]\t : \t Loads config file fname" << endl;
-			cout << "--id [i] \t\t : \t Sets the multi detector id to i (the default is 0). "
-				"Required only when more than one multi detector object is needed." << endl;
-			exit(-1);
-		}
-	}
-*/
+
 	setupUi(this);
-	SetUpDetector(configFName);
+	SetUpDetector(fname);
 	SetUpWidgetWindow();
 	Initialization();
-
+	ret = 0;
 }


@ -659,8 +669,8 @@ void qDetectorMain::ExecuteHelp(QAction *action){
 		cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl;
 #endif
 		char version[200];
-		long long unsigned int retval= SVNREV;
-		retval= (retval <<32) | SVNDATE;
+		long long unsigned int retval= GITREV;
+		retval= (retval <<32) | GITDATE;
 		sprintf(version,"%llx",retval);
 		string thisGUIVersion = string(version);

--- a/slsDetectorGui/updateGitVersion.sh
+++ b/slsDetectorGui/updateGitVersion.sh
@ -16,11 +16,11 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
 NEWDATE=${NEWDATE/#/0x}

 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
 #update INCLFILE if changes
-if [ "$OLDDATE" != "$NEWDATE" ]; then
+#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
+#fi
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer 
-URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repsitory UUID: 73bad32c4ab2c8cfb2687547f7da6f932b358c1a 
-Revision: 314 
+URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
+Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
+Repsitory UUID: 2f3dc8d109de8607f3217cf429619073dc9cc60e 
+Revision: 315 
 Branch: developer 
-Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 1609 
-Last Changed Date: 2017-10-23 11:45:17.000000002 +0200 ./Beb.c
+Last Changed Author: Dhanya_Maliakal 
+Last Changed Rev: 3397 
+Last Changed Date: 2017-12-06 19:05:42.000000002 +0100 ./FebRegisterDefs.h
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "73bad32c4ab2c8cfb2687547f7da6f932b358c1a"
-//#define SVNREV 0x1609
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Thattil"
-#define SVNREV 0x1609
-#define SVNDATE 0x20171023
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "2f3dc8d109de8607f3217cf429619073dc9cc60e"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3397
+#define GITDATE 0x20171206
+#define GITBRANCH "developer"
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@ -136,9 +136,9 @@ int64_t getDetectorId(enum idMode arg){
 	case SOFTWARE_FIRMWARE_API_VERSION:
 		return (int64_t)Beb_GetFirmwareSoftwareAPIVersion();
 	case DETECTOR_SOFTWARE_VERSION:
-		retval= SVNREV;
-		retval= (retval <<32) | SVNDATE;
-		//cprintf(BLUE,"git date:%x, git rev:%x\n",SVNDATE,SVNREV);
+		retval= GITREV;
+		retval= (retval <<32) | GITDATE;
+		//cprintf(BLUE,"git date:%x, git rev:%x\n",GITDATE,GITREV);
 		break;
 	default:
 		break;
--- a/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/gitInfo.txt
+++ b/slsDetectorSoftware/gitInfo.txt
@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware 
 URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
-Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 
-Revision: 1627 
+Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99 
+Revision: 1629 
 Branch: 3.0.1 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 3185 
-Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./slsDetector/slsDetectorUtils.h
+Last Changed Rev: 3187 
+Last Changed Date: 2017-12-06 19:00:50.000000002 +0100 ./threadFiles/ThreadPool.o
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "c5777e517c451226e3275e6948895baee21a1f94"
-//#define SVNREV 0x1585
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1585
-#define SVNDATE 0x20171109
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
+#define GITREPUUID "c5777e517c451226e3275e6948895baee21a1f94"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x1585
+#define GITDATE 0x20171109
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthardTmp.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthardTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@ -592,12 +592,9 @@ int get_id(int file_des) {
    retval=(retval <<32) | getFirmwareVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
    break;
-/*  case DETECTOR_FIRMWARE_SVN_VERSION:
-    retval=getFirmwareSVNVersion();
-    break;*/
  default:
    printf("Required unknown id %d \n", arg);
    ret=FAIL;
--- a/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh
@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer 
-URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repsitory UUID: 9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7 
-Revision: 16 
+URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
+Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
+Repsitory UUID: 2f3dc8d109de8607f3217cf429619073dc9cc60e 
+Revision: 17 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 1669 
-Last Changed Date: 2017-11-20 11:32:02.000000002 +0100 ./firmware_funcs.c
+Last Changed Rev: 3397 
+Last Changed Date: 2017-12-06 19:05:47.000000002 +0100 ./server_funcs.c
--- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
+++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7"
-//#define SVNREV 0x1669
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1669
-#define SVNDATE 0x20171120
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "2f3dc8d109de8607f3217cf429619073dc9cc60e"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3397
+#define GITDATE 0x20171206
+#define GITBRANCH "developer"
--- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoenchTmp.h
+++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoenchTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer
+++ b/slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer
--- a/slsDetectorSoftware/jctbDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/jctbDetectorServer/server_funcs.c
@ -706,12 +706,9 @@ int get_id(int file_des) {
    retval=(retval <<32) | getFirmwareVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
    break;
-/*  case DETECTOR_FIRMWARE_SVN_VERSION:
-    retval=getFirmwareSVNVersion();
-    break;*/
  default:
    printf("Required unknown id %d \n", arg);
    ret=FAIL;
--- a/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer 
-URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repsitory UUID: 4148ec5bbbaa20171fbda3e9c53e59a0d2d77db0 
-Revision: 93 
+URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
+Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
+Repsitory UUID: 2f3dc8d109de8607f3217cf429619073dc9cc60e 
+Revision: 103 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 1610 
-Last Changed Date: 2017-10-25 16:48:35.000000002 +0200 ./RegisterDefs.h
+Last Changed Rev: 3397 
+Last Changed Date: 2017-12-04 18:23:05.000000002 +0100 ./RegisterDefs.h
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "4148ec5bbbaa20171fbda3e9c53e59a0d2d77db0"
-//#define SVNREV 0x1610
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1610
-#define SVNDATE 0x20171025
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "2f3dc8d109de8607f3217cf429619073dc9cc60e"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3397
+#define GITDATE 0x20171204
+#define GITBRANCH "developer"
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrauTmp.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrauTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
@ -184,8 +184,8 @@ int64_t getDetectorId(enum idMode arg){
 	//case SOFTWARE_FIRMWARE_API_VERSION:
 	//return GetFirmwareSoftwareAPIVersion();
 	case DETECTOR_SOFTWARE_VERSION:
-		retval= SVNREV;
-		retval= (retval <<32) | SVNDATE;
+		retval= GITREV;
+		retval= (retval <<32) | GITDATE;
 		break;
 	default:
 		break;
--- a/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
+++ b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632"
-//#define SVNREV 0x1443
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1443
-#define SVNDATE 0x20170710
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
+#define GITREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x1443
+#define GITDATE 0x20170710
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoenchTmp.h
+++ b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoenchTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
@ -597,12 +597,9 @@ int get_id(int file_des) {
    retval=(retval <<32) | getFirmwareVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
    break;
-/*  case DETECTOR_FIRMWARE_SVN_VERSION:
-    retval=getFirmwareSVNVersion();
-    break;*/
  default:
    printf("Required unknown id %d \n", arg);
    ret=FAIL;
--- a/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
+++ b/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer"
-//#define SVNREPPATH ""
-#define SVNREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b"
-//#define SVNREV 0x334
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x334
-#define SVNDATE 0x20160812
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer"
+#define GITREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x334
+#define GITDATE 0x20160812
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/mythenDetectorServer/gitInfoMythenTmp.h
+++ b/slsDetectorSoftware/mythenDetectorServer/gitInfoMythenTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/mythenDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/mythenDetectorServer/server_funcs.c
@ -586,8 +586,8 @@ int get_id(int file_des) {
    retval=getMcsVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
 /*  sscanf(THIS_REVISION,"$Rev : %x",&rev1);
    rev=((int64_t)rev1);
    dat=THIS_SOFTWARE_VERSION;
--- a/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/slsDetector/gitInfoLib.h
+++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
-//#define SVNREPPATH ""
-#define SVNREPUUIDLIB "b498043ea612fa3148bf1d7ea2a39c46092addf8"
-//#define SVNREV 0x3185
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTHLIB "Dhanya_Maliakal"
-#define SVNREVLIB 0x3185
-#define SVNDATELIB 0x20171206
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3187
+#define GITDATE 0x20171206
+#define GITBRANCH "3.0.1"
--- a/slsDetectorSoftware/slsDetector/gitInfoLibTmp.h
+++ b/slsDetectorSoftware/slsDetector/gitInfoLibTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURLLIB "/root/"
-//#define SVNREPPATH ""
-#define SVNREPUUIDLIB "00000-00000-00000"
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTHLIB "nobody"
-#define SVNREVLIB 0
-#define SVNDATELIB 20000101
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@ -2244,8 +2244,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
 #endif
  if (mode==THIS_SOFTWARE_VERSION) {
    ret=OK;
-    retval=SVNREVLIB;
-    retval=(retval<<32) | SVNDATELIB;
+    retval=GITREV;
+    retval=(retval<<32) | GITDATE;
  } else if (mode==RECEIVER_VERSION) {
    if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
    	if (connectData() == OK){
--- a/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
+++ b/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
@ -1,4 +1,5 @@
 #include "multiSlsDetectorClient.h"
+#include "gitInfoLib.h"


 #include <stdlib.h>
@ -7,6 +8,15 @@ using namespace std;
 int main(int argc, char *argv[])
  
 {
+	for (int i = 1; i < argc; ++i ) {
+		if (!(strcmp (argv[i],"--version")) || !(strcmp (argv[i],"-v"))) {
+			int64_t tempval = GITREV;
+			tempval = (tempval <<32) | GITDATE;
+			cout << argv[0] << " " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
+			return 0;
+		}
+	}
+
 #ifdef PUT
  int action=slsDetectorDefs::PUT_ACTION;
 #endif
--- a/slsDetectorSoftware/updateGitVersion.sh
+++ b/slsDetectorSoftware/updateGitVersion.sh
@ -16,13 +16,13 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
 NEWDATE=${NEWDATE/#/0x}

 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
-if [ "$OLDDATE" != "$NEWDATE" ]; then
+#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
+#fi
--- a/slsReceiverSoftware/gitInfo.txt
+++ b/slsReceiverSoftware/gitInfo.txt
@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsReceiverSoftware 
 URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
-Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 
-Revision: 687 
+Repsitory UUID: 7436d6c8d3538cef443e0fa76bc01762fd6cc246 
+Revision: 688 
 Branch: 3.0.1 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 3185 
-Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/UDPStandardImplementation.cpp
+Last Changed Rev: 3186 
+Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/UDPStandardImplementation.cpp
--- a/slsReceiverSoftware/include/gitInfoReceiver.h
+++ b/slsReceiverSoftware/include/gitInfoReceiver.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
-//#define SVNREV 0x3185
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x3185
-#define SVNDATE 0x20171206
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "7436d6c8d3538cef443e0fa76bc01762fd6cc246"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3186
+#define GITDATE 0x20171206
+#define GITBRANCH "3.0.1"
--- a/slsReceiverSoftware/include/gitInfoReceiverTmp.h
+++ b/slsReceiverSoftware/include/gitInfoReceiverTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsReceiverSoftware/src/slsReceiver.cpp
+++ b/slsReceiverSoftware/src/slsReceiver.cpp
@ -12,7 +12,7 @@
 #include <getopt.h>

 #include "slsReceiver.h"
-//#include "UDPInterface.h"
+#include "gitInfoReceiver.h"

 using namespace std;

@ -28,6 +28,7 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
 	map<string, string> configuration_map;
 	int tcpip_port_no = 1954;
 	string fname = "";
+	int64_t tempval = 0;

 	//parse command line for config
 	static struct option long_options[] = {
@ -36,16 +37,18 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
 			// These options don’t set a flag. We distinguish them by their indices.
 			{"config",     	required_argument,  0, 'f'},
 			{"rx_tcpport",  required_argument,  0, 't'},
+			{"version",  	no_argument,  		0, 'v'},
 			{"help",  		no_argument,       	0, 'h'},
 			{0, 			0, 					0, 	0}
 	};
+
+
 	// getopt_long stores the option index here.
 	int option_index = 0;
 	int c = 0;
-	optind = 1;

 	while ( c != -1 ){
-		c = getopt_long (argc, argv, "hf:t:", long_options, &option_index);
+		c = getopt_long (argc, argv, "hvf:t:", long_options, &option_index);

 		// Detect the end of the options.
 		if (c == -1)
@ -64,12 +67,23 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
 			sscanf(optarg, "%d", &tcpip_port_no);
 			break;

+		case 'v':
+			tempval = GITREV;
+			tempval = (tempval <<32) | GITDATE;
+			cout << "SLS Receiver " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
+			success = FAIL; // to exit
+			break;
+
 		case 'h':
-			string help_message = "\nSLS Receiver Server\n\n";
-			help_message += "Usage: slsReceiver [arguments]\nPossible arguments are:\n";
-			help_message += "\t-f, --config:     Configuration filename\n";
-			help_message += "\t-t, --rx_tcpport: TCP Port with the client. Default: 1954.\n"
-					        "\t                  Required for multiple receivers\n\n";
+		default:
+			string help_message = "\n"
+					+ string(argv[0]) + "\n"
+					+ "Usage: " + string(argv[0]) + " [arguments]\n"
+					+ "Possible arguments are:\n"
+					+ "\t-f, --config <fname>    : Loads config from file\n"
+					+ "\t-t, --rx_tcpport <port> : TCP Communication Port with client. \n"
+					+ "\t                          Default: 1954. Required for multiple \n"
+					+ "\t                          receivers\n\n";

 			FILE_LOG(logINFO) << help_message << endl;
 			break;
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@ -152,8 +152,8 @@ void slsReceiverTCPIPInterface::stop(){


 int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
-	int64_t retval = SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	int64_t retval = GITREV;
+	retval= (retval <<32) | GITDATE;
 	return retval;
 }

--- a/slsReceiverSoftware/updateGitVersion.sh
+++ b/slsReceiverSoftware/updateGitVersion.sh
@ -16,7 +16,7 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
 NEWDATE=${NEWDATE/#/0x}

 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')

 #update INCLFILE if changes
 if [ "$OLDDATE" != "$NEWDATE" ]; then