Commit Graph

  • c6d383f770 Solved bug on number of measurements bergamaschi 2012-09-11 09:13:52 +00:00
  • 25edfba592 added measurement_finished callback bergamaschi 2012-09-11 08:23:33 +00:00
  • d92a6649ee updated number of measurements to reflect in acquire l_maliakal_d 2012-09-10 17:55:26 +00:00
  • e257e2f796 editted measurement command l_maliakal_d 2012-09-10 15:20:09 +00:00
  • 7638e6638c added checkonline command l_maliakal_d 2012-09-10 15:17:51 +00:00
  • 5cb68d870e checkOnline works properly now and calls tcpsocket if controlsocket not defined l_maliakal_d 2012-09-10 15:15:43 +00:00
  • 2cfdc2b108 check online is ok bergamaschi 2012-09-10 13:17:09 +00:00
  • ef8455ced6 added a new function checkOnline to check individually if det is connected l_maliakal_d 2012-09-10 09:31:32 +00:00
  • 6902585e24 edited the getRateCorrectionTau for multislsdet to return -1 if different for any of the detectors l_maliakal_d 2012-09-10 08:36:22 +00:00
  • 6e4be40f37 Bad channels correction separated from postProcessing bergamaschi 2012-09-06 12:03:22 +00:00
  • 6b34cb8e71 AngularConversion splitted in a static file and in one file dependent on slsDetectorBase bergamaschi 2012-09-05 10:12:49 +00:00
  • ca75754b83 Default angle function separated from usersFunctions bergamaschi 2012-09-04 11:47:26 +00:00
  • 26b4b8a2a7 Debugged loadCalibrationFile and loadSettingsFile concerning the extensions bergamaschi 2012-09-04 10:18:16 +00:00
  • 43c51f5be5 added acquisition finished callback when the acquisition returns registerAcquisitionFinishedCallback bergamaschi 2012-09-04 09:47:47 +00:00
  • 2b59857032 added loadCalibrationfile and saving it l_maliakal_d 2012-09-03 09:21:25 +00:00
  • b0eea2a6e6 Splitted fileIO with fileIOStatic.h bergamaschi 2012-08-29 09:50:07 +00:00
  • 852bd47bc9 changed enum positions to have scriptscan as the last value l_maliakal_d 2012-08-29 09:03:26 +00:00
  • 7093e92c08 enCalLog and angCalLog added bergamaschi 2012-08-27 15:29:18 +00:00
  • d50ac0fe30 try again ramani_n 2012-08-23 09:23:00 +00:00
  • 7c0f93d4d1 dummy ci ramani_n 2012-08-23 09:19:32 +00:00
  • 148d37281a branch for interfacing to f90 software for data analysis from MS beamline bergamaschi 2012-08-22 10:44:41 +00:00
  • bb8349b756 branch for interfacing to f90 software for data analysis from MS beamline bergamaschi 2012-08-22 10:43:40 +00:00
  • aed6fe9c2e make the branches directory to hold all the branches bergamaschi 2012-08-22 10:42:46 +00:00
  • e888689036 makefile with dacs_t flag bergamaschi 2012-08-22 10:02:43 +00:00
  • 362ba2af11 mythenDetectorServer now works with dacs_t and the commands vpreamp and vcalibration respond correctly bergamaschi 2012-08-22 09:44:08 +00:00
  • cd7cfadac8 changes in gotthard l_maliakal_d 2012-08-21 13:38:01 +00:00
  • 2981ac8700 added a change for the dacs from double to dacs_t l_maliakal_d 2012-08-16 08:46:41 +00:00
  • 3e8f1e22e9 changed all the dacs and adc types from double to dacs_int to an ifdef defined in sls det defs l_maliakal_d 2012-08-15 17:12:20 +00:00
  • 5407fdcf6e changed dacs and adcs values to be an int between sockets l_maliakal_d 2012-08-15 17:07:55 +00:00
  • 73424d0376 somehow it works with the receive adc in receieveModule blocked. added DDACS_DOUBLE to makefile to make it work with client l_maliakal_d 2012-08-15 15:33:04 +00:00
  • 398b1aa844 Undoing all float to double changes l_maliakal_d 2012-08-13 13:31:18 +00:00
  • c880f883e3 Undoing all float to double changes l_maliakal_d 2012-08-13 13:26:53 +00:00
  • 1c7f70e14e Undoing all float to double changes l_maliakal_d 2012-08-13 13:23:51 +00:00
  • dbfc814768 Undoing all float to double changes l_maliakal_d 2012-08-13 13:21:07 +00:00
  • 3229c849ab vref_ds wasnt included l_maliakal_d 2012-08-10 14:01:05 +00:00
  • f686a575b6 gotthard dacs only save 10 bits but firmware is more than 14-16 bits..so changed setdacreg to save only msb and accordingly ignore a difference of 3 while setting. Problem not detected earlier, communicationfuncs.c.Solution: commented out a part from receiveModule l_maliakal_d 2012-08-08 16:18:46 +00:00
  • d934111c2a no change ramani_n 2012-08-03 10:21:49 +00:00
  • b154207535 changed sscanf for double from %f to %lf in slsdetcommand.cpp and fileio.cpp l_maliakal_d 2012-08-03 10:05:37 +00:00
  • 71339022cf added virtual to the slsDectector.h destructor l_maliakal_d 2012-08-03 09:34:13 +00:00
  • afbf7c9166 changed everything back ramani_n 2012-08-03 09:13:48 +00:00
  • 268711f6a6 changed back to before l_maliakal_d 2012-08-02 16:32:35 +00:00
  • 4f376dc499 changed slsDetectorUtils.cpp to before l_maliakal_d 2012-08-02 15:57:58 +00:00
  • 4fce2499b1 changed slsDetectorUtils.h back to before l_maliakal_d 2012-08-02 15:47:16 +00:00
  • 1982b25d89 File_IO added ramani_n 2012-08-02 14:37:37 +00:00
  • 5aebcd4888 Changed everywhere from float to double, even mythenDetectorServer and the standalone files l_maliakal_d 2012-08-02 12:58:08 +00:00
  • 3795dcedfe standalone version of angularConversion and postProcessing added bergamaschi 2012-07-17 15:18:31 +00:00
  • aa480795c6 enableWriteToFile added ramani_n 2012-07-17 10:05:43 +00:00
  • c04ed80b83 changed setDynamicRange to work if not set, set initial settings for num of frames, triggers,period,exptime etc to be 1 l_maliakal_d 2012-07-13 11:21:51 +00:00
  • 13fa3520a6 Added ifbadchannelmask, else error while compiling in verbose l_maliakal_d 2012-07-03 12:47:35 +00:00
  • cee632e3b5 modification to setDetectorSize bergamaschi 2012-06-29 07:21:30 +00:00
  • f0dfedeba7 reverted a printout of write 0 position 0 offset 0 back to verbose mode l_maliakal_d 2012-06-28 12:47:54 +00:00
  • 67471563b0 void pointers added to callback functions ramani_n 2012-06-22 12:12:29 +00:00
  • 6298136a19 add missing header in gcc 4.4 wang_x1 2012-06-22 09:31:51 +00:00
  • 289318aff6 clear warnings using gcc 4.4 wang_x1 2012-06-22 09:26:31 +00:00
  • ab3a5bd2c2 Modified the externalcommunication mode variables to include trigger frame and trigger window l_maliakal_d 2012-06-20 13:35:58 +00:00
  • 98bf7a4c68 solved bug on retrieve detector setup? bergamaschi 2012-06-19 13:33:00 +00:00
  • 7582cf9781 dataCallback has an argument provided by user wang_x1 2012-06-19 10:04:15 +00:00
  • bc85c26bdd solved problem on absolute channel number in raw files bergamaschi 2012-06-15 15:30:42 +00:00
  • 69965fcb7e changed detector size from module to channel number, added y dimension to detectorData bergamaschi 2012-06-15 12:49:28 +00:00
  • 042b71b403 solved problem reading config files bergamaschi 2012-06-15 12:29:40 +00:00
  • dfcd8f749e makefile adjusted root 2012-06-15 08:01:02 +00:00
  • 84e113d447 small changes in makefile and replaced long long with int64_t bergamaschi 2012-06-15 07:12:24 +00:00
  • c1c646db15 Added slsDetectorUsers bergamaschi 2012-06-11 14:54:32 +00:00
  • fe86145881 slsDetectorUsers inherited by all classes i.e. API ready for EPICS driver bergamaschi 2012-06-05 13:57:00 +00:00
  • ed84d21da0 solved bug in angular conversion bergamaschi 2012-06-01 13:57:31 +00:00
  • 0a561c1c1f solved bug concerning headers x04sa 2012-06-01 07:25:02 +00:00
  • 0ef003646e solved conflicts between detectors about config files bergamaschi 2012-05-31 07:46:53 +00:00
  • c14b98d938 impplemented the possibility of setting the bad channels on a module basis bergamaschi 2012-05-25 15:23:32 +00:00
  • d30ad5faac added callbacks (but should still implement them in the base classes) bergamaschi 2012-05-22 15:34:12 +00:00
  • 0bab16cde7 Detectors types can (should) be configured in the multiSlsDetector structure bergamaschi 2012-05-22 12:24:15 +00:00
  • 83ee449e3c solved bug with multidetector angular conversion bergamaschi 2012-05-15 09:17:16 +00:00
  • b5e966bb58 reshuffling by Anna bergamaschi 2012-05-14 13:39:18 +00:00
  • b484ad7f20 changed the getdetectorstype function to return type and not string l_maliakal_d 2012-05-11 07:22:40 +00:00
  • e0333e9f84 changed the multi getdetectortype to return unknown l_maliakal_d 2012-05-04 13:47:32 +00:00
  • 9c020fb67d modified getDetectorType function name in slsDetector to be able to make a getDetectorType(pos) function for multiSlsDetector l_maliakal_d 2012-05-03 16:29:29 +00:00
  • 7824719d98 some smaller modification to slsDetectorServer bergamaschi 2012-04-30 13:19:31 +00:00
  • b32265caf9 Added common socket interface for the server bergamaschi 2012-04-30 12:58:32 +00:00
  • 4a9dfa12b2 the final working gotthard:with no errors in state l_maliakal_d 2012-04-16 14:28:18 +00:00
  • 1b6f8259c7 some more changes in the acquisition function bergamaschi 2012-04-13 15:26:36 +00:00
  • ab4e569b6c After some speed optimization... bergamaschi 2012-04-13 13:03:53 +00:00
  • 3ddafe3baf added the usingnamespace std for slsDetectorActions.cpp l_maliakal_d 2012-04-04 09:33:32 +00:00
  • e72621959e changed the test function a bit l_maliakal_d 2012-04-03 09:44:06 +00:00
  • d8e03f80e4 added reset for control reg and changed teh read and write register functions in server_funcs.c l_maliakal_d 2012-04-03 09:35:23 +00:00
  • ee36cdf9e4 functions splitted in many sub-files bergamaschi 2012-04-02 15:16:32 +00:00
  • b227ad1b0c test function changed a bit l_maliakal_d 2012-03-28 08:30:52 +00:00
  • af4262aa42 added comments to the last functions and added a comma at the end l_maliakal_d 2012-03-26 16:50:19 +00:00
  • 002444fd57 debugged bergamaschi 2012-03-26 08:46:45 +00:00
  • 2463c9841c really merged after the mess... bergamaschi 2012-03-23 15:58:03 +00:00
  • 13344152aa cretated the class slsDetectorDefs, more advanced funcs moved from slsDetectorBase to slsDetectorUtils, separated function index enum from other definitions (share with dectris?) bergamaschi 2012-03-23 11:44:24 +00:00
  • 513e033a45 now the read/reset counter block and loadimage for gotthard works l_maliakal_d 2012-03-23 11:18:07 +00:00
  • 47312e625c now the read/reset counter block and loadimage for gotthard works l_maliakal_d 2012-03-23 11:17:39 +00:00
  • c0a69ebc2d now the loadimage, read/reset counterblock for gotthard works l_maliakal_d 2012-03-23 11:16:30 +00:00
  • 410725784c got rid of many warnings and load darkimage and reset/read counter works now l_maliakal_d 2012-03-23 11:13:42 +00:00
  • ca896b8b30 now processing all files of a sequence x04sa 2012-03-23 08:30:24 +00:00
  • e3ca421c3c faster acquisition for multidetector and angualr data merging independent of angular direction x04sa 2012-03-22 13:25:19 +00:00
  • bc8b0860b4 moved testfunction to slsDetectorUtils l_maliakal_d 2012-03-19 14:50:44 +00:00
  • aae550b997 moved the test function to the slsDetectorUtils class l_maliakal_d 2012-03-19 14:50:01 +00:00
  • 145e38eac1 commenting out small printf changes l_maliakal_d 2012-03-19 14:35:21 +00:00
  • 3a24dd2396 moved the test function from protected l_maliakal_d 2012-03-16 15:48:09 +00:00
  • c822b064ab added the testfunction l_maliakal_d 2012-03-16 15:47:25 +00:00