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

Merge branch 'developer' into dev/911/fix_m3_trimbits_badchannels

Browse Source
This commit is contained in:
maliakal_d 2025-04-09 18:21:19 +02:00
commit 585c92be66
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/sls/Pattern.h
View File

@ -23,7 +23,7 @@ typedef struct __attribute__((packed)) {
#ifdef __cplusplus #ifdef __cplusplus
class Pattern { class Pattern {
patternParameters *pat = new patternParameters{}; patternParameters *pat = new patternParameters{};
std::ostream& stream(std::ostream &os) const; std::ostream &stream(std::ostream &os) const;
public: public:
Pattern(); Pattern();

15
slsDetectorSoftware/src/Pattern.cpp
View File

@ -243,10 +243,10 @@ size_t Pattern::load(const std::string &fname) {
return numPatWords; return numPatWords;
} }
std::ostream& Pattern::stream(std::ostream &os) const{ std::ostream &Pattern::stream(std::ostream &os) const {
for (uint32_t i = pat->limits[0]; i <= pat->limits[1]; ++i) { for (uint32_t i = pat->limits[0]; i <= pat->limits[1]; ++i) {
os << "patword " << ToStringHex(i, 4) << " " os << "patword " << ToStringHex(i, 4) << " "
<< ToStringHex(pat->word[i], 16) << std::endl; << ToStringHex(pat->word[i], 16) << std::endl;
} }
// patioctrl // patioctrl
@ -254,13 +254,12 @@ std::ostream& Pattern::stream(std::ostream &os) const{
// patlimits // patlimits
os << "patlimits " << ToStringHex(pat->limits[0], 4) << " " os << "patlimits " << ToStringHex(pat->limits[0], 4) << " "
<< ToStringHex(pat->limits[1], 4) << std::endl; << ToStringHex(pat->limits[1], 4) << std::endl;
for (size_t i = 0; i < MAX_PATTERN_LEVELS; ++i) { for (size_t i = 0; i < MAX_PATTERN_LEVELS; ++i) {
// patloop // patloop
os << "patloop " << i << " " os << "patloop " << i << " " << ToStringHex(pat->startloop[i], 4) << " "
<< ToStringHex(pat->startloop[i], 4) << " " << ToStringHex(pat->stoploop[i], 4) << std::endl;
<< ToStringHex(pat->stoploop[i], 4) << std::endl;
// patnloop // patnloop
os << "patnloop " << i << " " << pat->nloop[i] << std::endl; os << "patnloop " << i << " " << pat->nloop[i] << std::endl;
} }
@ -268,10 +267,10 @@ std::ostream& Pattern::stream(std::ostream &os) const{
for (size_t i = 0; i < MAX_PATTERN_LEVELS; ++i) { for (size_t i = 0; i < MAX_PATTERN_LEVELS; ++i) {
// patwait // patwait
os << "patwait " << i << " " << ToStringHex(pat->wait[i], 4) os << "patwait " << i << " " << ToStringHex(pat->wait[i], 4)
<< std::endl; << std::endl;
// patwaittime // patwaittime
os << "patwaittime " << i << " " << pat->waittime[i]; os << "patwaittime " << i << " " << pat->waittime[i];
if (i<MAX_PATTERN_LEVELS-1) if (i < MAX_PATTERN_LEVELS - 1)
os << std::endl; os << std::endl;
} }
return os; return os;

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -9,4 +9,4 @@
#define APIMOENCH "developer 0x250310" #define APIMOENCH "developer 0x250310"
#define APIEIGER "developer 0x250310" #define APIEIGER "developer 0x250310"
#define APIXILINXCTB "developer 0x250311" #define APIXILINXCTB "developer 0x250311"
#define APIJUNGFRAU "developer 0x250318" #define APIJUNGFRAU "developer 0x250318"