From 57537a350fe915ac45c45d64b70ba148c70cf19d Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 16 Aug 2017 17:12:23 +0200 Subject: [PATCH] updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver --- .../slsDetector/slsDetector.cpp | 3 +- .../slsDetector/slsDetectorCommand.cpp | 134 ++++++++++-------- 2 files changed, 75 insertions(+), 62 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 927339e57..6d63bcb77 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -6089,7 +6089,8 @@ string slsDetector::setReceiver(string receiverIP){ setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]); setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]); setTimer(ACQUISITION_TIME,thisDetector->timerValue[ACQUISITION_TIME]); - setTimer(SUBFRAME_ACQUISITION_TIME,thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]); + if(thisDetector->myDetectorType == EIGER) + setTimer(SUBFRAME_ACQUISITION_TIME,thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]); setDynamicRange(thisDetector->dynamicRange); if(thisDetector->myDetectorType == EIGER){ setFlippedData(X,-1); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 39fe6e083..250f7477e 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -72,6 +72,31 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncName="test"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdUnderDevelopment; i++; + + /*! \page test + - help Returns a list of possible commands. + */ + descrToFuncMap[i].m_pFuncName="help";//OK + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdHelp; + i++; + + /*! \page test + - exitserver Shuts down all the detector servers. Don't use it!!!! + */ + descrToFuncMap[i].m_pFuncName="exitserver";//OK + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdExitServer; + i++; + + /*! \page test + - exitreceiver Shuts down all the receivers. Don't use it!!!! + */ + descrToFuncMap[i].m_pFuncName="exitreceiver";//OK + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdExitServer; + i++; + + + + /* Acquisition and status commands */ /*! \page acquisition Acquition commands Commands to control the acquisition @@ -111,6 +136,27 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus; i++; + /*! \page acquisition + - readctr Reads the counters from the detector memory (analog detector returning values translated into number of photons - only GOTTHARD). Cannot put. + */ + descrToFuncMap[i].m_pFuncName="readctr"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter; + i++; + + /*! \page acquisition + - resetctr i Resets counter in detector, restarts acquisition if i=1(analog detector returning values translated into number of photons - only GOTTHARD). Cannot put. + */ + descrToFuncMap[i].m_pFuncName="resetctr"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter; + i++; + + /*! \page acquisition + - resmat i sets/resets counter bit in detector.gets the counter bit in detector ???? + */ + descrToFuncMap[i].m_pFuncName="resmat"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter; + i++; + @@ -199,26 +245,33 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSync; i++; - /*! \page test - - help Returns a list of possible commands. + /*! \page config + \section detstatus Detector Status + commands to configure detector status */ - descrToFuncMap[i].m_pFuncName="help";//OK - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdHelp; + + /*! \page config + - online [i] sets the detector in online (1) or offline (0) mode + */ + descrToFuncMap[i].m_pFuncName="online"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; i++; - /*! \page test - - exitserver Shuts down all the detector servers. Don't use it!!!! + /*! \page config + - checkonline returns the hostnames of all detectors without connecting to them */ - descrToFuncMap[i].m_pFuncName="exitserver";//OK - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdExitServer; + descrToFuncMap[i].m_pFuncName="checkonline"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; + i++; + /*! \page config + - activate Activates/Deactivates the detector. Deactivated detector does not send data. Used for EIGER only. + */ + descrToFuncMap[i].m_pFuncName="activate"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; i++; - /*! \page test - - exitreceiver Shuts down all the receivers. Don't use it!!!! - */ - descrToFuncMap[i].m_pFuncName="exitreceiver";//OK - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdExitServer; - i++; + + /* data processing commands */ @@ -346,26 +399,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdImage; i++; - /*! \page acquisition - - readctr Reads the counters from the detector memory (analog detector returning values translated into number of photons - only GOTTHARD). Cannot put. - */ - descrToFuncMap[i].m_pFuncName="readctr"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter; - i++; - /*! \page acquisition - - resetctr i Resets counter in detector, restarts acquisition if i=1(analog detector returning values translated into number of photons - only GOTTHARD). Cannot put. - */ - descrToFuncMap[i].m_pFuncName="resetctr"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter; - i++; - /*! \page acquisition - - resmat i sets/resets counter bit in detector.gets the counter bit in detector ???? - */ - descrToFuncMap[i].m_pFuncName="resmat"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter; - i++; + + /* trim/cal directories */ @@ -431,31 +468,6 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFileIndex; i++; - /*! \page config - \section detstatus Detector Status - commands to configure detector status - */ - - /*! \page config - - online [i] sets the detector in online (1) or offline (0) mode - */ - descrToFuncMap[i].m_pFuncName="online"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; - i++; - - /*! \page config - - checkonline returns the hostnames of all detectors without connecting to them - */ - descrToFuncMap[i].m_pFuncName="checkonline"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; - i++; - /*! \page config - - activate Activates/Deactivates the detector. Deactivated detector does not send data. Used for EIGER only. - */ - descrToFuncMap[i].m_pFuncName="activate"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; - i++; - /*! \page output - enablefwrite [i] Enables/disables file writing. 1 enables, 0 disables. */ @@ -484,6 +496,8 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFileName; i++; + + /* Acquisition actions */ /*! \page actions Actions @@ -595,10 +609,6 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts; i++; - - - - /*! \page actions - scan0script [s] sets/gets the script to be executed for the scan 0 level. \c none unsets. */ @@ -671,6 +681,8 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { i++; + + /* communication configuration */ /*! \page network Network