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

eiger specific for settings to work

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@815 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-04-01 14:24:53 +00:00
parent dd6b0a3470
commit 73261a3071
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/eigerDetectorServer/EigerHighLevelFunctions.c
View File

@ -23,6 +23,7 @@ const char* dac_names[16] = {"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","V
/** Ian, the setdac and getdac should take float if it takes only V and not mV*/
int eiger_nexposures = 1;
int EigerGetNumberOfExposures(){return eiger_nexposures;}
float eiger_exposuretime = 1;

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

18
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -176,9 +176,9 @@ int setModule(sls_detector_module myMod){
int i;
for(i=0;i<myMod.ndac;i++)
setDAC((detDacIndex)i,myMod.dacs[i],myMod.module);
setDAC((enum detDacIndex)i,myMod.dacs[i],myMod.module);
thisSettings = (detectorSettings)myMod.reg;
thisSettings = (enum detectorSettings)myMod.reg;
return 0;
}
@ -364,14 +364,14 @@ int calculateDataBytes(){
return 0;
}
int getTotalNumberOfChannels(){return 1;};//NCHIP*NCHAN*nModBoard;}
int getTotalNumberOfChips(){return 1;};//NCHIP*nModBoard;}
int getTotalNumberOfChannels(){return getNumberOfChannelsPerModule();};//NCHIP*NCHAN*nModBoard;}
int getTotalNumberOfChips(){return 4;};//NCHIP*nModBoard;}
int getTotalNumberOfModules(){return 1;}//nModBoard;}
int getNumberOfChannelsPerChip(){return 1;}//NCHAN;}
int getNumberOfChannelsPerModule(){return 1;}//NCHAN*NCHIP;}
int getNumberOfChipsPerModule(){return 1;}//NCHIP;}
int getNumberOfDACsPerModule(){return 1;}//NDAC;}
int getNumberOfADCsPerModule(){return 1;}//NADC;}
int getNumberOfChannelsPerChip(){return (256*256);}//NCHAN;}
int getNumberOfChannelsPerModule(){return getNumberOfChannelsPerChip() * getTotalNumberOfChips();}//NCHAN*NCHIP;}
int getNumberOfChipsPerModule(){return 4;}//NCHIP;}
int getNumberOfDACsPerModule(){return 16;}//NDAC;}
int getNumberOfADCsPerModule(){return 0;}//NADC;}