gwm17/SPS_SABRE_EventBuilder
1
0
Fork 0
mirror of https://github.com/sesps/SPS_SABRE_EventBuilder.git synced 2024-11-26 11:38:49 -05:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: gwm17:c4557c2b26aea43030d03b324f0c6130cd10fe47
Branches Tags
gwm17:main
gwm17:devel
gwm17:compass_ver1.x
...
compare: gwm17:e9c50331f7b1d3320e318f1d574795af1fb3013e
Branches Tags
gwm17:devel
gwm17:main
gwm17:compass_ver1.x

3 Commits
c4557c2b26 ... e9c50331f7

Author SHA1 Message Date
Gordon McCann e9c50331f7 Fix typo in analyzed file collection 2023-01-16 11:58:19 -05:00
Gordon McCann a264eea63c Fix bug with merging where TChain::Merge implicitly took ownership of TFile and auto close and deleted 2023-01-16 11:32:00 -05:00
Gordon McCann 4886c497a3 Fix bug where merged dir was not set 2023-01-16 10:30:02 -05:00
1 changed files with 15 additions and 2 deletions
Show Stats Expand all files Collapse all files

17
src/evb/EVBWorkspace.cpp
View File

@ -58,6 +58,7 @@ namespace EventBuilder {
m_analyzedDir = m_workspace + "analyzed/"; m_analyzedDir = m_workspace + "analyzed/";
m_histogramDir = m_workspace + "histograms/"; m_histogramDir = m_workspace + "histograms/";
m_cutDir = m_workspace + "cuts/"; m_cutDir = m_workspace + "cuts/";
m_mergedDir = m_workspace + "merged/";
//Check all subdirectories. Terminate if any of them are bad //Check all subdirectories. Terminate if any of them are bad
m_isValid = CheckSubDirectory(m_binaryDir); m_isValid = CheckSubDirectory(m_binaryDir);
@ -79,6 +80,9 @@ namespace EventBuilder {
if(!m_isValid) if(!m_isValid)
return; return;
m_isValid = CheckSubDirectory(m_cutDir); m_isValid = CheckSubDirectory(m_cutDir);
if(!m_isValid)
return;
m_isValid = CheckSubDirectory(m_mergedDir);
} }
std::string EVBWorkspace::GetBinaryRun(int run) std::string EVBWorkspace::GetBinaryRun(int run)
@ -126,9 +130,11 @@ namespace EventBuilder {
std::vector<std::string> list; std::vector<std::string> list;
std::string temp; std::string temp;
for(int run=runMin; run<=runMax; run++) for(int run=runMin; run<=runMax; run++)
{
temp = GetAnalyzedRun(run); temp = GetAnalyzedRun(run);
if(!temp.empty()) if(!temp.empty())
list.push_back(temp); list.push_back(temp);
}
return list; return list;
} }
@ -187,7 +193,7 @@ namespace EventBuilder {
return false; return false;
TFile* output = TFile::Open(outputname.c_str(), "RECREATE"); TFile* output = TFile::Open(outputname.c_str(), "RECREATE");
if(!output->IsOpen()) if(!output || !output->IsOpen())
{ {
EVB_ERROR("Could not open output file {0} for merge", outputname); EVB_ERROR("Could not open output file {0} for merge", outputname);
output->Close(); output->Close();
@ -196,8 +202,15 @@ namespace EventBuilder {
TChain* chain = new TChain("SPSTree", "SPSTree"); TChain* chain = new TChain("SPSTree", "SPSTree");
for(auto& entry : files) for(auto& entry : files)
{
EVB_INFO("Merging file: {0}", entry);
chain->Add(entry.c_str()); chain->Add(entry.c_str());
chain->Merge(output, 0, "fast"); }
//Note: TChain merge is kinda fucked. It requires a file passed in, which it then implicitly takes ownership of.
//By passing the keep option, we tell TChain we want to keep ownership of the file (otherwise it will automatically close and delete)
//We need ownership because the Merge function does not do a good job of handling errors explicitly.
chain->Merge(output, 0, "fast|keep");
output->Close(); output->Close();
return true; return true;
} }