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

Simplified file API slightly by modifying algorithm to sort hits.

Browse Source
This commit is contained in:
Gordon McCann 2022-07-14 16:47:12 -04:00
parent 24df93a0f7
commit 4ab4023565
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/evb/CompassFile.h
View File

@ -35,7 +35,6 @@ namespace EventBuilder {
inline bool CheckHitHasBeenUsed() const { return m_hitUsedFlag; } //query to find out if we've used the current hit
inline void SetHitHasBeenUsed() { m_hitUsedFlag = true; } //flip the flag to indicate the current hit has been used
inline bool IsEOF() const { return m_eofFlag; } //see if we've read all available data
inline bool* GetUsedFlagPtr() { return &m_hitUsedFlag; }
inline void AttachShiftMap(ShiftMap* map) { m_smap = map; }
inline unsigned int GetSize() const { return m_size; }
inline unsigned int GetNumberOfHits() const { return m_nHits; }

24
src/evb/CompassRun.cpp
View File

@ -108,17 +108,13 @@ namespace EventBuilder {
/*
GetHitsFromFiles() is the function which actually retrieves and sorts the data from the individual
files. There are several tricks which allow this to happen. First is that, after sorting, it is impossible
to determine which file the data originally came from (short of parsing the name of the file against board/channel).
However, we need to let the file know that we want it to pull the next hit. To do this, a pointer to the UsedFlag of the file
is retrieved along with the data. This flag is flipped so that on the next hit cycle a new hit is pulled. Second is the use
of a rolling start index. Once a file has gone EOF, we no longer need it. If this is the first file in the list, we can just skip
files. Once a file has gone EOF, we no longer need it. If this is the first file in the list, we can just skip
that index all together. In this way, the loop can go from N times to N-1 times.
*/
bool CompassRun::GetHitsFromFiles()
{
std::pair<CompassHit, bool*> earliestHit = std::make_pair(CompassHit(), nullptr);
CompassFile* earliestHit = nullptr;
for(unsigned int i=m_startIndex; i<m_datafiles.size(); i++)
{
if(m_datafiles[i].CheckHitHasBeenUsed())
@ -131,19 +127,15 @@ namespace EventBuilder {
continue;
}
else if(i == m_startIndex)
{
earliestHit = std::make_pair(m_datafiles[i].GetCurrentHit(), m_datafiles[i].GetUsedFlagPtr());
}
else if(m_datafiles[i].GetCurrentHit().timestamp < earliestHit.first.timestamp)
{
earliestHit = std::make_pair(m_datafiles[i].GetCurrentHit(), m_datafiles[i].GetUsedFlagPtr());
}
earliestHit = &m_datafiles[i];
else if(m_datafiles[i].GetCurrentHit().timestamp < earliestHit->GetCurrentHit().timestamp)
earliestHit = &m_datafiles[i];
}
if(earliestHit.second == nullptr)
if(earliestHit == nullptr)
return false; //Make sure that there actually was a hit
m_hit = earliestHit.first;
*earliestHit.second = true;
m_hit = earliestHit->GetCurrentHit();
earliestHit->SetHitHasBeenUsed();
return true;
}

6
src/evb/EVBApp.cpp
View File

@ -57,6 +57,12 @@ namespace EventBuilder {
std::getline(input, junk);
input>>junk>>m_params.workspaceDir;
m_workspace.reset(new EVBWorkspace(m_params.workspaceDir));
if(!m_workspace->IsValid())
{
EVB_ERROR("Unable to process new parameters due to bad workspace");
return false;
}
input>>junk;
std::getline(input, junk);
std::getline(input, junk);