detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 07:47:12 +02:00
Code Issues Actions Packages Releases Activity

fixed mistake in moench03 data stucture when calculating xmap, ymap

Browse Source
This commit is contained in:
bergamaschi
2020-04-17 17:23:24 +02:00
parent c55d19dbfe
commit 5710dda12a
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/moench03_T1_lab.config
View File

@ -417,17 +417,23 @@ patwaittime2 0
####mcp2011 ####mcp2011
0:rx_tcpport 1954 0:rx_tcpport 1954
0:rx_udpip 10.1.2.117
0:detectorip 10.1.2.19
0:rx_udpport 32411 0:rx_udpport 32411
####gui listening to ####gui listening to
zmqip 129.129.202.86
zmqport 50001 zmqport 50001
####data streaming out of ####data streaming out of
rx_zmqip 10.1.2.117
rx_zmqport 50003 rx_zmqport 50003
0:rx_hostname mpc2608 #zmqip 129.129.202.86
#0:rx_udpip 10.1.2.117
#0:detectorip 10.1.2.19
#rx_zmqip 10.1.2.117
#0:rx_hostname mpc2608
zmqip 129.129.202.136
0:rx_udpip 10.1.1.102
0:detectorip 10.1.1.19
rx_zmqip 10.1.1.102
0:rx_hostname mpc2011
####pcmoench01 ####pcmoench01
#0:rx_tcpport 1977 #0:rx_tcpport 1977

4
slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h
View File

@ -74,8 +74,8 @@ class moench03T1ZmqDataNew : public slsDetectorData<uint16_t> {
int ii=0; int ii=0;
for (i=0; i< dataSize; i++) { for (i=0; i< dataSize/2; i++) {
if (i<offset) { if (i<offset/2) {
//header! */ //header! */
xmap[i]=-1; xmap[i]=-1;
ymap[i]=-1; ymap[i]=-1;

16
slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp
View File

@ -304,7 +304,7 @@ int main(int argc, char *argv[]) {
mt->nextThread(); mt->nextThread();
mt->popFree(buff); mt->popFree(buff);
ifr++; ifr++;
if (ifr%100==0) if (ifr%10000==0)
cout << ifr << " " << ff << " " << np << endl; cout << ifr << " " << ff << " " << np << endl;
} else } else
cout << ifr << " " << ff << " " << np << endl; cout << ifr << " " << ff << " " << np << endl;
@ -378,13 +378,13 @@ int main(int argc, char *argv[]) {
if ((dir = opendir (indir)) != NULL) { if ((dir = opendir (indir)) != NULL) {
/* print all the files and directories within directory */ /* print all the files and directories within directory */
while ((ent = readdir (dir)) != NULL) { while ((ent = readdir (dir)) != NULL) {
printf ("----------- %s\n", ent->d_name); // printf ("----------- %s\n", ent->d_name);
// printf ("************** %s", ent->d_name); // printf ("************** %s", ent->d_name);
// cout << string(ent->d_name).find(fformat) << endl; // cout << string(ent->d_name).find(fformat) << endl;
if (string(ent->d_name).find(string(fformat)+"_d0_f0")==0) { if (string(ent->d_name).find(string(fformat)+"_d0_f0")==0) {
printf ("+++++++++++++++ %s\n", ent->d_name); // printf ("+++++++++++++++ %s\n", ent->d_name);
if (string(ent->d_name).find(ext)!= string::npos) { if (string(ent->d_name).find(ext)!= string::npos) {
printf ("**************8 %s\n", ent->d_name); //printf ("**************8 %s\n", ent->d_name);
@ -419,7 +419,7 @@ int main(int argc, char *argv[]) {
ifr++; ifr++;
if (ifr%100==0) cout << ifr << " " << ff << endl; if (ifr%10000==0) cout << ifr << " " << ff << endl;
if (nframes>0) { if (nframes>0) {
if (ifr%nframes==0) { if (ifr%nframes==0) {
//The name has an additional "_fXXXXX" at the end, where "XXXXX" is the initial frame number of the image (0,1000,2000...) //The name has an additional "_fXXXXX" at the end, where "XXXXX" is the initial frame number of the image (0,1000,2000...)
@ -432,11 +432,11 @@ int main(int argc, char *argv[]) {
ifile++; ifile++;
} }
} }
} else }// else
cout << ifr << " " << ff << " " << np << endl; // cout << ifr << " " << ff << " " << np << endl;
ff=-1; ff=-1;
} }
cout << "--" << endl; //cout << "--" << endl;
filebin.close(); filebin.close();
} else } else
cout << "Could not open "<< fname << " for reading " << endl; cout << "Could not open "<< fname << " for reading " << endl;