Skip to content

Some jank for sum waveform #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darrylmasson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Some jank for sum waveform #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98cd0b4
Some jank for sum waveform
Jul 18, 2022
a5252b4
Inits to some default value
Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion V1724.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ V1724::V1724(std::shared_ptr<MongoLog>& log, std::shared_ptr<Options>& opts, int
fPreTrigChRegister = 0x1038;
fError = false;
fBufferSize = 0x800000; // 8 MB total memory
fSumWFthreshold = 75; // some reasonable default

fSampleWidth = 10;
fClockCycle = 10;
Expand Down Expand Up @@ -239,7 +240,15 @@ int V1724::Read(std::unique_ptr<data_packet>& outptr){
// we're busy, let's check which channel
std::string msg = "Board " + std::to_string(fBID) + " is BUSY:";
for (unsigned ch = 0; ch < fNChannels; ch++) {
if (ReadRegister(fChStatusRegister + 0x100*ch) & 0x1) msg += " CH" + std::to_string(ch);
if (ReadRegister(fChStatusRegister + 0x100*ch) & 0x1) {
msg += " CH" + std::to_string(ch);
if (fBID == 1390 && ch == 0) {
// sumwf went busy, must raise its threshold
fSumWFthreshold += 5;
fLog->Entry(MongoLog::Warning, "Raising sum wf threshold to %d", fSumWFthreshold);
WriteRegister(fChTrigRegister, fSumWFthreshold);
}
}
}
fLog->Entry(MongoLog::Local, msg);
}
Expand Down Expand Up @@ -293,6 +302,7 @@ int V1724::LoadDAC(std::vector<uint16_t>& dac_values){

int V1724::SetThresholds(std::vector<uint16_t> vals) {
int ret = 0;
if (fBID == 1390 && vals.size() > 0) fSumWFthreshold = vals[0];
for (unsigned ch = 0; ch < fNChannels; ch++)
ret += WriteRegister(fChTrigRegister + 0x100*ch, vals[ch]);
return ret;
Expand Down
1 change: 1 addition & 0 deletions V1724.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ protected:
int fDefaultDelay;
int fDefaultPreTrig;
int fRegisterFlags;
int fSumWFthreshold;

// Stuff for clock reset tracking
int fRolloverCounter;
Expand Down