gwm17/EventBuilder_Skeleton
1
0
Fork 0
mirror of https://github.com/sesps/EventBuilder_Skeleton.git synced 2024-11-10 12:28:51 -05:00
Code Issues Projects Releases Wiki Activity

Fix bug in the coincidence window. Window was in units of ps while the timestamps were converted to ns. Resulting in an effective increase in window of 3 orders of magnitude. Fixed so that now all units are in ns.

Browse Source
This commit is contained in:
Gordon McCann 2022-08-24 17:42:29 -07:00
parent ab08026202
commit d3e6db2387
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/evb/EVBApp.cpp
View File

@ -63,7 +63,7 @@ namespace EventBuilder {
m_params.workspaceDir = data["WorkspaceDir"].as<std::string>(); m_params.workspaceDir = data["WorkspaceDir"].as<std::string>();
m_params.scalerFile = data["ScalerFile"].as<std::string>(); m_params.scalerFile = data["ScalerFile"].as<std::string>();
m_params.timeShiftFile = data["TimeShiftFile"].as<std::string>(); m_params.timeShiftFile = data["TimeShiftFile"].as<std::string>();
m_params.slowCoincidenceWindow = data["SlowCoincidenceWindow(ps)"].as<double>(); m_params.slowCoincidenceWindow = data["SlowCoincidenceWindow(ns)"].as<double>();
m_params.runMin = data["MinRun"].as<int>(); m_params.runMin = data["MinRun"].as<int>();
m_params.runMax = data["MaxRun"].as<int>(); m_params.runMax = data["MaxRun"].as<int>();
m_params.bufferSize = data["BufferSize(hits)"].as<size_t>(); m_params.bufferSize = data["BufferSize(hits)"].as<size_t>();
@ -130,7 +130,7 @@ namespace EventBuilder {
yamlStream << YAML::Key << "WorkspaceDir" << YAML::Value << m_params.workspaceDir; yamlStream << YAML::Key << "WorkspaceDir" << YAML::Value << m_params.workspaceDir;
yamlStream << YAML::Key << "ScalerFile" << YAML::Value << m_params.scalerFile; yamlStream << YAML::Key << "ScalerFile" << YAML::Value << m_params.scalerFile;
yamlStream << YAML::Key << "TimeShiftFile" << YAML::Value << m_params.timeShiftFile; yamlStream << YAML::Key << "TimeShiftFile" << YAML::Value << m_params.timeShiftFile;
yamlStream << YAML::Key << "SlowCoincidenceWindow(ps)" << YAML::Value << m_params.slowCoincidenceWindow; yamlStream << YAML::Key << "SlowCoincidenceWindow(ns)" << YAML::Value << m_params.slowCoincidenceWindow;
yamlStream << YAML::Key << "MinRun" << YAML::Value << m_params.runMin; yamlStream << YAML::Key << "MinRun" << YAML::Value << m_params.runMin;
yamlStream << YAML::Key << "MaxRun" << YAML::Value << m_params.runMax; yamlStream << YAML::Key << "MaxRun" << YAML::Value << m_params.runMax;
yamlStream << YAML::Key << "BufferSize(hits)" << YAML::Value << m_params.bufferSize; yamlStream << YAML::Key << "BufferSize(hits)" << YAML::Value << m_params.bufferSize;

2
src/evb/EVBParameters.h
View File

@ -12,7 +12,7 @@ namespace EventBuilder {
int runMin = 0; int runMin = 0;
int runMax = 0; int runMax = 0;
double slowCoincidenceWindow = 3.0e6; double slowCoincidenceWindow = 3.0e3;
size_t bufferSize = 2000; size_t bufferSize = 2000;
}; };
} }

2
src/guidict/EVBMainFrame.cpp
View File

@ -60,7 +60,7 @@ EVBMainFrame::EVBMainFrame(const TGWindow* p, UInt_t w, UInt_t h) :
NameFrame->AddFrame(ScalerFrame, fhints); NameFrame->AddFrame(ScalerFrame, fhints);
TGHorizontalFrame *WindowFrame = new TGHorizontalFrame(InputFrame, w, h*0.1); TGHorizontalFrame *WindowFrame = new TGHorizontalFrame(InputFrame, w, h*0.1);
TGLabel *slowlabel = new TGLabel(WindowFrame, "Slow Coincidence Window (ps):"); TGLabel *slowlabel = new TGLabel(WindowFrame, "Slow Coincidence Window (ns):");
fSlowWindowField = new TGNumberEntryField(WindowFrame, SLOWWIND, 0, TGNumberEntry::kNESReal, TGNumberEntry::kNEANonNegative); fSlowWindowField = new TGNumberEntryField(WindowFrame, SLOWWIND, 0, TGNumberEntry::kNESReal, TGNumberEntry::kNEANonNegative);
TGLabel *buflabel = new TGLabel(WindowFrame, "Buffer Size (hits):"); TGLabel *buflabel = new TGLabel(WindowFrame, "Buffer Size (hits):");
fBufferSizeField = new TGNumberEntryField(WindowFrame, BUFSIZE, 200000, TGNumberEntry::kNESInteger, TGNumberEntry::kNEANonNegative); fBufferSizeField = new TGNumberEntryField(WindowFrame, BUFSIZE, 200000, TGNumberEntry::kNESInteger, TGNumberEntry::kNEANonNegative);