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

fixed callback args and return types, removed set online

Browse Source
This commit is contained in:
bergamaschi
2019-08-09 12:57:29 +02:00
parent e7af4d7518
commit 31d2250cba
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ctbGui/ctbAcquisition.cpp
View File

@ -773,9 +773,10 @@ void ctbAcquisition::setCanvas(TCanvas* c) {
myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)0x%x)->canvasClicked()",this)); myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)0x%x)->canvasClicked()",this));
// myCanvas->AddExec("ex","canvasClicked()"); // myCanvas->AddExec("ex","canvasClicked()");
} }
int ctbAcquisition::dataCallback(detectorData *data, int index, int dum, void* pArgs) { void ctbAcquisition::dataCallback(detectorData *data, long unsigned int index, unsigned int dum, void* pArgs) {
return ((ctbAcquisition*)pArgs)->plotData(data,index); // return
((ctbAcquisition*)pArgs)->plotData(data,index);
} }
@ -836,8 +837,8 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
// cout <<"global plot is " << globalPlot << endl; // cout <<"global plot is " << globalPlot << endl;
cout << "*******************************************" <<endl; // cout << "*******************************************" <<endl;
cout <<"------Plot: "<< index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex << endl; // cout <<"------Plot: "<< index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex << endl;
if (globalPlot || cbGetPedestal->IsOn()) { if (globalPlot || cbGetPedestal->IsOn()) {
//#ifdef TESTADC //#ifdef TESTADC
// cout <<"------"<< index << " " << ip << " " << data->npoints << endl; // cout <<"------"<< index << " " << ip << " " << data->npoints << endl;
@ -904,7 +905,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
i=0; i=0;
char *d_data= data->cvalues+2*nadc*nAnalogSamples; char *d_data= data->data+2*nadc*nAnalogSamples;
char dval; char dval;
@ -914,7 +915,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
for (int x=0; x<nx; x++) { for (int x=0; x<nx; x++) {
for (int y=0; y<ny; y++) { for (int y=0; y<ny; y++) {
ped=0; ped=0;
aval=dataStructure->getValue(data->cvalues,x,y); aval=dataStructure->getValue(data->data,x,y);
if (cbGetPedestal->IsOn()) { if (cbGetPedestal->IsOn()) {
if (photonFinder) { if (photonFinder) {
@ -934,7 +935,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
if (h2DMapDig) if (h2DMapDig)
h2DMapDig->SetBinContent(x+1,y+1,dataStructure->getGain(data->cvalues,x,y)); h2DMapDig->SetBinContent(x+1,y+1,dataStructure->getGain(data->data,x,y));
} }
@ -1684,7 +1685,7 @@ void* ctbAcquisition::ThreadHandle(void *arg)
} }
int ctbAcquisition::progressCallback(double f,void* arg) { void ctbAcquisition::progressCallback(double f,void* arg) {
// ctbAcquisition *acq = static_cast<ctbAcquisition*>(arg); // ctbAcquisition *acq = static_cast<ctbAcquisition*>(arg);

4
ctbGui/ctbAcquisition.h
View File

@ -191,8 +191,8 @@ class ctbAcquisition : public TGGroupFrame {
void setGraph (int i ,int en, Pixel_t col); void setGraph (int i ,int en, Pixel_t col);
void setBitGraph (int i ,int en, Pixel_t col); void setBitGraph (int i ,int en, Pixel_t col);
void startAcquisition(); void startAcquisition();
static int progressCallback(double,void*); static void progressCallback(double,void*);
static int dataCallback(detectorData*, int,int, void*); static void dataCallback(detectorData*, long unsigned int, unsigned int, void*);
int StopFlag; int StopFlag;
int plotData(detectorData*, int); int plotData(detectorData*, int);

2
ctbGui/ctbGui.cpp
View File

@ -64,7 +64,7 @@ int main(int argc, char **argv) {
/****** Create detector ****************/ /****** Create detector ****************/
multiSlsDetector *myDet=new multiSlsDetector(id); multiSlsDetector *myDet=new multiSlsDetector(id);
myDet->setOnline(slsDetectorDefs::ONLINE_FLAG); // myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
//cout << id << " " << myDet << " " << myDet->setOnline() << endl; //cout << id << " " << myDet << " " << myDet->setOnline() << endl;
if (cf) { if (cf) {