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

Merge branch 'master' into parallel

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-03-21 11:41:44 +01:00
commit be93613ac8
13 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -32,6 +32,7 @@ typedef char mystring[MAX_STR_LENGTH];
typedef double mysteps[MAX_SCAN_STEPS]; typedef double mysteps[MAX_SCAN_STEPS];
#ifndef DACS_FLOAT #ifndef DACS_FLOAT
typedef int dacs_t; typedef int dacs_t;
#else #else
@ -370,7 +371,7 @@ enum detectorSettings{
FIXGAIN2, /**< fix gain 2 */ FIXGAIN2, /**< fix gain 2 */
FORCESWITCHG1, /**< force switch gain 1 */ FORCESWITCHG1, /**< force switch gain 1 */
FORCESWITCHG2, /**< force switch gain 2 */ FORCESWITCHG2, /**< force switch gain 2 */
UNDEFINED, /**< undefined or custom settings */ UNDEFINED=200, /**< undefined or custom settings */
UNINITIALIZED /**< uninitialiazed (status at startup) */ UNINITIALIZED /**< uninitialiazed (status at startup) */
}; };
/** /**

0
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.19 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.0
View File

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0 → slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0.3
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.0.3 Executable file
View File

Binary file not shown.

2
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c
View File

@ -1125,7 +1125,7 @@ int set_dac(int file_des) {
retval1=retval; retval1=retval;
} else } else
retval1=retval; retval1=retval;
}
#endif #endif
#ifdef VERBOSE #ifdef VERBOSE

1
slsDetectorSoftware/moenchDetectorServer/ansi.h Symbolic link
View File

@ -0,0 +1 @@
../../slsReceiverSoftware/include/ansi.h

BIN
slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.0.3 Executable file
View File

Binary file not shown.

1
slsDetectorSoftware/mythenDetectorServer/ansi.h Symbolic link
View File

@ -0,0 +1 @@
../../slsReceiverSoftware/include/ansi.h

BIN
slsDetectorSoftware/mythenDetectorServer/mythenDetectorServer
View File

Binary file not shown.

BIN
slsDetectorSoftware/mythenDetectorServer/mythenDetectorServerv2.0.3 Executable file
View File

Binary file not shown.

1
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3132,6 +3132,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
if(thisDetector->myDetectorType == EIGER) if(thisDetector->myDetectorType == EIGER)
iodelay = new int; iodelay = new int;
int ret=0; int ret=0;

4
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
View File

@ -353,7 +353,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
infile.open(myfname.c_str(),ifstream::binary); infile.open(myfname.c_str(),ifstream::binary);
if (infile.is_open()) { if (infile.is_open()) {
infile.read((char*) myMod->dacs,sizeof(dacs_t)*(myMod->ndac)); infile.read((char*) myMod->dacs,sizeof(dacs_t)*(myMod->ndac));
infile.read((char*) iodelay,sizeof(iodelay)); infile.read((char*) iodelay,sizeof(*iodelay));
infile.read((char*) myMod->chanregs,sizeof(int)*(myMod->nchan)); infile.read((char*) myMod->chanregs,sizeof(int)*(myMod->nchan));
#ifdef VERBOSE #ifdef VERBOSE
for(int i=0;i<myMod->ndac;i++) for(int i=0;i<myMod->ndac;i++)
@ -517,7 +517,7 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp
std::cout << "iodelay: " << *iodelay << std::endl; std::cout << "iodelay: " << *iodelay << std::endl;
#endif #endif
outfile.write((char*)mod.dacs, sizeof(dacs_t)*(mod.ndac)); outfile.write((char*)mod.dacs, sizeof(dacs_t)*(mod.ndac));
outfile.write((char*)iodelay, sizeof(iodelay)); outfile.write((char*)iodelay, sizeof(*iodelay));
outfile.write((char*)mod.chanregs, sizeof(int)*(mod.nchan)); outfile.write((char*)mod.chanregs, sizeof(int)*(mod.nchan));
outfile.close(); outfile.close();