From 99ce58a01c204570a359839d9d76a8b8794b3a72 Mon Sep 17 00:00:00 2001 From: gwm17 Date: Wed, 13 Jul 2022 10:31:57 -0400 Subject: [PATCH] Removed obsolete RunCollector class --- src/evb/CMakeLists.txt | 2 - src/evb/RunCollector.cpp | 231 --------------------------------------- src/evb/RunCollector.h | 47 -------- 3 files changed, 280 deletions(-) delete mode 100644 src/evb/RunCollector.cpp delete mode 100644 src/evb/RunCollector.h diff --git a/src/evb/CMakeLists.txt b/src/evb/CMakeLists.txt index 5b48c2a..0f864c3 100644 --- a/src/evb/CMakeLists.txt +++ b/src/evb/CMakeLists.txt @@ -30,12 +30,10 @@ target_sources(EventBuilderCore PRIVATE CompassFile.h EVBApp.h Logger.cpp - RunCollector.cpp ShiftMap.h CompassHit.h FastSort.cpp Logger.h - RunCollector.h SlowSort.cpp CompassRun.cpp FastSort.h diff --git a/src/evb/RunCollector.cpp b/src/evb/RunCollector.cpp deleted file mode 100644 index 725afb1..0000000 --- a/src/evb/RunCollector.cpp +++ /dev/null @@ -1,231 +0,0 @@ -#include "RunCollector.h" -#include -#include -#include -#include -#include -#include - -namespace EventBuilder { - - RunCollector::RunCollector(): - m_initFlag(false), m_directory(""), m_prefix(""), m_suffix(""), m_minRun(0), m_maxRun(0) - { - } - - RunCollector::RunCollector(const std::string& dirname, const std::string& prefix, const std::string& suffix) : - m_initFlag(true), m_directory(dirname), m_prefix(prefix), m_suffix(suffix), m_minRun(0), m_maxRun(0) - { - } - - RunCollector::RunCollector(const std::string& dirname, const std::string& prefix, const std::string& suffix, int min, int max) : - m_initFlag(true), m_directory(dirname), m_prefix(prefix), m_suffix(suffix), m_minRun(min), m_maxRun(max) - { - } - - RunCollector::~RunCollector() {} - - void RunCollector::SetSearchParams(const std::string& dirname, const std::string& prefix, const std::string& suffix, int min, int max) - { - m_directory = dirname.c_str(); - m_prefix = prefix.c_str(); - m_suffix = suffix.c_str(); - m_minRun = min; m_maxRun = max; - m_initFlag = true; - } - - bool RunCollector::GrabAllFiles() - { - if(!m_initFlag) - return false; - - TSystemDirectory sysdir(m_directory.c_str(), m_directory.c_str()); - TList *flist = sysdir.GetListOfFiles(); - m_filelist.clear(); - - if(!flist) //Make sure list is real. If not, means no directory - { - EVB_WARN("RunCollector::GrabAllFiles() unable to find any files in directory {0}",m_directory); - return false; - } - - TSystemFile *file; - std::string fname, temp; - TIter next_element(flist); //List iterator - while((file = (TSystemFile*)next_element())) - { - temp = file->GetName(); - if(temp.size() < m_prefix.size() || temp.size() < m_suffix.size()) - continue; - else if(!file->IsDirectory() && !temp.compare(0,m_prefix.size(),m_prefix) && - !temp.compare(temp.size()-m_suffix.size(), m_suffix.size(), m_suffix)) - { - fname = m_directory+temp; - m_filelist.push_back(fname); - } - } - - delete flist; - if(m_filelist.size()>0) - return true; - else - { - EVB_WARN("RunCollector::GrabAllFiles() unable to find any files in directory {0} which match run pattern",m_directory); - return false; - } - } - - std::string RunCollector::GrabFile(int runNum) { - if(!m_initFlag) - return ""; - TSystemDirectory sysdir(m_directory.c_str(), m_directory.c_str()); - TList* flist = sysdir.GetListOfFiles(); - - if(!flist) - return ""; - - TSystemFile *file; - std::string fname = "", temp; - std::string runno = "_"+std::to_string(runNum)+m_suffix; - TIter next_element(flist); - while((file = (TSystemFile*)next_element())) - { - temp = file->GetName(); - if(temp.size() < m_prefix.size() || temp.size() < runno.size()) - continue; - else if(!file->IsDirectory() && !temp.compare(0,m_prefix.size(),m_prefix) && - !temp.compare(temp.size()-runno.size(),runno.size(), runno)) - { - fname = m_directory+temp; - break; - } - } - - delete flist; - return fname; - } - - /*Grabs all files within a specified run range*/ - bool RunCollector::GrabFilesInRange() - { - if(!m_initFlag) - return false; - - TSystemDirectory sysdir(m_directory.c_str(), m_directory.c_str()); - TList *flist = sysdir.GetListOfFiles(); - m_filelist.clear(); - - if(!flist) - { - EVB_WARN("RunCollector::GrabFilesInRange() unable to find any files in directory {0}",m_directory); - return false; - } - - TSystemFile *file; - std::string fname, temp; - std::string runno; - for(int i=m_minRun; i<=m_maxRun; i++) //loop over range - { - TIter next_element(flist);//list iterator - runno = "_"+std::to_string(i) + m_suffix; //suffix is now _#.suffix - while((file = (TSystemFile*)next_element())) //look through directory until file found - { - temp = file->GetName(); - if(temp.size() < m_prefix.size() || temp.size() < runno.size()) - continue; - else if(!file->IsDirectory() && !temp.compare(0,m_prefix.size(),m_prefix) && - !temp.compare(temp.size()-runno.size(),runno.size(), runno)) - { - fname = m_directory+temp; - m_filelist.push_back(fname); - break; //if we find the file, break out of iterator loop - } - } - } - - delete flist; - if(m_filelist.size()>0) - return true; - else - { - EVB_WARN("RunCollector::GrabAllFiles() unable to find any files in directory {0} which match run pattern and were in run range",m_directory); - return false; - } - - } - - bool RunCollector::Merge_hadd(const std::string& outname) - { - int sys_return; - if(!m_initFlag) - return false; - - if(m_maxRun == 0) - { - if(GrabAllFiles()) - { - std::string clump = "hadd "+outname; - for(unsigned int i=0; iAdd(m_filelist[i].c_str()); - chain->Merge(output,0,"fast"); - return true; - } - else - return false; - } - else - { - if(GrabFilesInRange()) - { - for(unsigned int i=0; iAdd(m_filelist[i].c_str()); - chain->Merge(output,0,"fast"); - return true; - } else - return false; - } - - if(output->IsOpen()) - output->Close(); - return false; - } - -} \ No newline at end of file diff --git a/src/evb/RunCollector.h b/src/evb/RunCollector.h deleted file mode 100644 index 02822db..0000000 --- a/src/evb/RunCollector.h +++ /dev/null @@ -1,47 +0,0 @@ -/*RunCollector.h - *Class that searches through a directory looking for files of a specified format. - *Stores all filenames in a vector which can be accessed by other functions/classes for - *further use. Can also use Merge() to combine all files using hadd into a single file. - *Merge() is NOT RECOMMENDED in the analyzer program. - * - *Created Jan2020 by GWM - */ - -#ifndef RUNCOLLECTOR_H -#define RUNCOLLECTOR_H - -namespace EventBuilder { - - class RunCollector - { - public: - RunCollector(); - RunCollector(const std::string& dirname, const std::string& prefix, const std::string& suffix); - RunCollector(const std::string& dirname, const std::string& prefix, const std::string& suffix, int min, int max); - ~RunCollector(); - void SetSearchParams(const std::string& dirname, const std::string& prefix, const std::string& suffix, int min, int max); - bool Merge_hadd(const std::string& outname); - bool Merge_TChain(const std::string& outname); - bool GrabAllFiles(); - bool GrabFilesInRange(); - std::string GrabFile(int runNum); - inline std::string GetSearchDir() { return m_directory; } - inline std::string GetSearchPrefix() { return m_prefix; } - inline std::string GetSearchSuffix() { return m_suffix; } - inline int GetRunMin() { return m_minRun; } - inline int GetRunMax() { return m_maxRun; } - inline const std::vector& GetFileList() { return m_filelist; } - - private: - bool m_initFlag; - std::string m_directory; - std::string m_prefix; - std::string m_suffix; - int m_minRun, m_maxRun; //user run limits - const int m_maxAllowedRuns = 1000; //class run limit - std::vector m_filelist; - - }; - -} -#endif