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

fixed process make file

Browse Source
This commit is contained in:
bergamaschi
2019-11-07 13:28:03 +01:00
parent 142b184e62
commit 02a36a148f
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorCalibration/analogDetector.h
View File

@ -675,7 +675,7 @@ template <class dataType> class analogDetector {
delete [] gm;
return 1;
}
return NULL;
return 0;
}
/**
@ -700,7 +700,7 @@ template <class dataType> class analogDetector {
delete [] gm;
return 1;
}
return NULL;
return 0;
}

19
slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp
View File

@ -59,7 +59,7 @@ int main(int argc, char *argv[]) {
int csize=3;
int nx=400, ny=400;
int save=1;
int nsigma=5;
int nsigma=1;
int nped=1000;
int ndark=100;
int ok;
@ -201,14 +201,15 @@ int main(int argc, char *argv[]) {
// cout << ifr << " " << ff << " " << ix << " " << iy << " " << decoder->getChannel(buff, ix, iy) << endl ;
// }
// }
mt->pushData(buff);
// // //pop
mt->nextThread();
// // // cout << " " << (void*)buff;
mt->popFree(buff);
ifr++;
if (ifr%10000==0) cout << ifr << " " << ff << endl;
if (np==40) {
mt->pushData(buff);
// // //pop
mt->nextThread();
// // // cout << " " << (void*)buff;
mt->popFree(buff);
ifr++;
if (ifr%10000==0) cout << ifr << " " << ff << endl;
}
ff=-1;
}
cout << "--" << endl;

4
slsDetectorCalibration/single_photon_hit.h
View File

@ -212,7 +212,7 @@ class single_photon_hit {
void print() {
// int ix, iy;
printf("*** %d %d %d\n",iframe, x, y);
for (int iy=0; iy<dy; iy++) {
for (int ix=0; ix<dx; ix++) {
printf("%d \t",data[ix+iy*dx]);
@ -220,7 +220,7 @@ class single_photon_hit {
}
printf("\n");
}
printf("***\n");
}

1
slsDetectorSoftware/slsDetectorClient/CMakeLists.txt
View File

@ -65,7 +65,6 @@ target_link_libraries(sls_detector_process
)
set_target_properties(sls_detector_process PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
COMPILE_DEFINITIONS READOUT=1
COMPILE_DEFINITIONS PROCESS=1
)

12
slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
View File

@ -19,27 +19,27 @@ int main(int argc, char *argv[])
return 0;
}
}
int action=slsDetectorDefs::HELP_ACTION;
#ifdef PUT
int action=slsDetectorDefs::PUT_ACTION;
action=slsDetectorDefs::PUT_ACTION;
#endif
#ifdef GET
int action=slsDetectorDefs::GET_ACTION;
action=slsDetectorDefs::GET_ACTION;
#endif
#ifdef READOUT
int action=slsDetectorDefs::READOUT_ACTION;
action=slsDetectorDefs::READOUT_ACTION;
#endif
#ifdef PROCESS
int action=slsDetectorDefs::PROCESS_ACTION;
action=slsDetectorDefs::PROCESS_ACTION;
#endif
#ifdef HELP
int action=slsDetectorDefs::HELP_ACTION;
action=slsDetectorDefs::HELP_ACTION;
#endif
multiSlsDetectorClient *cl;