diff --git a/examples/moench03_T1_lab.config b/examples/moench03_T1_lab.config index f26397b8f..1e5b81743 100644 --- a/examples/moench03_T1_lab.config +++ b/examples/moench03_T1_lab.config @@ -417,17 +417,23 @@ patwaittime2 0 ####mcp2011 0:rx_tcpport 1954 -0:rx_udpip 10.1.2.117 -0:detectorip 10.1.2.19 0:rx_udpport 32411 ####gui listening to -zmqip 129.129.202.86 zmqport 50001 ####data streaming out of -rx_zmqip 10.1.2.117 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 #0:rx_tcpport 1977 diff --git a/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h b/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h index 9ee8e98bd..268ec027a 100644 --- a/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h +++ b/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h @@ -74,8 +74,8 @@ class moench03T1ZmqDataNew : public slsDetectorData { int ii=0; - for (i=0; i< dataSize; i++) { - if (inextThread(); mt->popFree(buff); ifr++; - if (ifr%100==0) + if (ifr%10000==0) cout << ifr << " " << ff << " " << np << endl; } else cout << ifr << " " << ff << " " << np << endl; @@ -378,13 +378,13 @@ int main(int argc, char *argv[]) { if ((dir = opendir (indir)) != NULL) { /* print all the files and directories within directory */ while ((ent = readdir (dir)) != NULL) { - printf ("----------- %s\n", ent->d_name); + // printf ("----------- %s\n", ent->d_name); // printf ("************** %s", ent->d_name); // cout << string(ent->d_name).find(fformat) << endl; 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) { - 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++; - if (ifr%100==0) cout << ifr << " " << ff << endl; + if (ifr%10000==0) cout << ifr << " " << ff << endl; if (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...) @@ -432,11 +432,11 @@ int main(int argc, char *argv[]) { ifile++; } } - } else - cout << ifr << " " << ff << " " << np << endl; + }// else + // cout << ifr << " " << ff << " " << np << endl; ff=-1; } - cout << "--" << endl; + //cout << "--" << endl; filebin.close(); } else cout << "Could not open "<< fname << " for reading " << endl;