diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 4ded3c165..18233bfd2 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8 -Revision: 491 +Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f +Revision: 492 Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3727 -Last Changed Date: 2018-03-14 15:24:03.000000002 +0100 ./src/qTabMeasurement.cpp +Last Changed Rev: 3746 +Last Changed Date: 2018-03-26 17:27:44.000000002 +0200 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 997240797..9dac684be 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8" +#define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3727 -#define GITDATE 0x20180314 +#define GITREV 0x3746 +#define GITDATE 0x20180326 #define GITBRANCH "developer" diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 83be041bf..763b32afe 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -99,8 +99,7 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, int& ret, break; case 'v': - tempval = GITREV; - tempval = (tempval <<32) | GITDATE; + tempval = GITDATE; cout << "SLS Detector GUI " << GITBRANCH << " (0x" << hex << tempval << ")" << endl; return; @@ -666,8 +665,7 @@ 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= GITREV; - retval= (retval <<32) | GITDATE; + long long unsigned int retval= GITDATE; sprintf(version,"%llx",retval); string thisGUIVersion = string(version); diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index df6de841b..1795ad4f8 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 5340b8ef24e00cbc04e9827adc55e3adc9046a24 -Revision: 1851 +Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f +Revision: 1852 Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3745 -Last Changed Date: 2018-03-26 18:09:40.000000002 +0200 ./threadFiles/ThreadPool.o +Last Changed Rev: 3746 +Last Changed Date: 2018-03-27 10:47:02.000000002 +0200 ./slsDetector/slsDetector.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index c21027e41..40b07cb7e 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "5340b8ef24e00cbc04e9827adc55e3adc9046a24" +#define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3745 -#define GITDATE 0x20180326 +#define GITREV 0x3746 +#define GITDATE 0x20180327 #define GITBRANCH "developer" diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index d2fe36d9c..1b4cdfcfd 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -2246,8 +2246,7 @@ int64_t slsDetector::getId( idMode mode, int imod){ #endif if (mode==THIS_SOFTWARE_VERSION) { ret=OK; - retval=GITREV; - retval=(retval<<32) | GITDATE; + retval=GITDATE; } else if (mode==RECEIVER_VERSION) { if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) { if (connectData() == OK){ diff --git a/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp b/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp index e2fefcb21..d0525f9a6 100644 --- a/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp +++ b/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp @@ -10,8 +10,7 @@ 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; + int64_t tempval = GITDATE; cout << argv[0] << " " << GITBRANCH << " (0x" << hex << tempval << ")" << endl; return 0; } diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index abab2e22b..f9de8877d 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8 -Revision: 764 +Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f +Revision: 767 Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3727 -Last Changed Date: 2018-03-13 10:29:32.000000002 +0100 ./src/slsReceiverTCPIPInterface.cpp +Last Changed Rev: 3746 +Last Changed Date: 2018-03-27 10:43:44.000000002 +0200 ./src/slsReceiverTCPIPInterface.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 0d471e36c..40b07cb7e 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8" +#define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3727 -#define GITDATE 0x20180313 +#define GITREV 0x3746 +#define GITDATE 0x20180327 #define GITBRANCH "developer" diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index e8a703043..ae24c75f4 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -153,8 +153,7 @@ void slsReceiverTCPIPInterface::stop(){ int64_t slsReceiverTCPIPInterface::getReceiverVersion(){ - int64_t retval = GITREV; - retval= (retval <<32) | GITDATE; + int64_t retval = GITDATE; return retval; }