gwm17/Daqromancy
1
0
Fork 0
mirror of https://github.com/gwm17/Daqromancy.git synced 2024-11-22 10:58:49 -05:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: gwm17:275c19a8b1c8e1d8087c03aab7894f51b34ea3b4
Branches Tags
gwm17:main
...
compare: gwm17:3c145a6ef7c3dbf82f51b18a9a136765cb284560
Branches Tags
gwm17:main

2 Commits
275c19a8b1 ... 3c145a6ef7

Author SHA1 Message Date
Gordon McCann 3c145a6ef7 Really fix digitizer panel 2022-10-07 10:13:43 -04:00
Gordon McCann ffb37d104b Fix bug in digitizer panel for PHA params, do a better job of handling parameter changes. Some testing with pulser into single dgtz, yields some positive results 2022-10-07 10:12:22 -04:00
3 changed files with 15 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
src/Editor/DigitizerPanel.cpp
View File

@ -296,7 +296,7 @@ namespace Daqromancy {
changed = true;
}
ImGui::TableNextColumn();
if (ImGui::InputInt(fmt::format("##flatTopDelay_{0}", i).c_str(), &channel.decayTimeConst, 0, 0))
if (ImGui::InputInt(fmt::format("##flatTopDelay_{0}", i).c_str(), &channel.flatTopDelay, 0, 0))
{
changed = true;
}

21
src/Editor/EditorLayer.cpp
View File

@ -258,24 +258,29 @@ namespace Daqromancy {
if (panel_status)
{
//Update project
m_project->SetDigitizerParameters(panel.GetDigitizerHandle(), panel.GetDigitizerParameters());
if (panel.GetPanelType() == DigitizerPanel::Type::PHA)
int handle = panel.GetDigitizerHandle();
DigitizerPanel::Type type = panel.GetPanelType();
m_project->SetDigitizerParameters(handle, panel.GetDigitizerParameters());
if (type == DigitizerPanel::Type::PHA)
{
m_project->SetPHAParameters(panel.GetDigitizerHandle(), panel.GetPHAChannelParameters());
m_project->SetPHAWaveParameters(panel.GetDigitizerHandle(), panel.GetPHAWaveParameters());
m_project->SetPHAParameters(handle, panel.GetPHAChannelParameters());
m_project->SetPHAWaveParameters(handle, panel.GetPHAWaveParameters());
}
else if (panel.GetPanelType() == DigitizerPanel::Type::PSD)
else if (type == DigitizerPanel::Type::PSD)
{
m_project->SetPSDParameters(panel.GetDigitizerHandle(), panel.GetPSDChannelParameters());
m_project->SetPSDWaveParameters(panel.GetDigitizerHandle(), panel.GetPSDWaveParameters());
m_project->SetPSDParameters(handle, panel.GetPSDChannelParameters());
m_project->SetPSDWaveParameters(handle, panel.GetPSDWaveParameters());
}
else
{
DY_WARN("Unidentified digitizer type attempting to communicate with project");
}
//Emit event to update aquisition side
AcqParametersEvent e(DigitizerAccessType::Single, panel.GetDigitizerHandle());
AcqParametersEvent e(DigitizerAccessType::Single, handle);
m_eventCallback(e);
//Load back any changes CAEN made, sometimes specific numbers are invalid
UpdateDigitizerPanels();
}
}

2
src/Editor/ScopePanel.cpp
View File

@ -56,7 +56,7 @@ namespace Daqromancy {
{
m_selectedBoard = boardArgs.handle;
availChannels = boardArgs.channels;
selectedBoardString = fmt::format("{0}", m_selectedBoard);
selectedBoardString = boardArgs.name;
if (boardArgs.firmware == CAEN_DGTZ_DPPFirmware_PHA)
{
const auto& phaParams = m_project->GetPHAWaveParameters(boardArgs.handle);