gwm17/SPS_SABRE_EventBuilder
1
0
Fork 0
mirror of https://github.com/sesps/SPS_SABRE_EventBuilder.git synced 2024-09-20 22:27:25 -04:00
Code Issues Projects Releases Wiki Activity

Simplified file API slightly by modifying the algorithm to sort hits from files in CompassRun

Browse Source
This commit is contained in:
Gordon McCann 2022-07-13 10:52:22 -04:00
parent 99ce58a01c
commit 935e6be0f6
3 changed files with 29 additions and 36 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 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 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 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 void AttachShiftMap(ShiftMap* map) { m_smap = map; }
inline unsigned int GetSize() const { return m_size; } inline unsigned int GetSize() const { return m_size; }
inline unsigned int GetNumberOfHits() const { return m_nHits; } inline unsigned int GetNumberOfHits() const { return m_nHits; }

58
src/evb/CompassRun.cpp
View File

@ -114,43 +114,35 @@ namespace EventBuilder {
/* /*
GetHitsFromFiles() is the function which actually retrieves and sorts the data from the individual 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 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
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
that index all together. In this way, the loop can go from N times to N-1 times. that index all together. In this way, the loop can go from N times to N-1 times.
*/ */
bool CompassRun::GetHitsFromFiles() bool CompassRun::GetHitsFromFiles()
{ {
std::pair<CompassHit, bool*> earliestHit = std::make_pair(CompassHit(), nullptr); //std::pair<CompassHit, bool*> earliestHit = std::make_pair(CompassHit(), nullptr);
CompassFile* earliestHit = nullptr;
for(unsigned int i=startIndex; i<m_datafiles.size(); i++) for(unsigned int i=startIndex; i<m_datafiles.size(); i++)
{ {
if(m_datafiles[i].CheckHitHasBeenUsed()) if(m_datafiles[i].CheckHitHasBeenUsed())
{
m_datafiles[i].GetNextHit(); m_datafiles[i].GetNextHit();
}
if(m_datafiles[i].IsEOF()) if(m_datafiles[i].IsEOF())
{ {
if(i == startIndex) if(i == startIndex)
startIndex++; startIndex++;
continue; continue;
}
else if(i == 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());
} }
else if(i == startIndex) //start with first in the list
earliestHit = &m_datafiles[i];
else if(m_datafiles[i].GetCurrentHit().timestamp < earliestHit->GetCurrentHit().timestamp) //if earlier
earliestHit = &m_datafiles[i];
} }
if(earliestHit.second == nullptr) if(earliestHit == nullptr)
return false; //Make sure that there actually was a hit return false; //Make sure that there actually was a hit
hit = earliestHit.first; m_hit = earliestHit->GetCurrentHit();
*earliestHit.second = true; earliestHit->SetHitHasBeenUsed();
return true; return true;
} }
@ -158,12 +150,12 @@ namespace EventBuilder {
TFile* output = TFile::Open(name.c_str(), "RECREATE"); TFile* output = TFile::Open(name.c_str(), "RECREATE");
TTree* outtree = new TTree("Data", "Data"); TTree* outtree = new TTree("Data", "Data");
outtree->Branch("Board", &hit.board); outtree->Branch("Board", &m_hit.board);
outtree->Branch("Channel", &hit.channel); outtree->Branch("Channel", &m_hit.channel);
outtree->Branch("Energy", &hit.energy); outtree->Branch("Energy", &m_hit.energy);
outtree->Branch("EnergyShort", &hit.energyShort); outtree->Branch("EnergyShort", &m_hit.energyShort);
outtree->Branch("Timestamp", &hit.timestamp); outtree->Branch("Timestamp", &m_hit.timestamp);
outtree->Branch("Flags", &hit.flags); outtree->Branch("Flags", &m_hit.flags);
if(!m_smap.IsValid()) if(!m_smap.IsValid())
{ {
@ -211,6 +203,7 @@ namespace EventBuilder {
TFile* output = TFile::Open(name.c_str(), "RECREATE"); TFile* output = TFile::Open(name.c_str(), "RECREATE");
TTree* outtree = new TTree("SortTree", "SortTree"); TTree* outtree = new TTree("SortTree", "SortTree");
CoincEvent event;
outtree->Branch("event", &event); outtree->Branch("event", &event);
if(!m_smap.IsValid()) if(!m_smap.IsValid())
@ -249,7 +242,7 @@ namespace EventBuilder {
killFlag = true; killFlag = true;
} }
else else
coincidizer.AddHitToEvent(hit); coincidizer.AddHitToEvent(m_hit);
if(coincidizer.IsEventReady()) if(coincidizer.IsEventReady())
{ {
@ -274,6 +267,7 @@ namespace EventBuilder {
TFile* output = TFile::Open(name.c_str(), "RECREATE"); TFile* output = TFile::Open(name.c_str(), "RECREATE");
TTree* outtree = new TTree("SortTree", "SortTree"); TTree* outtree = new TTree("SortTree", "SortTree");
CoincEvent event;
outtree->Branch("event", &event); outtree->Branch("event", &event);
if(!m_smap.IsValid()) if(!m_smap.IsValid())
@ -319,8 +313,8 @@ namespace EventBuilder {
} }
else else
{ {
flagger.CheckFlag(hit.board, hit.channel, hit.flags); flagger.CheckFlag(m_hit.board, m_hit.channel, m_hit.flags);
coincidizer.AddHitToEvent(hit); coincidizer.AddHitToEvent(m_hit);
} }
if(coincidizer.IsEventReady()) if(coincidizer.IsEventReady())
@ -354,6 +348,7 @@ namespace EventBuilder {
TFile* output = TFile::Open(name.c_str(), "RECREATE"); TFile* output = TFile::Open(name.c_str(), "RECREATE");
TTree* outtree = new TTree("SPSTree", "SPSTree"); TTree* outtree = new TTree("SPSTree", "SPSTree");
ProcessedEvent pevent;
outtree->Branch("event", &pevent); outtree->Branch("event", &pevent);
if(!m_smap.IsValid()) if(!m_smap.IsValid())
@ -408,7 +403,7 @@ namespace EventBuilder {
} }
else else
{ {
coincidizer.AddHitToEvent(hit); coincidizer.AddHitToEvent(m_hit);
} }
if(coincidizer.IsEventReady()) if(coincidizer.IsEventReady())
@ -441,6 +436,7 @@ namespace EventBuilder {
TFile* output = TFile::Open(name.c_str(), "RECREATE"); TFile* output = TFile::Open(name.c_str(), "RECREATE");
TTree* outtree = new TTree("SPSTree", "SPSTree"); TTree* outtree = new TTree("SPSTree", "SPSTree");
ProcessedEvent pevent;
outtree->Branch("event", &pevent); outtree->Branch("event", &pevent);
if(!m_smap.IsValid()) if(!m_smap.IsValid())
@ -499,8 +495,8 @@ namespace EventBuilder {
} }
else else
{ {
flagger.CheckFlag(hit.board, hit.channel, hit.flags); flagger.CheckFlag(m_hit.board, m_hit.channel, m_hit.flags);
coincidizer.AddHitToEvent(hit); coincidizer.AddHitToEvent(m_hit);
} }
if(coincidizer.IsEventReady()) if(coincidizer.IsEventReady())

6
src/evb/CompassRun.h
View File

@ -50,10 +50,8 @@ namespace EventBuilder {
ShiftMap m_smap; ShiftMap m_smap;
std::unordered_map<std::string, TParameter<Long64_t>> m_scaler_map; //maps scaler files to the TParameter to be saved std::unordered_map<std::string, TParameter<Long64_t>> m_scaler_map; //maps scaler files to the TParameter to be saved
//Potential branch variables //Raw hit
CompassHit hit; CompassHit m_hit;
CoincEvent event;
ProcessedEvent pevent;
//what run is this //what run is this
int m_runNum; int m_runNum;