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

moench client and receiver works with gotthard module, without gui

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@511 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-04-12 12:54:36 +00:00
parent cb9de5973f
commit 27c91c36ff
18 changed files with 420 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
View File

@ -200,7 +200,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
break;
case MOENCH:
case GOTTHARD:
//---------------dacs---------------
for (int iarg=0; iarg<myMod->ndac; iarg++) {
@ -262,6 +262,7 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp
names[id++]="Vcal";
names[id++]="outBuffEnable";
break;
case MOENCH:
case GOTTHARD:
names[id++]="Vref";
names[id++]="VcascN";
@ -288,7 +289,7 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp
outfile << names[idac] << " " << iv << std::endl;
}
if(myDetectorType!=GOTTHARD){
if((myDetectorType!=GOTTHARD)&&(myDetectorType!=MOENCH)){
for (ichip=0; ichip<mod.nchip; ichip++) {
iv1=mod.chipregs[ichip]&1;
outfile << names[idac] << " " << iv1 << std::endl;

7
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -393,12 +393,13 @@ void* postProcessing::processData(int delflag) {
}
//receiver
else{
/*
/*
//without gui loop
while(1){
if (checkJoinThread()) break;
usleep(200000);
}
*/
*/
/*if(setReadReceiverFrequency()>0)) ******Not implemented yet ********
* else
*/
@ -409,7 +410,7 @@ void* postProcessing::processData(int delflag) {
int caught=0;
bool newData=false;
char currentfName[MAX_STR_LENGTH];
char currentfName[MAX_STR_LENGTH]="";
int currentfIndex=0;
while(1){
cout.flush();