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

Compare commits

base: gwm17:ca0a7066dfadbfae0ffdf735e8bbf24e5df27557
Branches Tags
gwm17:main
gwm17:devel
gwm17:compass_ver1.x
..
compare: gwm17:51d97d175595ad364bdbf8b1a3b53d88a9a45178
Branches Tags
gwm17:devel
gwm17:main
gwm17:compass_ver1.x

No commits in common. "ca0a7066dfadbfae0ffdf735e8bbf24e5df27557" and "51d97d175595ad364bdbf8b1a3b53d88a9a45178" have entirely different histories.
ca0a7066df ... 51d97d1755

3 changed files with 3 additions and 17 deletions
Show Stats Expand all files Collapse all files

1
src/evb/CompassFile.cpp
View File

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

17
src/evb/EVBWorkspace.cpp
View File

@ -58,7 +58,6 @@ 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);
@ -80,9 +79,6 @@ 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)
@ -130,11 +126,9 @@ 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;
} }
@ -193,7 +187,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 || !output->IsOpen()) if(!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();
@ -202,15 +196,8 @@ 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;
} }

2
src/evb/SFPPlotter.cpp
View File

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