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

rtang:release

rtang:raisor

rtang:optsb

rtang:ANASEN

rtang:canvas

Conversation 0 Commits 35 Files Changed 31 +2197 -677

calemhoffman commented 2024-12-02 14:42:41 -05:00

Collaborator

Copy Link

No description provided.

calemhoffman added 34 commits 2024-12-02 14:42:42 -05:00

25d074a393 update the master branch from 0ee20bc

2f55f6ecb5 add software waveform decimation to reduce raw data file size

256390ffaf added SW Decimation on the Digi setting panle for QDC. this setting is not saved in setting file

fa3e015e3e Created an artifical Register 0x8044 for SWDecimation. Simplify a lot of things

83fbea2743 bug fix on Histogram2D

f8b9abc70d remove any UpdatePlot in SingleSpectra::FillHistogram

84b89cb36a change the SingleSpectra::FillHistogram() Algorithm

88823af2c6 change the Decimation for QDC to be average of 2^n

c2e76c75ae comment out printf

3f007cebbd comment out more

921580a6c6 small bug fix for Filling Historgam when trigge rate > 10k

2e9a64ccfd Histogram2D, nan value is transperant

d67dc8d3ed add elog port number

9367670a53 bug fix of Scope, only-1-channel for QDC

ae567c0714 improve scope for QDC and PSD, add subChannelMask in Scope

4e111085c0 in ClassDigitizer, get data can use totalIndex, which will % dataSize. simplify HistFilling. Qthread will block mainGUI ?

804fa07c9c add QCoreApplication::processEvent() to solve the GUI lagging

39f479534e simplify SingleSpectra.cpp

ae0e0f2c7b add ClassData::GetAbsDataIndex()

0d379fec92 use AbsDataIndex in MultiBuilder

b8011bc834 [Major] True parallel thread for filling histogram

fe6bdb82ff simplify code for multi thread

4ab72dc43d fix all code with parallel thread

8b7d93a9fe When open digi setting or Scope, update settings from memory

c7feaec471 small improvement, Event/Agg for PHA/PSD < 512

e856a1cddf fix copy channels

1562d9cab2 add QDC group copy

4eca8eb09a fix a bug for PHA

2be9d34320 UI bugs fix

81b2fba623 Rename trigger : Independent --> Normal, Trig Valid, from Both From Mather Board to Both from TRG_VAL; More GUI bugs fix for trigger related settings

9bdd6b77eb seperate out ProgramChannel from ProgramBoard in Digitizer Class

c1f223532c added a button on the channel setting to set default channel settings for Si-detector

d3f97358e2 QDC, Add the OverThresholdWidth setting, but only for ROC > 4.15 and AMC > 135.15

770d2c5af4 I tested with QDC AMC version 135.17, the Overthreshold is working.

rtang added 1 commit 2024-12-07 14:35:19 -05:00

96818dae99

Create LICENSE

This pull request has changes conflicting with the target branch.

• FSUDAQ.cpp
• FSUDAQ_Qt6.pro
• MultiBuilder.cpp
• SingleSpectra.cpp
• SingleSpectra.h
• analyzers/Cross.h

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin master:master

git checkout master

Merge

Merge the changes and update on Gitea.

git checkout raisor

git merge --no-ff master

git checkout raisor

git merge --ff-only master

git checkout master

git rebase raisor

git checkout raisor

git merge --no-ff master

git checkout raisor

git merge --squash master

git checkout raisor

git merge --ff-only master

git checkout raisor

git merge master

git push origin raisor

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: rtang/FSUDAQ_Qt6#1

No description provided.