detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

changed makefile back from epics, got rid of unnecessary print outs

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@728 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-01-30 17:50:12 +00:00
parent 382f5652ea
commit b1a13a601d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/Makefile
View File

@ -1,13 +1,13 @@
CFLAGS= -DC_ONLY -fPIC CFLAGS= -g -DC_ONLY -fPIC
#FLAGS+= #-DVERBOSE -DVERYVERBOSE #FLAGS+= #-DVERBOSE -DVERYVERBOSE
DFLAGS= -DDACS_INT -DTHIS_PATH='"$(shell pwd)"' -DSLS_RECEIVER_FUNCTION_LIST #$(shell root-config --cflags --glibs) -DMYROOT1 #-DMYROOT1 `root-config --cflags --glibs` DFLAGS= -g -DDACS_INT -DTHIS_PATH='"$(shell pwd)"' -DSLS_RECEIVER_FUNCTION_LIST $(shell root-config --cflags --glibs) -DMYROOT1 #-DMYROOT1 `root-config --cflags --glibs`
#ASM=$(shell echo "/lib/modules/`uname -r`/build/include") #ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
INCLUDES?= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -IslsReceiver -I../slsDetectorCalibration -I$(ASM) INCLUDES?= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -IslsReceiver -I../slsDetectorCalibration -I$(ASM)
EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom
CC=g++ CC=g++

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -353,7 +353,7 @@ void multiSlsDetector::updateOffsets(){
int offsetX=0,offsetY=0,numX,numY; int offsetX=0,offsetY=0,numX,numY;
int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X]; int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X];
int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y]; int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y];
cout << "Updating detector offsets" << endl;
thisMultiDetector->numberOfChannel[X] = 0; thisMultiDetector->numberOfChannel[X] = 0;
thisMultiDetector->maxNumberOfChannel[X] = 0; thisMultiDetector->maxNumberOfChannel[X] = 0;
thisMultiDetector->numberOfChannel[Y] = 0; thisMultiDetector->numberOfChannel[Y] = 0;
@ -364,7 +364,7 @@ void multiSlsDetector::updateOffsets(){
thisMultiDetector->offsetX[i] = offsetX; thisMultiDetector->offsetX[i] = offsetX;
thisMultiDetector->offsetY[i] = offsetY; thisMultiDetector->offsetY[i] = offsetY;
cout << "Detector pos: " << i << " offset X:" << offsetX << " offset Y:" << offsetY << endl; cout << "Detector at position: " << i << " at offset X:" << offsetX << " and offset Y:" << offsetY << endl;
numX = detectors[i]->getMaxNumberOfChannels(X); numX = detectors[i]->getMaxNumberOfChannels(X);
numY = detectors[i]->getMaxNumberOfChannels(Y); numY = detectors[i]->getMaxNumberOfChannels(Y);
@ -1946,7 +1946,7 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
#ifdef VERBOSE #ifdef VERBOSE
cout<<"Getting ROI :"<<endl; cout<<"ROI :"<<endl;
for(int j=0;j<n;j++){ for(int j=0;j<n;j++){
cout<<roiLimits[j].xmin<<"\t"<<roiLimits[j].xmax<<"\t"<<roiLimits[j].ymin<<"\t"<<roiLimits[j].ymax<<endl; cout<<roiLimits[j].xmin<<"\t"<<roiLimits[j].xmax<<"\t"<<roiLimits[j].ymin<<"\t"<<roiLimits[j].ymax<<endl;
} }

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3200,7 +3200,7 @@ slsDetectorDefs::runStatus slsDetector::getRunStatus(){
if (stopSocket) { if (stopSocket) {
if (stopSocket->Connect()>=0) { if (stopSocket->Connect()>=0) {
stopSocket->SendDataOnly(&fnum,sizeof(fnum)); stopSocket->SendDataOnly(&fnum,sizeof(fnum));
cout << stopSocket->ReceiveDataOnly(&ret,sizeof(ret)) ; stopSocket->ReceiveDataOnly(&ret,sizeof(ret));
// cout << "________:::____________" << ret << endl; // cout << "________:::____________" << ret << endl;

4
slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h
View File

@ -128,7 +128,7 @@ class fileIOStatic {
index=i; \ index=i; \
s=fname.substr(0,uscore); \ s=fname.substr(0,uscore); \
} \ } \
else cout << "******************************** cannot parse file index" << endl; \ /*else cout << "******************************** cannot parse file index" << endl; \*/
uscore=s.rfind("_"); \ uscore=s.rfind("_"); \
if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)) \ if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)) \
if(i==-1)return 0; \ if(i==-1)return 0; \
@ -161,7 +161,7 @@ class fileIOStatic {
index=i; \ index=i; \
s=fname.substr(0,uscore); \ s=fname.substr(0,uscore); \
} \ } \
else cout << "******************************** cannot parse file index" << endl; \ /*else cout << "******************************** cannot parse file index" << endl; \*/
uscore=s.rfind("_"); \ uscore=s.rfind("_"); \
if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)) \ if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)) \
s=fname.substr(0,uscore); \ s=fname.substr(0,uscore); \

2
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -1228,7 +1228,7 @@ int slsReceiverFunctionList::startWriting(){
if(dataCompression){ if(dataCompression){
cout<<"Waiting for jobs to be done.. current mask:"<< hex << writerthreads_mask <<endl; cout<<"Waiting for jobs to be done.. current mask:"<< hex << writerthreads_mask <<endl;
while(writerthreads_mask){ while(writerthreads_mask){
cout << "." << flush; /*cout << "." << flush;*/
usleep(50000); usleep(50000);
} }
cout<<" Jobs Done!"<<endl; cout<<" Jobs Done!"<<endl;