detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 21:26:50 +01:00
Code Issues Actions Packages Releases Activity

finxed subframe index in zmq process

Browse Source
This commit is contained in:
bergamaschi
2019-09-30 12:39:49 +02:00
parent 0afd096eae
commit dd2fe28ce6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
View File

@@ -269,7 +269,7 @@ int main(int argc, char *argv[]) {
//uint64_t isubframe=0; //uint64_t isubframe=0;
uint64_t insubframe=0; uint64_t insubframe=0;
double subnorm=1; double subnorm=1;
uint64_t f0=-1, nsubframes=0; uint64_t f0=-1, nsubframes=0, nnsubframe=0;
uint64_t fileindex = -1; uint64_t fileindex = -1;
string filename = ""; string filename = "";
@@ -380,7 +380,7 @@ int main(int argc, char *argv[]) {
#endif #endif
else { else {
if (subframes>0 && insubframe>0) { if (subframes>0 && insubframe>0) {
sprintf(ofname,"%s_sf%ld_%ld.tiff",fname,nsubframes,fileindex); sprintf(ofname,"%s_sf%ld_%ld.tiff",fname,nnsubframe,fileindex);
// mt->writeImage(ofname); // mt->writeImage(ofname);
doutf= new float[nnx*nny]; doutf= new float[nnx*nny];
if (subframes>0 && insubframe!=subframes && insubframe>0) if (subframes>0 && insubframe!=subframes && insubframe>0)
@@ -746,6 +746,7 @@ int main(int argc, char *argv[]) {
insubframe=0; insubframe=0;
subnorm=1; subnorm=1;
f0=0; f0=0;
nnsubframe=0;
if (doc.HasMember("subframes")) { if (doc.HasMember("subframes")) {
if (doc["subframes"].IsInt()) { if (doc["subframes"].IsInt()) {
subframes=doc["subframes"].GetInt(); subframes=doc["subframes"].GetInt();
@@ -826,14 +827,14 @@ int main(int argc, char *argv[]) {
if (dout[ix]<0) dout[ix]=0; if (dout[ix]<0) dout[ix]=0;
doutf[ix]=dout[ix]; doutf[ix]=dout[ix];
} }
sprintf(ofname,"%s_sf%ld_%ld.tiff",fname,nsubframes,fileindex); sprintf(ofname,"%s_sf%ld_%ld.tiff",fname,nnsubframe,fileindex);
cout << "Writing image to " << ofname << endl; cout << "Writing image to " << ofname << endl;
WriteToTiff(doutf,ofname ,nnx, nny); WriteToTiff(doutf,ofname ,nnx, nny);
nsubframes++; nsubframes++;
insubframe=0; insubframe=0;
nnsubframe++;
#ifndef DEVELOPER #ifndef DEVELOPER