detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 01:00:02 +02:00
Code Issues Actions Packages Releases Activity

servers, gitinfo script updated; ctb/moench server: delay uses sync clock,

Browse Source
This commit is contained in:
maliakal_d 2019-03-20 14:39:24 +01:00
parent 44f0dfc3c0
commit 9d489dc962
10 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@ -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

8
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@ -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"

16
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -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]);

2
slsDetectorServers/ctbDetectorServer/updateGitVersion.sh
View File

@ -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}

2
slsDetectorServers/eigerDetectorServer/updateGitVersion.sh
View File

@ -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}

2
slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh
View File

@ -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}

2
slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh
View File

@ -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}

17
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -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]);

2
slsDetectorServers/moenchDetectorServer/updateGitVersion.sh
View File

@ -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}

9
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -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