detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

changes for merges from 2.3 incl standard packet header

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-20 11:22:07 +01:00
parent cad8ffc0c6 1ab80b0517
commit 911ff49238
7 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 1b28feb21b0963439560b102ef572f070d77ed77 Repsitory UUID: f54cba156ce79a2b50445326a8ca4d1dc7d3cc5a
Revision: 272 Revision: 273
Branch: hdf5 Branch: 2.3-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1345 Last Changed Rev: 1335
Last Changed Date: 2017-03-03 09:05:40 +0100 Last Changed Date: 2017-03-20 09:27:38 +0100

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "1b28feb21b0963439560b102ef572f070d77ed77" #define SVNREPUUID "f54cba156ce79a2b50445326a8ca4d1dc7d3cc5a"
//#define SVNREV 0x1345 //#define SVNREV 0x1335
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1345 #define SVNREV 0x1335
#define SVNDATE 0x20170303 #define SVNDATE 0x20170320
// //

9
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,18 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
<<<<<<< HEAD
Repsitory UUID: 1b28feb21b0963439560b102ef572f070d77ed77 Repsitory UUID: 1b28feb21b0963439560b102ef572f070d77ed77
Revision: 1345 Revision: 1345
Branch: hdf5 Branch: hdf5
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1345 Last Changed Rev: 1345
Last Changed Date: 2017-03-03 09:05:40 +0100 Last Changed Date: 2017-03-03 09:05:40 +0100
=======
Repsitory UUID: f54cba156ce79a2b50445326a8ca4d1dc7d3cc5a
Revision: 1335
Branch: 2.3-rc
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1335
Last Changed Date: 2017-03-20 09:27:38 +0100
>>>>>>> 2.3

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5189,7 +5189,7 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size, int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size,
uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename){ uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename) {
if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename)) if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename))
return FAIL; return FAIL;

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1438,8 +1438,8 @@ private:
* @param subframeIndex address of subframe index * @param subframeIndex address of subframe index
* @param filename address of file name * @param filename address of file name
*/ */
int getData(const int isocket, const bool masking, int* image, const int size, int getData(const int isocket, const bool masking, int* image, const int size, uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename);
uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename);
/** Ensures if sockets created successfully */ /** Ensures if sockets created successfully */
bool dataSocketsStarted; bool dataSocketsStarted;

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "1b28feb21b0963439560b102ef572f070d77ed77" #define SVNREPUUIDLIB "f54cba156ce79a2b50445326a8ca4d1dc7d3cc5a"
//#define SVNREV 0x1345 //#define SVNREV 0x1335
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1345 #define SVNREVLIB 0x1335
#define SVNDATELIB 0x20170303 #define SVNDATELIB 0x20170320
// //

38
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -651,10 +651,6 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++; i++;
descrToFuncMap[i].m_pFuncName="ib_test_c"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++;
descrToFuncMap[i].m_pFuncName="dac0"; // descrToFuncMap[i].m_pFuncName="dac0"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++; i++;
@ -912,6 +908,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
i++; i++;
descrToFuncMap[i].m_pFuncName="probesl"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
i++;
// descrToFuncMap[i].m_pFuncName="progress"; // descrToFuncMap[i].m_pFuncName="progress";
// descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
// i++; // i++;
@ -1972,9 +1972,9 @@ string slsDetectorCommand::cmdEnablefwrite(int narg, char *args[], int action){
string slsDetectorCommand::helpEnablefwrite(int narg, char *args[], int action){ string slsDetectorCommand::helpEnablefwrite(int narg, char *args[], int action){
ostringstream os; ostringstream os;
if (action==GET_ACTION || action==HELP_ACTION) if (action==GET_ACTION || action==HELP_ACTION)
os << string("When Enabled writes the data into the file\n"); os << string("enablefwrite \t When Enabled writes the data into the file\n");
if (action==PUT_ACTION || action==HELP_ACTION) if (action==PUT_ACTION || action==HELP_ACTION)
os << string(" i \t should be 1 or 0 or -1\n"); os << string("enablefwrite i \t should be 1 or 0 or -1\n");
return os.str(); return os.str();
} }
@ -2004,9 +2004,9 @@ string slsDetectorCommand::cmdOverwrite(int narg, char *args[], int action){
string slsDetectorCommand::helpOverwrite(int narg, char *args[], int action){ string slsDetectorCommand::helpOverwrite(int narg, char *args[], int action){
ostringstream os; ostringstream os;
if (action==GET_ACTION || action==HELP_ACTION) if (action==GET_ACTION || action==HELP_ACTION)
os << string("When Enabled overwrites files\n"); os << string("overwrite \t When Enabled overwrites files\n");
if (action==PUT_ACTION || action==HELP_ACTION) if (action==PUT_ACTION || action==HELP_ACTION)
os << string(" i \t should be 1 or 0 or -1\n"); os << string("overwrite i \t should be 1 or 0 or -1\n");
return os.str(); return os.str();
} }
@ -2036,7 +2036,7 @@ string slsDetectorCommand::helpFileIndex(int narg, char *args[], int action){
if (action==GET_ACTION || action==HELP_ACTION) if (action==GET_ACTION || action==HELP_ACTION)
os << string("index \t gets the file index for the next the data file\n"); os << string("index \t gets the file index for the next the data file\n");
if (action==PUT_ACTION || action==HELP_ACTION) if (action==PUT_ACTION || action==HELP_ACTION)
os << string("fname i \t sets the fileindex for the next data file\n"); os << string("index i \t sets the fileindex for the next data file\n");
return os.str(); return os.str();
} }
@ -2912,7 +2912,7 @@ string slsDetectorCommand::helpNetworkParameter(int narg, char *args[], int acti
os << "txndelay_left \n gets detector transmission delay of the left port"<< std::endl; os << "txndelay_left \n gets detector transmission delay of the left port"<< std::endl;
os << "txndelay_right \n gets detector transmission delay of the right port"<< std::endl; os << "txndelay_right \n gets detector transmission delay of the right port"<< std::endl;
os << "txndelay_frame \n gets detector transmission delay of the entire frame"<< std::endl; os << "txndelay_frame \n gets detector transmission delay of the entire frame"<< std::endl;
os << "flowcontrol_10g \n sets flow control for 10g for eiger"<< std::endl; os << "flowcontrol_10g \n gets flow control for 10g for eiger"<< std::endl;
} }
return os.str(); return os.str();
@ -4005,13 +4005,13 @@ string slsDetectorCommand::helpDAC(int narg, char *args[], int action) {
os << "dac0 " << "\t gets dac 0" << std::endl; os << "dac0 " << "\t gets dac 0" << std::endl;
os << "dac1 " << "\t gets dac 0" << std::endl; os << "dac1 " << "\t gets dac 1" << std::endl;
os << "dac2 " << "\t gets dac 0" << std::endl; os << "dac2 " << "\t gets dac 2" << std::endl;
os << "dac3 " << "\t gets dac 0" << std::endl; os << "dac3 " << "\t gets dac 3" << std::endl;
os << "dac4 " << "\t gets dac 0" << std::endl; os << "dac4 " << "\t gets dac 4" << std::endl;
os << "dac5 " << "\t gets dac 0" << std::endl; os << "dac5 " << "\t gets dac 5" << std::endl;
os << "dac6 " << "\t gets dac 0" << std::endl; os << "dac6 " << "\t gets dac 6" << std::endl;
os << "dac7 " << "\t gets dac 0" << std::endl; os << "dac7 " << "\t gets dac 7" << std::endl;
os << "vsvp" << "dacu\t gets vsvp" << std::endl; os << "vsvp" << "dacu\t gets vsvp" << std::endl;
os << "vsvn" << "dacu\t gets vsvn" << std::endl; os << "vsvn" << "dacu\t gets vsvn" << std::endl;
@ -4595,11 +4595,13 @@ string slsDetectorCommand::helpAdvanced(int narg, char *args[], int action) {
os << "programfpga f \t programs the fpga with file f (with .pof extension)." << std::endl; os << "programfpga f \t programs the fpga with file f (with .pof extension)." << std::endl;
os << "resetfpga f \t resets fpga, f can be any value" << std::endl; os << "resetfpga f \t resets fpga, f can be any value" << std::endl;
os << "powerchip i \t powers on or off the chip. i = 1 for on, i = 0 for off" << std::endl;
} }
if (action==GET_ACTION || action==HELP_ACTION) { if (action==GET_ACTION || action==HELP_ACTION) {
os << "extsig:i \t gets the mode of the external signal i. can be \n \t \t \t off, \n \t \t \t gate_in_active_high, \n \t \t \t gate_in_active_low, \n \t \t \t trigger_in_rising_edge, \n \t \t \t trigger_in_falling_edge, \n \t \t \t ro_trigger_in_rising_edge, \n \t \t \t ro_trigger_in_falling_edge, \n \t \t \t gate_out_active_high, \n \t \t \t gate_out_active_low, \n \t \t \t trigger_out_rising_edge, \n \t \t \t trigger_out_falling_edge, \n \t \t \t ro_trigger_out_rising_edge, \n \t \t \t ro_trigger_out_falling_edge" << std::endl; os << "extsig:i \t gets the mode of the external signal i. can be \n \t \t \t off, \n \t \t \t gate_in_active_high, \n \t \t \t gate_in_active_low, \n \t \t \t trigger_in_rising_edge, \n \t \t \t trigger_in_falling_edge, \n \t \t \t ro_trigger_in_rising_edge, \n \t \t \t ro_trigger_in_falling_edge, \n \t \t \t gate_out_active_high, \n \t \t \t gate_out_active_low, \n \t \t \t trigger_out_rising_edge, \n \t \t \t trigger_out_falling_edge, \n \t \t \t ro_trigger_out_rising_edge, \n \t \t \t ro_trigger_out_falling_edge" << std::endl;
os << "flags \t gets the readout flags. can be none, storeinram, tot, continous, parallel, nonparallel, safe, digital, analog_digital, unknown" << std::endl; os << "flags \t gets the readout flags. can be none, storeinram, tot, continous, parallel, nonparallel, safe, unknown" << std::endl;
os << "powerchip \t gets if the chip has been powered on or off" << std::endl;
} }
return os.str(); return os.str();