merged with developer a lot of bug fixes from 14 sep to 30 sep

This commit is contained in:
Dhanya Maliakal
2016-10-04 13:36:04 +02:00
25 changed files with 701 additions and 127 deletions

View File

@ -488,6 +488,11 @@ class multiSlsDetector : public slsDetectorUtils {
int decodeNMod(int i, int &idet, int &imod);
/** programs FPGA with pof file
\param fname file name
\returns OK or FAIL
*/
int programFPGA(string fname);
/** loads the modules settings/trimbits reading from a file - file name extension is automatically generated! */
int loadSettingsFile(string fname, int nmod=0);