gwm17/Daqromancy
1
0
Fork 0
mirror of https://github.com/gwm17/Daqromancy.git synced 2024-11-26 12:18:52 -05:00
Code Issues Projects Releases Wiki Activity

Compare commits

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

No commits in common. "3c145a6ef7c3dbf82f51b18a9a136765cb284560" and "275c19a8b1c8e1d8087c03aab7894f51b34ea3b4" have entirely different histories.
3c145a6ef7 ... 275c19a8b1

3 changed files with 10 additions and 15 deletions
Show Stats Expand all files Collapse all files

2
src/Editor/DigitizerPanel.cpp
View File

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

21
src/Editor/EditorLayer.cpp
View File

@ -258,29 +258,24 @@ namespace Daqromancy {
if (panel_status) if (panel_status)
{ {
//Update project //Update project
int handle = panel.GetDigitizerHandle(); m_project->SetDigitizerParameters(panel.GetDigitizerHandle(), panel.GetDigitizerParameters());
DigitizerPanel::Type type = panel.GetPanelType(); if (panel.GetPanelType() == DigitizerPanel::Type::PHA)
m_project->SetDigitizerParameters(handle, panel.GetDigitizerParameters());
if (type == DigitizerPanel::Type::PHA)
{ {
m_project->SetPHAParameters(handle, panel.GetPHAChannelParameters()); m_project->SetPHAParameters(panel.GetDigitizerHandle(), panel.GetPHAChannelParameters());
m_project->SetPHAWaveParameters(handle, panel.GetPHAWaveParameters()); m_project->SetPHAWaveParameters(panel.GetDigitizerHandle(), panel.GetPHAWaveParameters());
} }
else if (type == DigitizerPanel::Type::PSD) else if (panel.GetPanelType() == DigitizerPanel::Type::PSD)
{ {
m_project->SetPSDParameters(handle, panel.GetPSDChannelParameters()); m_project->SetPSDParameters(panel.GetDigitizerHandle(), panel.GetPSDChannelParameters());
m_project->SetPSDWaveParameters(handle, panel.GetPSDWaveParameters()); m_project->SetPSDWaveParameters(panel.GetDigitizerHandle(), panel.GetPSDWaveParameters());
} }
else else
{ {
DY_WARN("Unidentified digitizer type attempting to communicate with project"); DY_WARN("Unidentified digitizer type attempting to communicate with project");
} }
//Emit event to update aquisition side //Emit event to update aquisition side
AcqParametersEvent e(DigitizerAccessType::Single, handle); AcqParametersEvent e(DigitizerAccessType::Single, panel.GetDigitizerHandle());
m_eventCallback(e); 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; m_selectedBoard = boardArgs.handle;
availChannels = boardArgs.channels; availChannels = boardArgs.channels;
selectedBoardString = boardArgs.name; selectedBoardString = fmt::format("{0}", m_selectedBoard);
if (boardArgs.firmware == CAEN_DGTZ_DPPFirmware_PHA) if (boardArgs.firmware == CAEN_DGTZ_DPPFirmware_PHA)
{ {
const auto& phaParams = m_project->GetPHAWaveParameters(boardArgs.handle); const auto& phaParams = m_project->GetPHAWaveParameters(boardArgs.handle);