detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-02-26 08:34:41 +00:00
parent 460ffe0549
commit 3075b8ae11
9 changed files with 65 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -1,6 +1,7 @@
#ifndef SLS_DETECTOR_DEFS_H #ifndef SLS_DETECTOR_DEFS_H
#define SLS_DETECTOR_DEFS_H #define SLS_DETECTOR_DEFS_H
#ifdef __CINT__ #ifdef __CINT__
#define MYROOT #define MYROOT
#define __cplusplus #define __cplusplus
@ -544,7 +545,7 @@ enum angleConversionParameter {
#ifndef MYROOT #ifndef MYROOT
#include "sls_detector_funcs.h" #include "sls_detector_funcs.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif

6
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x468 //#define SVNREV 0x469
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x468 #define SVNREV 0x469
#define SVNDATE 0x20130221 #define SVNDATE 0x20130222
// //

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4162,7 +4162,7 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
int *retdet, *p=retval; int *retdet, *p=retval;
string fullFName=""; string fullFName="";
string ext=""; string ext="";
char * pch;
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) { for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
@ -4176,9 +4176,11 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
//concatenate filenames //concatenate filenames
if(!fullFName.length()){ if(!fullFName.length()){
fullFName.assign(fileIO::getFileName()); fullFName.assign(fileIO::getFileName());
size_t dot = fullFName.rfind("."); if (strrchr(fName,'.')!=NULL){
if(dot != string::npos) ext.assign(fName);
ext = fullFName.substr(dot,fullFName.size()-dot); size_t dot = ext.rfind(".");
ext = ext.erase(0,dot);
}
} }
fullFName.append(getReceiverFileNameToConcatenate(fName)); fullFName.append(getReceiverFileNameToConcatenate(fName));
}else { }else {
@ -4347,7 +4349,6 @@ int64_t multiSlsDetector::clearAllErrorMask(){
int multiSlsDetector::calibratePedestal(int frames){ int multiSlsDetector::calibratePedestal(int frames){
int ret=-100, ret1; int ret=-100, ret1;

6
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x431 //#define SVNREV 0x469
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x431 #define SVNREV 0x469
#define SVNDATE 0x20130116 #define SVNDATE 0x20130222
// //

11
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6260,3 +6260,14 @@ int slsDetector::calibratePedestal(int frames){
int64_t slsDetector::clearAllErrorMask(){
clearErrorMask();
for(int i=0;i<parentDet->getNumberOfDetectors();i++){
if(parentDet->getDetectorId(i) == getDetectorId())
parentDet->setErrorMask(parentDet->getErrorMask()|(0<<i));
}
return getErrorMask();
}

62
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1548,6 +1548,38 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/ */
int calibratePedestal(int frames = 0); int calibratePedestal(int frames = 0);
/** Clears error mask and also the bit in parent det multi error mask
/returns error mask
*/
int64_t clearAllErrorMask();
/** returns the detector MAC address\sa sharedSlsDetector */
char* getDetectorMAC() {return thisDetector->detectorMAC;};
/** returns the detector IP address\sa sharedSlsDetector */
char* getDetectorIP() {return thisDetector->detectorIP;};
/** returns the receiver IP address \sa sharedSlsDetector */
char* getReceiver() {return thisDetector->receiver_hostname;};
/** returns the receiver UDP IP address \sa sharedSlsDetector */
char* getReceiverUDPIP() {return thisDetector->receiverUDPIP;};
/** returns the receiver UDP MAC address \sa sharedSlsDetector */
char* getReceiverUDPMAC() {return thisDetector->receiverUDPMAC;};
/** returns the receiver UDP IP address \sa sharedSlsDetector */
char* getReceiverUDPPort() {char *c= new char[MAX_STR_LENGTH];sprintf(c,"%d",thisDetector->receiverUDPPort); return c;};
/** validates the format of detector MAC address and sets it \sa sharedSlsDetector */
char* setDetectorMAC(string detectorMAC);
/** validates the format of detector IP address and sets it \sa sharedSlsDetector */
char* setDetectorIP(string detectorIP);
/** validates and sets the receiver IP address/hostname \sa sharedSlsDetector */
char* setReceiver(string receiver);
/** validates the format of receiver udp ip and sets it \sa sharedSlsDetector */
char* setReceiverUDPIP(string udpip);
/** validates the format of receiver udp mac and sets it \sa sharedSlsDetector */
char* setReceiverUDPMAC(string udpmac);
/** sets the receiver udp port \sa sharedSlsDetector */
int setReceiverUDPPort(int udpport);
protected: protected:
@ -1652,36 +1684,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/ */
int receiveModule(sls_detector_module*); int receiveModule(sls_detector_module*);
/** returns the detector MAC address\sa sharedSlsDetector */
char* getDetectorMAC() {return thisDetector->detectorMAC;};
/** returns the detector IP address\sa sharedSlsDetector */
char* getDetectorIP() {return thisDetector->detectorIP;};
/** returns the receiver IP address \sa sharedSlsDetector */
char* getReceiver() {return thisDetector->receiver_hostname;};
/** returns the receiver UDP IP address \sa sharedSlsDetector */
char* getReceiverUDPIP() {return thisDetector->receiverUDPIP;};
/** returns the receiver UDP MAC address \sa sharedSlsDetector */
char* getReceiverUDPMAC() {return thisDetector->receiverUDPMAC;};
/** returns the receiver UDP IP address \sa sharedSlsDetector */
char* getReceiverUDPPort() {char *c= new char[MAX_STR_LENGTH];sprintf(c,"%d",thisDetector->receiverUDPPort); return c;};
/** validates the format of detector MAC address and sets it \sa sharedSlsDetector */
char* setDetectorMAC(string detectorMAC);
/** validates the format of detector IP address and sets it \sa sharedSlsDetector */
char* setDetectorIP(string detectorIP);
/** validates and sets the receiver IP address/hostname \sa sharedSlsDetector */
char* setReceiver(string receiver);
/** validates the format of receiver udp ip and sets it \sa sharedSlsDetector */
char* setReceiverUDPIP(string udpip);
/** validates the format of receiver udp mac and sets it \sa sharedSlsDetector */
char* setReceiverUDPMAC(string udpmac);
/** sets the receiver udp port \sa sharedSlsDetector */
int setReceiverUDPPort(int udpport);
/** Gets MAC from receiver and sets up UDP Connection */ /** Gets MAC from receiver and sets up UDP Connection */
int setUDPConnection(); int setUDPConnection();

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x468 //#define SVNREV 0x469
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x468 #define SVNREVLIB 0x469
#define SVNDATELIB 0x20130221 #define SVNDATELIB 0x20130222
// //

4
slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h
View File

@ -288,8 +288,8 @@ class fileIOStatic {
size_t uscore=s.find("_"); \ size_t uscore=s.find("_"); \
s=s.substr(uscore,dot-uscore); \ s=s.substr(uscore,dot-uscore); \
uscore=s.find("_",1); \ uscore=s.find("_",1); \
if ((uscore!= string::npos) && (sscanf( s.substr(1,uscore-1).c_str(),"d%d",&i))) \ //if ((uscore!= string::npos) && (sscanf( s.substr(1,uscore-1).c_str(),"d%d",&i)))
s=s.substr(uscore,s.size()-uscore); \ //s=s.substr(uscore,s.size()-uscore);
return s; \ return s; \
}; };

6
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x451 //#define SVNREV 0x469
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x451 #define SVNREV 0x469
#define SVNDATE 0x20130205 #define SVNDATE 0x20130222
// //