diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index 4d55f5b6b..2de5d9b8d 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -32,6 +32,7 @@ typedef char mystring[MAX_STR_LENGTH]; typedef double mysteps[MAX_SCAN_STEPS]; + #ifndef DACS_FLOAT typedef int dacs_t; #else @@ -370,7 +371,7 @@ enum detectorSettings{ FIXGAIN2, /**< fix gain 2 */ FORCESWITCHG1, /**< force switch gain 1 */ FORCESWITCHG2, /**< force switch gain 2 */ - UNDEFINED, /**< undefined or custom settings */ + UNDEFINED=200, /**< undefined or custom settings */ UNINITIALIZED /**< uninitialiazed (status at startup) */ }; /** diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.19 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.0 similarity index 100% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.19 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.0 diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0.3 similarity index 65% rename from slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0 rename to slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0.3 index 64cc73931..d6d9b460e 100755 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0 and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0.3 differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest index 7c2470706..a4574f51f 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest and b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.0.3 b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.0.3 new file mode 100755 index 000000000..a4574f51f Binary files /dev/null and b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.0.3 differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c b/slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c index 5b0be78cd..99c3d431a 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c @@ -1125,7 +1125,7 @@ int set_dac(int file_des) { retval1=retval; } else retval1=retval; - + } #endif #ifdef VERBOSE diff --git a/slsDetectorSoftware/moenchDetectorServer/ansi.h b/slsDetectorSoftware/moenchDetectorServer/ansi.h new file mode 120000 index 000000000..a122db0ad --- /dev/null +++ b/slsDetectorSoftware/moenchDetectorServer/ansi.h @@ -0,0 +1 @@ +../../slsReceiverSoftware/include/ansi.h \ No newline at end of file diff --git a/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.0.3 b/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.0.3 new file mode 100755 index 000000000..d49a67b57 Binary files /dev/null and b/slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.0.3 differ diff --git a/slsDetectorSoftware/mythenDetectorServer/ansi.h b/slsDetectorSoftware/mythenDetectorServer/ansi.h new file mode 120000 index 000000000..a122db0ad --- /dev/null +++ b/slsDetectorSoftware/mythenDetectorServer/ansi.h @@ -0,0 +1 @@ +../../slsReceiverSoftware/include/ansi.h \ No newline at end of file diff --git a/slsDetectorSoftware/mythenDetectorServer/mythenDetectorServer b/slsDetectorSoftware/mythenDetectorServer/mythenDetectorServer index 2121542e1..62f811a89 100755 Binary files a/slsDetectorSoftware/mythenDetectorServer/mythenDetectorServer and b/slsDetectorSoftware/mythenDetectorServer/mythenDetectorServer differ diff --git a/slsDetectorSoftware/mythenDetectorServer/mythenDetectorServerv2.0.3 b/slsDetectorSoftware/mythenDetectorServer/mythenDetectorServerv2.0.3 new file mode 100755 index 000000000..62f811a89 Binary files /dev/null and b/slsDetectorSoftware/mythenDetectorServer/mythenDetectorServerv2.0.3 differ diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 641520b18..9d4810495 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3132,6 +3132,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise if(thisDetector->myDetectorType == EIGER) iodelay = new int; + int ret=0; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp index 24537f98f..cc8c88afd 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp @@ -353,7 +353,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string infile.open(myfname.c_str(),ifstream::binary); if (infile.is_open()) { 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)); #ifdef VERBOSE for(int i=0;indac;i++) @@ -517,7 +517,7 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp std::cout << "iodelay: " << *iodelay << std::endl; #endif 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.close();