gwm17/SPS_SABRE_EventBuilder
1
0
Fork 0
mirror of https://github.com/sesps/SPS_SABRE_EventBuilder.git synced 2024-11-22 10:08:50 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from sesps/main

Browse Source 
Send bug fixes to devel
This commit is contained in:
Gordon McCann 2023-05-17 16:40:43 -04:00 committed by GitHub
parent 51d97d1755 45763dce66
commit ca0a7066df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/evb/CompassFile.cpp
View File

@ -42,6 +42,7 @@ namespace EventBuilder {
m_eofFlag = false;
m_hitUsedFlag = true;
m_filename = filename;
m_nHits = 0;
m_file->open(m_filename, std::ios::binary | std::ios::in);
m_file->seekg(0, std::ios_base::end);
m_size = m_file->tellg();

17
src/evb/EVBWorkspace.cpp
View File

@ -58,6 +58,7 @@ namespace EventBuilder {
m_analyzedDir = m_workspace + "analyzed/";
m_histogramDir = m_workspace + "histograms/";
m_cutDir = m_workspace + "cuts/";
m_mergedDir = m_workspace + "merged/";
//Check all subdirectories. Terminate if any of them are bad
m_isValid = CheckSubDirectory(m_binaryDir);
@ -79,6 +80,9 @@ namespace EventBuilder {
if(!m_isValid)
return;
m_isValid = CheckSubDirectory(m_cutDir);
if(!m_isValid)
return;
m_isValid = CheckSubDirectory(m_mergedDir);
}
std::string EVBWorkspace::GetBinaryRun(int run)
@ -126,9 +130,11 @@ namespace EventBuilder {
std::vector<std::string> list;
std::string temp;
for(int run=runMin; run<=runMax; run++)
{
temp = GetAnalyzedRun(run);
if(!temp.empty())
list.push_back(temp);
}
return list;
}
@ -187,7 +193,7 @@ namespace EventBuilder {
return false;
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);
output->Close();
@ -196,8 +202,15 @@ namespace EventBuilder {
TChain* chain = new TChain("SPSTree", "SPSTree");
for(auto& entry : files)
{
EVB_INFO("Merging file: {0}", entry);
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();
return true;
}

2
src/evb/SFPPlotter.cpp
View File

@ -54,7 +54,7 @@ namespace EventBuilder {
/*Makes histograms where only rejection is unset data*/
void SFPPlotter::MakeUncutHistograms(const ProcessedEvent& ev, THashTable* table)
{
MyFill(table,"x1NoCuts_bothplanes",600,-300,300,ev.x2);
MyFill(table,"x1NoCuts_bothplanes",600,-300,300,ev.x1);
MyFill(table,"x2NoCuts_bothplanes",600,-300,300,ev.x2);
MyFill(table,"xavgNoCuts_bothplanes",600,-300,300,ev.xavg);
MyFill(table,"xavgNoCuts_theta_bothplanes",600,-300,300,ev.xavg,100,0,TMath::Pi()/2.,ev.theta);