Commit Graph

  • 97ed3e8872 made udp socket in receiver use generic socket, included a incrememnt frame index in acquire before a break, got rid of infinite loop for unmatched index in receiver l_maliakal_d 2012-11-19 16:29:17 +00:00
  • 1b7c42540a included receiver defs in doxy l_maliakal_d 2012-11-19 13:01:26 +00:00
  • af3abff8dd converted receiver to c++, edited generic socket to include differentclients l_maliakal_d 2012-11-19 12:44:17 +00:00
  • 3c94d2cb40 converted to c++ l_maliakal_d 2012-11-19 12:41:35 +00:00
  • 58623dcd34 fixed file index problem l_maliakal_d 2012-11-15 13:54:02 +00:00
  • e4e46920cd fixed frames from receiver to flip accordingly, also display frame index as not visible from filename l_maliakal_d 2012-11-15 11:19:50 +00:00
  • 89ddfa9b51 fixed the problem with multiple frame scan, frame index and file index included in gui l_maliakal_d 2012-11-14 13:43:42 +00:00
  • e0a1e4ab36 warnings fixed bergamaschi 2012-11-14 11:37:06 +00:00
  • 09982d84f2 asm includes universally found bergamaschi 2012-11-14 10:08:03 +00:00
  • f6ff1359aa implemented server to have a phase shift input l_maliakal_d 2012-11-13 12:31:41 +00:00
  • d944ee5372 generic socket updated bergamaschi 2012-11-13 12:28:13 +00:00
  • dc94fc3c97 receiver-read frame in right order, cleaned fileio, config file-include extsig and vhighvoltage l_maliakal_d 2012-11-13 10:21:22 +00:00
  • bf7da5f493 closeDataFile is only for gotthard and included lock for socket while using receiver l_maliakal_d 2012-11-13 08:38:18 +00:00
  • 8f7872d056 gotthard receiver works so far without cpu file write and tcp generic socket lock l_maliakal_d 2012-11-12 15:48:28 +00:00
  • 6ee21ba810 included progresscallback to use in the gui to get the progress for receivers l_maliakal_d 2012-11-08 08:28:51 +00:00
  • 33fa69d546 configuremac doesnt return a retval, separated setdaqregister and clean fifo, included clean fifo before startstatemachine, set delay and gates to 0 at start of server l_maliakal_d 2012-11-08 08:21:33 +00:00
  • 3cc914a8fb moved configuremac to receiverip and change the config file writing to have the correct order l_maliakal_d 2012-11-08 08:18:01 +00:00
  • fa9449e447 genericSocket implemented with also send/receive functions, possibility to select the binding network interface for the server and utilities to get the interface name, ip or mac bergamaschi 2012-11-05 14:25:14 +00:00
  • 50beac1f8a defined generic socket class for both TCP and UDP, inherited by MySocketTCP - send receive funcs should still be implemented bergamaschi 2012-10-31 11:56:01 +00:00
  • 3f1780f71b circular fifo from the web added to the svn bergamaschi 2012-10-31 09:45:59 +00:00
  • 96d08d61d0 frame index in file name, increments instead of file index for real time acquisitions bergamaschi 2012-10-30 15:52:40 +00:00
  • 2f9dea8341 forgot to add slsREceiver l_maliakal_d 2012-10-30 14:30:57 +00:00
  • 2338de4054 added receiver in here l_maliakal_d 2012-10-30 10:06:58 +00:00
  • 007995a5ec changed the default of incrememnt progress to 1 l_maliakal_d 2012-10-30 10:04:05 +00:00
  • b29d8d33f0 got rif of unnnecessary couts for receiver part in processing l_maliakal_d 2012-10-29 17:02:42 +00:00
  • 439c2b1de8 got rid of client telling detector that receiver is down each time it doesnt work l_maliakal_d 2012-10-29 17:01:59 +00:00
  • f37cd6640f acquire works with receiver now l_maliakal_d 2012-10-29 17:00:53 +00:00
  • 30e6c810a8 put some printf in verbose mode l_maliakal_d 2012-10-29 13:49:41 +00:00
  • 7cd1f9138e frame index updated for receiver l_maliakal_d 2012-10-29 13:48:56 +00:00
  • 69d08ac546 frame index updated for receiver l_maliakal_d 2012-10-29 13:46:22 +00:00
  • e94677cbf5 frame index updated for receiver l_maliakal_d 2012-10-29 13:46:04 +00:00
  • 1f69778a6f frame index updated for receiver l_maliakal_d 2012-10-29 13:45:22 +00:00
  • 5d50fa8e00 frame index updated for receiver l_maliakal_d 2012-10-29 13:44:57 +00:00
  • b7dd317c08 frame index updated for receiver l_maliakal_d 2012-10-29 13:44:07 +00:00
  • db249237c9 fixed error with cleaning fifo l_maliakal_d 2012-10-26 10:21:09 +00:00
  • 8387f70071 doxygen for slsReceiver and slsReceiverInterface l_maliakal_d 2012-10-26 09:38:54 +00:00
  • 83775bd7f3 separated slsReceiverInterface from slsDetector l_maliakal_d 2012-10-26 08:59:04 +00:00
  • 4dcad48ecb separated slsReceiverInterface from slsDetector l_maliakal_d 2012-10-26 08:58:26 +00:00
  • b52f9a8569 filepath, filename and index set from slsdet or multislsdet, moving all receiver coding from slsdetectorcommand to slsdetector l_maliakal_d 2012-10-24 11:59:04 +00:00
  • 9b323c9e7e included registers.h in server_funcs.c l_maliakal_d 2012-10-24 08:17:58 +00:00
  • da5759bed6 changes of get detector status by Anna-with error message bergamaschi 2012-10-24 08:12:42 +00:00
  • e577cd369e changes of get detector status by Anna bergamaschi 2012-10-24 08:09:21 +00:00
  • 964ff9006f using daq register function in configuremac l_maliakal_d 2012-10-18 12:08:20 +00:00
  • 0c122168f3 file name with frame index and detector index l_maliakal_d 2012-10-18 10:01:26 +00:00
  • cf5214bb01 file name with frame index and detector index l_maliakal_d 2012-10-18 10:01:16 +00:00
  • 8637272248 file name with frame index and detector index l_maliakal_d 2012-10-18 10:00:35 +00:00
  • d115b8bf20 file name with frame index and detector index l_maliakal_d 2012-10-18 09:59:28 +00:00
  • f2be1d5fd9 file name with frame index and detector index l_maliakal_d 2012-10-18 09:59:18 +00:00
  • a05631f2c3 file name with frame index and detector index l_maliakal_d 2012-10-18 09:58:54 +00:00
  • 79bc1a010b file name with frame index and detector index l_maliakal_d 2012-10-18 09:57:52 +00:00
  • 524160422f using daq register function in configuremac l_maliakal_d 2012-10-18 09:27:35 +00:00
  • f0450fbf5e included DAQ reg editing in configuremac function l_maliakal_d 2012-10-18 09:07:55 +00:00
  • 6cf4fc5e43 editing configuremac to include adc number l_maliakal_d 2012-10-16 15:31:46 +00:00
  • 6fb6f72bc3 almost compiling on 64bit... bergamaschi 2012-10-16 14:50:05 +00:00
  • 0c89b0986f status start should not look for receiver l_maliakal_d 2012-10-16 13:51:28 +00:00
  • 4e3fc179fa bugfix:receiverip checked for dots in the exact place, also updated receiver using multislsdetector reference l_maliakal_d 2012-10-16 12:41:46 +00:00
  • aa10120574 bugfix:receiverip checked for dots in the exact place, also updated receiver using multislsdetector reference l_maliakal_d 2012-10-16 12:41:24 +00:00
  • 5d9d26506f passing multislsdetector reference to slsdetector constructor l_maliakal_d 2012-10-15 10:23:17 +00:00
  • 733f5b1f3e made sure that server knows whether to stop sending to receiver even if receiver is down, made sure error in configuremac is shown when doing start receiver l_maliakal_d 2012-10-12 10:20:19 +00:00
  • f6a2d599a0 indenting to emacs format and including check and start receiver before doing acquire or status start l_maliakal_d 2012-10-11 16:17:07 +00:00
  • 29a540818f configuremac after starting receiver, also telling the server to send packets to receiver or cpu with receiver start and receiver stop l_maliakal_d 2012-10-11 12:53:48 +00:00
  • e5a7d834db detectorData now properly instantiated bergamaschi 2012-10-10 08:50:02 +00:00
  • b75b09cc7b dataReady called bergamaschi 2012-10-10 08:12:42 +00:00
  • 7f8f89f89d not important:got rid of warning in sls_det_funcs l_maliakal_d 2012-10-10 08:04:52 +00:00
  • 1d47eb16a1 few bugs fixed bergamaschi 2012-10-08 10:34:34 +00:00
  • 05181fa618 postprocessing based on external functions - can work with f90 interface bergamaschi 2012-10-08 09:34:14 +00:00
  • e5c5b76236 included lock receiver and update clients for receiver l_maliakal_d 2012-10-03 15:12:33 +00:00
  • 980d7ecce0 float caused error and included header file l_maliakal_d 2012-10-03 12:58:25 +00:00
  • 8b3c4c21eb update frames caught l_maliakal_d 2012-10-03 12:43:17 +00:00
  • eb58540e2e bug fix: receiver connection l_maliakal_d 2012-10-03 09:10:48 +00:00
  • 6f9e265949 receiver online flag sets back to offline if it tried to connect and didnt work l_maliakal_d 2012-10-03 08:58:01 +00:00
  • d6ff3e9227 outdir checks if path exists, bug fix receiver: now checks online flag before tryig to set it online for outdir, filename and file index l_maliakal_d 2012-10-03 08:31:35 +00:00
  • 8fa7e97470 receiver works without index l_maliakal_d 2012-10-03 08:08:36 +00:00
  • 7e374abc27 should not update filename, dir or index when receiver cannot update l_maliakal_d 2012-10-02 15:38:09 +00:00
  • d5a092c2e8 added receiver functions l_maliakal_d 2012-10-02 15:21:19 +00:00
  • d77f4a679a slsDetectorUsers reloaded bergamaschi 2012-10-02 15:20:56 +00:00
  • 2a31378b73 added receiver functions l_maliakal_d 2012-10-02 15:18:18 +00:00
  • a59d47289c added receiver functions l_maliakal_d 2012-10-02 15:16:29 +00:00
  • e1b0da53cc added receiver functions l_maliakal_d 2012-10-02 15:15:34 +00:00
  • 11fe4522eb added receiver functions l_maliakal_d 2012-10-02 15:14:05 +00:00
  • 3232ce8dac added receiver functions l_maliakal_d 2012-10-02 15:12:58 +00:00
  • 924f583be9 Added f90Interface used at SLS X04SA bergamaschi 2012-10-02 08:52:01 +00:00
  • fe73d4cb92 slsDetectorUsers is composed of multiSlsDetector instead of being its base class bergamaschi 2012-10-02 07:23:24 +00:00
  • 2e5dc6515f setup receiver first working draft l_maliakal_d 2012-10-01 08:25:41 +00:00
  • aefdcaa82e added stop server, the implementation part of the class, and edited slsDetectorServer to include the correct slsDetectorFunctionList.h l_maliakal_d 2012-09-21 16:03:13 +00:00
  • ae9b39fba3 now updating max number of modules when reading the number of modules bergamaschi 2012-09-20 15:28:54 +00:00
  • dc9d295860 problem in verbose mode if no angular conversion bergamaschi 2012-09-20 14:15:46 +00:00
  • d7bafd8072 almost no changes - checking in for alba bergamaschi 2012-09-20 08:57:44 +00:00
  • e0ad54dd46 updated getting detector mac address for gotthard l_maliakal_d 2012-09-19 13:58:03 +00:00
  • 32621b1916 included command to get detector firmware svn version l_maliakal_d 2012-09-19 12:09:00 +00:00
  • 8cc957f109 dacs_int makefile bergamaschi 2012-09-19 10:59:45 +00:00
  • 7b058c55cf some more changes in savesettings for gotthard and loadsettings l_maliakal_d 2012-09-18 15:58:16 +00:00
  • 8ed87df48f edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings l_maliakal_d 2012-09-18 15:12:08 +00:00
  • 658589d15e getmodulenumber gives back fff instead of screwing up reading random stuff l_maliakal_d 2012-09-18 14:59:35 +00:00
  • 5f78b4534f angular conversion data ready callback working also with 0 positions, and multislsdetector write data file fixed bergamaschi 2012-09-17 15:31:20 +00:00
  • 4b3fecbaf0 copy call back data verbose l_maliakal_d 2012-09-17 15:19:45 +00:00
  • 3f5bda1674 added trimbit mask l_maliakal_d 2012-09-13 08:58:45 +00:00
  • 4c8bc09143 edited getChanregs to include argument to get trimbits from sharedmemory or detector l_maliakal_d 2012-09-12 08:50:25 +00:00
  • 008d930594 stop now works also on scans/ measurements etc. bergamaschi 2012-09-12 08:23:45 +00:00
  • 3faeca0649 added getchanregs function to get the trimbits l_maliakal_d 2012-09-11 15:15:32 +00:00