rtang/FSUDAQ_Qt6
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 3 Wiki Activity

master with all recent fixes into the raisor branch for work this week #1

Open
calemhoffman wants to merge 35 commits from master into raisor
pull from: master
merge into: rtang:raisor
Conversation 0 Commits 35 Files Changed 31 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f007cebbd - Show all commits

6
ClassData.h
View File

@ -537,9 +537,9 @@ inline void Data::SaveData(){
sampleSize = (word & 0xFFF) * 8;
bool isExtra = ( (word >> 28 ) & 0x1 );
chAggSize = 2 + sampleSize / 2 + isExtra;
uint32_t oldWord = word;
uint32_t newSampleSize = sampleSize / Deci;
word = (word & 0xFFFFF000) + (newSampleSize / 8 ); // change the number of sample
// uint32_t oldWord = word;
// word = (word & 0xFFFFF000) + (newSampleSize / 8 ); // change the number of sample
// printf("============= Sample Size : %d | Ch Size : %d | old %08X new %08X\n", sampleSize, chAggSize, oldWord, word);
int nEvent = (groupAggSize - 2 ) / chAggSize;
@ -554,7 +554,7 @@ inline void Data::SaveData(){
fwrite(&oldHeader3, sizeof(uint32_t), 1, outFile);
uint32_t newAggHeader0 = (0x8 << 28) + newGroupAggSize ; // add decimation factor in the word
uint32_t newAggHeader1 = word + (decimation << 12); // add decimation factor in the word
uint32_t newAggHeader1 = (word & 0xFFFFF000) + (newSampleSize / 8 ) + (decimation << 12); // add decimation factor in the word
fwrite(&newAggHeader0, sizeof(uint32_t), 1, outFile);
fwrite(&newAggHeader1, sizeof(uint32_t), 1, outFile);