From 9d489dc9624774c55c7805c0ff625f2174b5711b Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 20 Mar 2019 14:39:24 +0100 Subject: [PATCH] servers, gitinfo script updated; ctb/moench server: delay uses sync clock, --- .../ctbDetectorServer/gitInfo.txt | 10 +++++----- .../ctbDetectorServer/gitInfoCtb.h | 8 ++++---- .../ctbDetectorServer/slsDetectorFunctionList.c | 16 ++++------------ .../ctbDetectorServer/updateGitVersion.sh | 2 +- .../eigerDetectorServer/updateGitVersion.sh | 2 +- .../gotthardDetectorServer/updateGitVersion.sh | 2 +- .../jungfrauDetectorServer/updateGitVersion.sh | 2 +- .../slsDetectorFunctionList.c | 17 +++++------------ .../moenchDetectorServer/updateGitVersion.sh | 2 +- .../slsDetectorServer/slsDetectorServer_funcs.c | 9 +++++++-- 10 files changed, 30 insertions(+), 40 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt index 994abf191..ce0afee43 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfo.txt +++ b/slsDetectorServers/ctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 38bf540c1a6e7c1f37f0ad5c6598a4cb3184e314 -Revision: 40 +Repsitory UUID: 44f0dfc3c00d0dd70a683289dde9a2fcbf1e0449 +Revision: 42 Branch: refactor -Last Changed Author: Erik_Frojdh -Last Changed Rev: 4442 -Last Changed Date: 2019-03-11 14:57:56.000000002 +0100 ./RegisterDefs.h +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 4450 +Last Changed Date: 2019-03-20 12:35:24.000000002 +0100 ./slsDetectorFunctionList.c diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h index a8ea383aa..f191daad6 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h +++ b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "38bf540c1a6e7c1f37f0ad5c6598a4cb3184e314" -#define GITAUTH "Erik_Frojdh" -#define GITREV 0x4442 -#define GITDATE 0x20190311 +#define GITREPUUID "44f0dfc3c00d0dd70a683289dde9a2fcbf1e0449" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x4450 +#define GITDATE 0x20190320 #define GITBRANCH "refactor" diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index ccd279611..bec93f899 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -933,9 +933,9 @@ int64_t setTimer(enum timerIndex ind, int64_t val) { case DELAY_AFTER_TRIGGER: if(val >= 0){ FILE_LOG(logINFO, ("Setting delay: %lldns\n", (long long int)val)); - val *= (1E-3 * clkDivider[ADC_CLK]); + val *= (1E-3 * clkDivider[SYNC_CLK]); } - retval = set64BitReg(val, DELAY_LSB_REG, DELAY_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); + retval = set64BitReg(val, DELAY_LSB_REG, DELAY_MSB_REG) / (1E-3 * clkDivider[SYNC_CLK]); FILE_LOG(logINFO, ("\tGetting delay: %lldns\n", (long long int)retval)); break; @@ -989,7 +989,7 @@ int64_t getTimeLeft(enum timerIndex ind){ break; case DELAY_AFTER_TRIGGER: - retval = get64BitReg(DELAY_LEFT_LSB_REG, DELAY_LEFT_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); + retval = get64BitReg(DELAY_LEFT_LSB_REG, DELAY_LEFT_MSB_REG) / (1E-3 * clkDivider[SYNC_CLK]); FILE_LOG(logINFO, ("Getting delay left: %lldns\n", (long long int)retval)); break; @@ -1028,6 +1028,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) { return OK; switch(ind) { case FRAME_PERIOD: + case DELAY_AFTER_TRIGGER: // convert to freq val *= (1E-3 * clkDivider[SYNC_CLK]); // convert back to timer @@ -1036,15 +1037,6 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) { return FAIL; } break; - case DELAY_AFTER_TRIGGER: - // convert to freq - val *= (1E-3 * clkDivider[ADC_CLK]); - // convert back to timer - val = (val) / (1E-3 * clkDivider[ADC_CLK]); - if (val != retval) { - return FAIL; - } - break; case ACQUISITION_TIME: // convert to freq val *= (1E-3 * clkDivider[RUN_CLK]); diff --git a/slsDetectorServers/ctbDetectorServer/updateGitVersion.sh b/slsDetectorServers/ctbDetectorServer/updateGitVersion.sh index 6f43c0150..0ffe552c9 100755 --- a/slsDetectorServers/ctbDetectorServer/updateGitVersion.sh +++ b/slsDetectorServers/ctbDetectorServer/updateGitVersion.sh @@ -12,7 +12,7 @@ source $EVALFILE #get modified date #RDATE1='git log --pretty=format:"%ci" -1' -RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|bin|.git|updateGitVersion|.o' | head -n 1" +RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v '(\.)o' | egrep -v '(gitInfo).*' | egrep -v bin | egrep -v 'updateGit' | head -n 1" RDATE=`eval $RDATE1` NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') NEWDATE=${NEWDATE/#/0x} diff --git a/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh b/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh index 05a336696..8f57ac890 100755 --- a/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh +++ b/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh @@ -11,7 +11,7 @@ source $EVALFILE #get modified date #RDATE1='git log --pretty=format:"%ci" -1' -RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|bin|.git|updateGitVersion|.o' | head -n 1" +RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v '(\.)o' | egrep -v '(gitInfo).*' | egrep -v bin | egrep -v 'updateGit' | head -n 1" RDATE=`eval $RDATE1` NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') NEWDATE=${NEWDATE/#/0x} diff --git a/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh b/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh index 367cf06c9..c6af679a6 100755 --- a/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh +++ b/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh @@ -11,7 +11,7 @@ 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|.git|updateGitVersion|.o' | head -n 1" +RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v '(\.)o' | egrep -v '(gitInfo).*' | egrep -v bin | egrep -v 'updateGit' | head -n 1" RDATE=`eval $RDATE1` NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') NEWDATE=${NEWDATE/#/0x} diff --git a/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh b/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh index 3994778d6..ce85b1e0c 100755 --- a/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh +++ b/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh @@ -12,7 +12,7 @@ source $EVALFILE #get modified date #RDATE1='git log --pretty=format:"%ci" -1' -RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|bin|.git|updateGitVersion|.o' | head -n 1" +RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v '(\.)o' | egrep -v '(gitInfo).*' | egrep -v bin | egrep -v 'updateGit' | head -n 1" RDATE=`eval $RDATE1` NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') NEWDATE=${NEWDATE/#/0x} diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index 1e80cb4ce..e7cc8e469 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -854,9 +854,9 @@ int64_t setTimer(enum timerIndex ind, int64_t val) { case DELAY_AFTER_TRIGGER: if(val >= 0){ FILE_LOG(logINFO, ("Setting delay: %lldns\n", (long long int)val)); - val *= (1E-3 * clkDivider[ADC_CLK]); + val *= (1E-3 * clkDivider[SYNC_CLK]); } - retval = set64BitReg(val, DELAY_LSB_REG, DELAY_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); + retval = set64BitReg(val, DELAY_LSB_REG, DELAY_MSB_REG) / (1E-3 * clkDivider[SYNC_CLK]); FILE_LOG(logINFO, ("\tGetting delay: %lldns\n", (long long int)retval)); break; @@ -910,7 +910,7 @@ int64_t getTimeLeft(enum timerIndex ind){ break; case DELAY_AFTER_TRIGGER: - retval = get64BitReg(DELAY_LEFT_LSB_REG, DELAY_LEFT_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); + retval = get64BitReg(DELAY_LEFT_LSB_REG, DELAY_LEFT_MSB_REG) / (1E-3 * clkDivider[SYNC_CLK]); FILE_LOG(logINFO, ("Getting delay left: %lldns\n", (long long int)retval)); break; @@ -949,6 +949,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) { return OK; switch(ind) { case FRAME_PERIOD: + case DELAY_AFTER_TRIGGER: // convert to freq val *= (1E-3 * clkDivider[SYNC_CLK]); // convert back to timer @@ -957,15 +958,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) { return FAIL; } break; - case DELAY_AFTER_TRIGGER: - // convert to freq - val *= (1E-3 * clkDivider[ADC_CLK]); - // convert back to timer - val = (val) / (1E-3 * clkDivider[ADC_CLK]); - if (val != retval) { - return FAIL; - } - break; + case ACQUISITION_TIME: // convert to freq val *= (1E-3 * clkDivider[RUN_CLK]); diff --git a/slsDetectorServers/moenchDetectorServer/updateGitVersion.sh b/slsDetectorServers/moenchDetectorServer/updateGitVersion.sh index 00121d706..b5868c72c 100755 --- a/slsDetectorServers/moenchDetectorServer/updateGitVersion.sh +++ b/slsDetectorServers/moenchDetectorServer/updateGitVersion.sh @@ -12,7 +12,7 @@ source $EVALFILE #get modified date #RDATE1='git log --pretty=format:"%ci" -1' -RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|bin|.git|updateGitVersion|.o' | head -n 1" +RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v '(\.)o' | egrep -v '(gitInfo).*' | egrep -v bin | egrep -v 'updateGit' | head -n 1" RDATE=`eval $RDATE1` NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') NEWDATE=${NEWDATE/#/0x} diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c index 9f19ffaed..d675286db 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c @@ -2610,20 +2610,25 @@ int set_pattern(int file_des) { strcpy(tempName, "Pattern (I/O Control Register)"); FILE_LOG(logDEBUG1, (" Setting %s, word to 0x%llx\n", tempName, (long long int) word)); retval64 = writePatternIOControl(word); + FILE_LOG(logDEBUG1, (" %s: 0x%llx\n", tempName, (long long int)retval64)); + validate64(word, retval64, tempName, HEX); break; case -2: strcpy(tempName, "Pattern (Clock Control Register)"); FILE_LOG(logDEBUG1, (" Setting %s, word to 0x%llx\n", tempName, (long long int) word)); retval64 = writePatternClkControl(word); + FILE_LOG(logDEBUG1, (" %s: 0x%llx\n", tempName, (long long int)retval64)); + validate64(word, retval64, tempName, HEX); break; default: sprintf(tempName, "Pattern (Word, addr:0x%x)", addr); FILE_LOG(logDEBUG1, (" Setting %s, word to 0x%llx\n", tempName, (long long int) word)); retval64 = writePatternWord(addr, word); + FILE_LOG(logDEBUG1, (" %s: 0x%llx\n", tempName, (long long int)retval64)); + // do not validate as it can be different due to masking + //validate64(word, retval64, tempName, HEX); break; } - FILE_LOG(logDEBUG1, (" %s: 0x%llx\n", tempName, (long long int)retval64)); - validate64(word, retval64, tempName, HEX); } } #endif