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

uncommented extra comments

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-03-09 11:40:26 +01:00
parent f3bf331b5f
commit 300bf85dae
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1699,7 +1699,9 @@ slsDetectorDefs::detectorType slsDetector::getDetectorsType(int pos){
int slsDetector::getTotalNumberOfChannels() { int slsDetector::getTotalNumberOfChannels() {
#ifdef VERBOSE
cout << "total number of channels" << endl; cout << "total number of channels" << endl;
#endif
if(thisDetector->myDetectorType==JUNGFRAUCTB){ if(thisDetector->myDetectorType==JUNGFRAUCTB){
if (thisDetector->roFlags&DIGITAL_ONLY) if (thisDetector->roFlags&DIGITAL_ONLY)
thisDetector->nChan[X]=4; thisDetector->nChan[X]=4;
@ -1718,8 +1720,10 @@ int slsDetector::getTotalNumberOfChannels() {
thisDetector->nChans=thisDetector->nChan[X]; thisDetector->nChans=thisDetector->nChan[X];
thisDetector->dataBytes=thisDetector->nChans*thisDetector->nChips*thisDetector->nMods*2*thisDetector->timerValue[SAMPLES_JCTB]; thisDetector->dataBytes=thisDetector->nChans*thisDetector->nChips*thisDetector->nMods*2*thisDetector->timerValue[SAMPLES_JCTB];
} else } else
#ifdef VERBOSE
cout << "det type is "<< thisDetector->myDetectorType << endl; cout << "det type is "<< thisDetector->myDetectorType << endl;
cout << "Total number of channels is "<< thisDetector->nChans*thisDetector->nChips*thisDetector->nMods << " data bytes is " << thisDetector->dataBytes << endl; cout << "Total number of channels is "<< thisDetector->nChans*thisDetector->nChips*thisDetector->nMods << " data bytes is " << thisDetector->dataBytes << endl;
#endif
return thisDetector->nChans*thisDetector->nChips*thisDetector->nMods; return thisDetector->nChans*thisDetector->nChips*thisDetector->nMods;
}; };

4
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -304,14 +304,18 @@ int slsDetectorUtils::acquire(int delflag){
pthread_mutex_unlock(&mg);//cout << "unlock"<< endl; pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
break; break;
} }
#ifdef VERBOSE
cout << "Receiver started " << endl; cout << "Receiver started " << endl;
#endif
pthread_mutex_unlock(&mg);//cout << "unlock"<< endl; pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
} }
#ifdef VERBOSE #ifdef VERBOSE
cout << "Acquiring " << endl; cout << "Acquiring " << endl;
#endif #endif
startAndReadAll(); startAndReadAll();
#ifdef VERBOSE
cout << "detector finished " << endl; cout << "detector finished " << endl;
#endif
#ifdef VERBOSE #ifdef VERBOSE
cout << "returned! " << endl; cout << "returned! " << endl;
#endif #endif