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

bug solved in angular data merging

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@716 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2014-01-17 08:25:42 +00:00
parent 15e1ac8750
commit 28ad4a1f8c
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c
View File

@ -2198,7 +2198,7 @@ int testExtPulseMux(int imod, int ow) {
if (v!=vright) { if (v!=vright) {
result++; result++;
chipr++; chipr++;
printf("Counter test mux %d mode: channel %d chip %d read %d instead of %d\n",ow, ichan+(ichip+imod*NCHIP)*NCHAN, ichip, v, vright); // printf("Counter test mux %d mode: channel %d chip %d read %d instead of %d\n",ow, ichan+(ichip+imod*NCHIP)*NCHAN, ichip, v, vright);
//break; //break;
} }
//printf("\n"); //printf("\n");
@ -2272,7 +2272,7 @@ int testDataInOutMux(int imod, int ow, int num) {
if (v!=vright) { if (v!=vright) {
result++; result++;
chipr++; chipr++;
printf("DataInOut test mux %d mode: channel %d chip %d read %d instead of %d\n",ow, ichan+(ichip+imod*NCHIP)*NCHAN, ichip, v, vright); printf("DataInOut test mux %d mode: channel %d chip %d read %08x instead of %08x\n",ow, ichan+(ichip+imod*NCHIP)*NCHAN, ichip, v, vright);
//break; //break;
} }
//printf("\n"); //printf("\n");
@ -2363,13 +2363,13 @@ int testOutMux(int imod) {
v=val & 1<< j; v=val & 1<< j;
if (pat & (1<<(i*dist))) { if (pat & (1<<(i*dist))) {
if (v==0) { if (v==0) {
printf("Outmux: module %d chip %i bit %d read %d instead of %ld\n",k, j,(i*dist), v,pat & (1<<(i*dist) )); // printf("Outmux: module %d chip %i bit %d read %d instead of %ld\n",k, j,(i*dist), v,pat & (1<<(i*dist) ));
result++; result++;
} }
// should be 1 // should be 1
} else { } else {
if (v) { if (v) {
printf("Outmux: module %d chip %i bit %d read %d instead of %ld\n",k, j,(i*dist), v,pat & (1<<(i*dist) )); // printf("Outmux: module %d chip %i bit %d read %d instead of %ld\n",k, j,(i*dist), v,pat & (1<<(i*dist) ));
result++; result++;
} }
} }
@ -2564,13 +2564,13 @@ int testFpgaMux(int imod) {
v=val & 1<< j; v=val & 1<< j;
if (pat & (1<<(i*dist))) { if (pat & (1<<(i*dist))) {
if (v==0) { if (v==0) {
printf("Fpgamux: module %d chip %i bit %d read %d instead of %ld\n",k,j,(i*dist), v,pat & (1<<(i*dist) )); // printf("Fpgamux: module %d chip %i bit %d read %d instead of %ld\n",k,j,(i*dist), v,pat & (1<<(i*dist) ));
result++; result++;
} }
// should be 1 // should be 1
} else { } else {
if (v) { if (v) {
printf("Fpgamux: module %d chip %i bit %d read %d instead of %ld\n",k,j,(i*dist), v,pat & (1<<(i*dist) )); // printf("Fpgamux: module %d chip %i bit %d read %d instead of %ld\n",k,j,(i*dist), v,pat & (1<<(i*dist) ));
result++; result++;
} }
} }

BIN
slsDetectorSoftware/mythenDetectorServer/mythenDetectorServer
View File

Binary file not shown.

6
slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.cpp
View File

@ -330,7 +330,6 @@ int angularConversionStatic::finalizeMerging(double *mp, double *mv, double *me,
int np=0; int np=0;
for (int ibin=0; ibin<nb; ibin++) { for (int ibin=0; ibin<nb; ibin++) {
if (mm[ibin]>0) { if (mm[ibin]>0) {
#ifdef VERBOSE #ifdef VERBOSE
cout << "finalize " << ibin << " "<< mm[ibin] << " " << mp[ibin]<< " " << mv[ibin] << " " << me[ibin] << endl; cout << "finalize " << ibin << " "<< mm[ibin] << " " << mp[ibin]<< " " << mv[ibin] << " " << me[ibin] << endl;
#endif #endif
@ -452,9 +451,10 @@ int angularConversionStatic::addPointToMerging(double p1, double v1, double e1,
// #ifdef VERBOSE // #ifdef VERBOSE
// cout << "add " << ibin << " "<< mm[ibin] << " " << mp[ibin]<< mv[ibin] << me[ibin] << endl; // cout << "add " << ibin << " "<< mm[ibin] << " " << mp[ibin]<< mv[ibin] << me[ibin] << endl;
// #endif // #endif
} else } else {
cout << "Bin out of range! " << ibin << endl;
return slsDetectorDefs::FAIL; return slsDetectorDefs::FAIL;
}
return slsDetectorDefs::OK; return slsDetectorDefs::OK;

8
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -233,9 +233,13 @@ void postProcessing::doProcessing(double *lfdata, int delflag, string fname) {
#endif #endif
addFrame(lfdata,currentPosition, currentI0, t, fname, 0); addFrame(lfdata,currentPosition, currentI0, t, fname, 0);
cout << "++++++++++++++++++++" << GetCurrentPositionIndex() << " " << npos << " " << positionFinished() << " " << dataQueueSize() << endl;
if ((GetCurrentPositionIndex()>=npos && dataQueueSize()) || npos<2) {
//&&
if ((GetCurrentPositionIndex()>=npos && positionFinished() && dataQueueSize()) || npos<2) { while(positionFinished()==0) {
;
}
#ifdef VERBOSE #ifdef VERBOSE
cout << "finalize dataset" << endl; cout << "finalize dataset" << endl;
#endif #endif