diff --git a/.gitignore b/.gitignore index 699d1e2..311cbc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ ###directories to ignore### -./rootfiles/ -./pics/ -./images/ -./hotfixes/ +.vscode/ +build/ ###file types to ignore### *.swp *.o +*.so +*.a *.cxx *.root *.bin @@ -15,6 +15,8 @@ *.png *.sublime-project *.sublime-workspace +*.make +Makefile event_log.txt .DS_Store diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..18a8e2a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vendor/spdlog"] + path = vendor/spdlog + url = https://github.com/gabime/spdlog.git diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..3bcdb52 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.16) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_POSITION_INDEPENDENT_CODE On) + +if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CMAKE_BUILD_TYPE "Release") + message("Building release") +else() + message("Building debug") +endif() + +project(EventBuilder_Skeleton) + +find_package(ROOT REQUIRED COMPONENTS Gui) + +set(EVB_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin) +set(EVB_LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) + +add_subdirectory(src) \ No newline at end of file diff --git a/README.md b/README.md index 04e4859..023c58e 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,18 @@ This is a program designed to be a launching point for event building data from This code can in princple work with any setup that uses CAEN digitizers, as it requires no knowledge of the physical setup other than a coincidence window. It can also be used to build waveform data (THIS HAS NOT BEEN FULLY TESTED). -## GWMEVB vs. GWMEVB_CL -There are two programs provided. They are `GWMEVB` and `GWMEVB_CL`. The first is a full GUI version of the event builder. The GUI supports all conversion methods and the plotting tool. The second is a commandline version. +## Installation +To install, first pull the repository and all submodules using `git clone --recursive https://github.com/sesps/EventBuilder_Skeleton.git`. The repository uses the CMake build system. To install simply run the following commands (for UNIX) +``` +mkdir build +cd build +cmake .. +make +``` +The executables are located in the `bin` directory of the EventBuilder_Skeleton, and should be run from the EventBuilder_Skeleton directory (as in `./bin/EventBuilderGui`). + +## EventBuilder vs. EventBuilderGui +There are two programs provided. They are `EventBuilder` and `EventBuilderGui`. The second is a full GUI version of the event builder. The GUI supports all conversion methods and the plotting tool. The first is a commandline version. ### Building Events The event building operation is the bulk of the analysis process. As files are being converted to ROOT from the raw CoMPASS binary, events are built using information given by the user. In particular the code asks the user to specify a workspace (a top level directory which contains the following sub directories: raw_binary, temp_binary, raw_root, sorted), a shift file, a scaler file, a coincidence window, and the size of the file buffer in number of hits. @@ -31,11 +41,6 @@ The program is capable of merging several root files together using either `hadd Currently the pipeline supports declaring individual digitizer channels as scalers. These channels will be used a pure counting measures. To make a channel a scaler, put the CoMPASS formated name of the channel and board (check the given etc/ScalerFile.txt for an example) in a text file along with a parameter name for the scaler to be saved as. These files are then processed outside of the event building loop, which can greatly increase the computational speed. Future versions will include scaler rates as well. ## System Requirements -Only tested with `ROOT` 6.14, mileage may vary -Uses C++11 standards -Only compatible with MacOSX and Linux - -## Compliling and Running -To compile use the command `make` -To clean run `make clean` and then run `make` -For a complete rebuild use `make clean_header` as well as `make clean`. +- Requires ROOT version which supports CMake dictionary generation +- Requires CMake > 3.16 +- This version is for data from CAEN CoMPASS > 2.0. Data from older CoMPASS versions are not compatible. \ No newline at end of file diff --git a/etc/ScalerFile.txt b/etc/ScalerFile.txt deleted file mode 100644 index 67d2a7c..0000000 --- a/etc/ScalerFile.txt +++ /dev/null @@ -1,3 +0,0 @@ -Format: scaler_param_name assoc_binary_file_name_without_runID -NOTE: As of this version, scalers are pure counting parameters (the total events will be counted and saved as a TParameter with the data) -Data_CH5@V1730_89 beamint \ No newline at end of file diff --git a/etc/ShiftMap_April2020_newFormat_10102020.txt b/etc/ShiftMap_April2020_newFormat_10102020.txt deleted file mode 100644 index 8ad83e7..0000000 --- a/etc/ShiftMap_April2020_newFormat_10102020.txt +++ /dev/null @@ -1,12 +0,0 @@ -Format: board channel/keyword shift -NOTE: Do not delete these lines! If no shift is specified for a channel, no shift is applied. Use keyword 'all' to apply a uniform shift to all channels in a single board. Shifts are in ps. -0 all 110000 -1 all 70000 -2 all 70000 -3 all -115000 -4 all 185000 -5 all 195000 -6 all 225000 -7 all 235000 -8 0 650000 -8 1 650000 \ No newline at end of file diff --git a/etc/logo.txt b/etc/logo.txt deleted file mode 100644 index 706d0b8..0000000 --- a/etc/logo.txt +++ /dev/null @@ -1,11 +0,0 @@ - _ - | | - | | - ___ _ __ ___ ___ ____ _| |__ _ _______ - / __|| ' \/ __|/ __| / __ ` | _ \| '__/ __ \ - \__ \| |\ \__ \\__ \| | | | | | | | | |__| | - __) | |/ /__) |__) | |__| | |_| | | | ___/ - |___/| .__/|___/____/ \____,_|____/|_| \____| - | | - | | - |_| diff --git a/etc/orig_ScalerFile_Feb2021_SABRE.txt b/etc/orig_ScalerFile_Feb2021_SABRE.txt deleted file mode 100644 index f08f5b7..0000000 --- a/etc/orig_ScalerFile_Feb2021_SABRE.txt +++ /dev/null @@ -1,3 +0,0 @@ -Format: scaler_param_name assoc_binary_file_name_without_runID -NOTE: As of this version, scalers are pure counting parameters (the total events will be counted and saved as a TParameter with the data) -CH5@V1730_89_Data beamint diff --git a/etc/orig_ShiftMap_Feb2021_SABRE.txt b/etc/orig_ShiftMap_Feb2021_SABRE.txt deleted file mode 100644 index 117918c..0000000 --- a/etc/orig_ShiftMap_Feb2021_SABRE.txt +++ /dev/null @@ -1,12 +0,0 @@ -Format: board channel/keyword shift -NOTE: Do not delete these lines! If no shift is specified for a channel, no shift is applied. Use keyword 'all' to apply a uniform shift to all channels in a single board. Shifts are in ps. -0 all 110000 -1 all 70000 -2 all 70000 -3 all 135000 -4 all 185000 -5 all 195000 -6 all 225000 -7 all 235000 -8 0 650000 -8 1 650000 diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index 57f1fb1..0000000 --- a/include/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -###ignore pch### -*.gch - -###include this### -!.gitignore diff --git a/include/CompassFile.h b/include/CompassFile.h deleted file mode 100644 index 2c7b7d5..0000000 --- a/include/CompassFile.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - CompassFile.h - Wrapper class around a shared pointer to an ifstream. Here the shared pointer is used - to overcome limitations of the ifstream class, namely that it is written such that ifstream - cannot be modified by move semantics. Contains all information needed to parse a single binary - CompassFile. Currently has a class wide defined buffer size; may want to make this user input - in the future. - - Written by G.W. McCann Oct. 2020 -*/ -#ifndef COMPASSFILE_H -#define COMPASSFILE_H - -#include "CompassHit.h" -#include "ShiftMap.h" -#include - -class CompassFile { -public: - CompassFile(); - CompassFile(const std::string& filename); - CompassFile(const std::string& filename, unsigned int bsize); - ~CompassFile(); - void Open(const std::string& filename); - void Close(); - inline bool IsOpen() { return m_file->is_open(); }; - bool GetNextHit(); - inline CompassHit GetCurrentHit() const { return m_currentHit; }; - inline std::string GetName() { return m_filename; }; - inline bool CheckHitHasBeenUsed() { return hitUsedFlag; }; //query to find out if we've used the current hit - inline void SetHitHasBeenUsed() { hitUsedFlag = true; }; //flip the flag to indicate the current hit has been used - inline bool IsEOF() { return eofFlag; }; //see if we've read all available data - inline bool* GetUsedFlagPtr() { return &hitUsedFlag; }; - inline void AttachShiftMap(ShiftMap* map) { m_smap = map; }; - inline unsigned int GetSize() { return m_size; }; - inline unsigned int GetNumberOfHits() { return m_nHits; }; - - -private: - unsigned int GetHitSize(); - void ParseNextHit(); - void GetNextBuffer(); - - using Buffer = std::vector; - - using FilePointer = std::shared_ptr; //to make this class copy/movable - - std::string m_filename; - Buffer hitBuffer; - char* bufferIter; - char* bufferEnd; - ShiftMap* m_smap; //NOT owned by CompassFile. DO NOT delete - bool hitUsedFlag; - unsigned int bufsize = 200000; //size of the buffer in hits - unsigned int hitsize = 24; //size of a CompassHit in bytes (without alignment padding) - unsigned int m_buffersize; - CompassHit m_currentHit; - FilePointer m_file; - bool eofFlag; - unsigned int m_size; //size of the file in bytes - unsigned int m_nHits; //number of hits in the file (m_size/24) - - -}; - - -#endif diff --git a/include/CompassHit.h b/include/CompassHit.h deleted file mode 100644 index 0cb7af2..0000000 --- a/include/CompassHit.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef COMPASS_HIT_H -#define COMPASS_HIT_H - -struct CompassHit { - UShort_t board = 400; - UShort_t channel = 400; - ULong64_t timestamp = 0; - UShort_t lgate = 0; - UShort_t sgate = 0; - UInt_t flags = 0; - UInt_t Ns = 0; - std::vector samples; -}; - -#endif diff --git a/include/CompassRun.h b/include/CompassRun.h deleted file mode 100644 index 2b65007..0000000 --- a/include/CompassRun.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - CompassRun.h - Class designed as abstraction of a collection of binary files that represent the total data in a single - Compass data run. It handles the user input (shift maps, file collection etc.) and creates a list of - CompassFiles from which to draw data. It then draws data from these files, organizes them in time, - and writes to a ROOT file for further processing. - - Written by G.W. McCann Oct. 2020 -*/ -#ifndef COMPASSRUN_H -#define COMPASSRUN_H - -#include "CompassFile.h" -#include "DataStructs.h" -#include "RunCollector.h" -#include "ShiftMap.h" -#include -#include -#include - -class CompassRun { -public: - CompassRun(); - CompassRun(const std::string& dir, unsigned int bsize); - ~CompassRun(); - inline void SetDirectory(const std::string& dir) { directory = dir; }; - inline void SetScalerInput(const std::string& filename) { m_scalerinput = filename; }; - inline void SetRunNumber(int n) { runNum = n; }; - inline void SetShiftMap(const std::string& filename) { m_smap.SetFile(filename); }; - void Convert2RawRoot(const std::string& name); - void Convert2SortedRoot(const std::string& name, double window); - - inline void AttachProgressBar(TGProgressBar* pb) { m_pb = pb; }; - -private: - bool GetBinaryFiles(); - bool GetHitsFromFiles(); - void SetScalers(); - void ReadScalerData(const std::string& filename); - void SetProgressBar(); - - std::string directory, m_scalerinput; - std::vector m_datafiles; - unsigned int startIndex; //this is the file we start looking at; increases as we finish files. - ShiftMap m_smap; - std::unordered_map> m_scaler_map; //maps scaler files to the TParameter to be saved - - //Potential branch variables - CompassHit hit; - std::vector event; - - //what run is this - int runNum; - unsigned int m_totalHits; - unsigned int m_buffersize; - - //Scaler switch - bool m_scaler_flag; - - //GUI progress bar, if attached - TGProgressBar* m_pb; -}; - -#endif diff --git a/include/DataStructs.h b/include/DataStructs.h deleted file mode 100644 index a5625e2..0000000 --- a/include/DataStructs.h +++ /dev/null @@ -1,18 +0,0 @@ -/*DataStructs.h - *Data structures for analysis. To be implemented as a dictionary for ROOT in LinkDef - *Based on: FocalPlane_SABRE.h - *Gordon M. Oct. 2019 - */ -#ifndef DATA_STRUCTS_H -#define DATA_STRUCTS_H - -using namespace std; - -struct DPPChannel { - Double_t Timestamp; - Int_t Channel, Board, Energy, EnergyShort; - Int_t Flags; - vector Samples; -}; - -#endif diff --git a/include/FlagHandler.h b/include/FlagHandler.h deleted file mode 100644 index bbce132..0000000 --- a/include/FlagHandler.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef FLAGHANDLER_H -#define FLAGHANDLER_H - -#include - -struct FlagCount { - long total_counts=0; - long dead_time=0; - long time_roll=0; - long time_reset=0; - long fake_event=0; - long mem_full=0; - long trig_lost=0; - long n_trig_lost=0; - long sat_in_gate=0; - long trig_1024=0; - long sat_input=0; - long n_trig_count=0; - long event_not_matched=0; - long fine_time=0; - long pile_up=0; - long pll_lock_loss=0; - long over_temp=0; - long adc_shutdown=0; -}; - -class FlagHandler { -public: - FlagHandler(); - FlagHandler(const std::string& filename); - ~FlagHandler(); - void CheckFlag(int board, int channel, int flag); - - const int DEAD_TIME = 0x00000001; - const int TIME_ROLLOVER = 0x00000002; - const int TIME_RESET = 0x00000004; - const int FAKE_EVENT = 0x00000008; - const int MEM_FULL = 0x00000010; - const int TRIG_LOST = 0x00000020; - const int N_TRIG_LOST = 0x00000040; - const int SATURATING_IN_GATE = 0x00000080; - const int TRIG_1024_COUNTED = 0x00000100; - const int SATURATING_INPUT = 0x00000400; - const int N_TRIG_COUNTED = 0x00000800; - const int EVENT_NOT_MATCHED = 0x00001000; - const int FINE_TIME = 0x00004000; - const int PILE_UP = 0x00008000; - const int PLL_LOCK_LOSS = 0x00080000; - const int OVER_TEMP = 0x00100000; - const int ADC_SHUTDOWN = 0x00200000; - -private: - std::ofstream log; - std::map event_count_map; - - void WriteLog(); -}; - -#endif diff --git a/include/GWMEventBuilder.h b/include/GWMEventBuilder.h deleted file mode 100644 index b56c3f3..0000000 --- a/include/GWMEventBuilder.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - GWMEventBuilder.h - Class which represents the API of the event building environment. Wraps together the core concepts - of the event builder, from conversion to plotting. Even intended to be able to archive data. - Currently under development. - - Written by G.W. McCann Oct. 2020 -*/ -#ifndef GWMEVENTBUILDER_H -#define GWMEVENTBUILDER_H - -#include "RunCollector.h" -#include - -class GWMEventBuilder { -public: - GWMEventBuilder(); - ~GWMEventBuilder(); - - bool ReadConfigFile(const std::string& filename); - void WriteConfigFile(const std::string& filename); - - void MergeROOTFiles(); - void Convert2SortedRoot(); - void Convert2RawRoot(); - - inline void SetAnalysisType(int type) { m_analysisType = type;}; - inline int GetAnalysisType() { return m_analysisType; }; - - inline void SetRunRange(int rmin, int rmax) { m_rmin = rmin; m_rmax = rmax; }; - inline void SetWorkDirectory(const std::string& fullpath) { m_workspace = fullpath; }; - inline void SetBoardShiftFile(const std::string& name) { m_shiftfile = name; }; - inline void SetScalerFile(const std::string& name) { m_scalerfile = name; }; - inline void SetSlowCoincidenceWindow(double window) { m_SlowWindow = window; }; - inline void SetBufferSize(unsigned int size) { m_buffersize = size; }; - - inline int GetRunMin() {return m_rmin;}; - inline int GetRunMax() {return m_rmax;}; - inline std::string GetWorkDirectory() {return m_workspace;}; - inline double GetSlowCoincidenceWindow() { return m_SlowWindow; }; - inline std::string GetBoardShiftFile() { return m_shiftfile; }; - inline std::string GetScalerFile() { return m_scalerfile; }; - inline unsigned int GetBufferSize() { return m_buffersize; }; - - inline void AttachProgressBar(TGProgressBar* pb) { m_pb = pb; }; - - enum BuildType { - CONVERT, - CONVERT_S, - MERGE - }; - -private: - - int m_rmin, m_rmax; - - std::string m_workspace; - std::string m_shiftfile; - std::string m_scalerfile; - - double m_SlowWindow; - - int m_analysisType; - unsigned int m_buffersize; - - RunCollector grabber; - - TGProgressBar* m_pb; - -}; - -#endif diff --git a/include/RunCollector.h b/include/RunCollector.h deleted file mode 100644 index fa9a63c..0000000 --- a/include/RunCollector.h +++ /dev/null @@ -1,50 +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 - -#include -#include -#include -#include -#include -#include - -using namespace std; - -class RunCollector { - public: - RunCollector(); - RunCollector(const string& dirname, const string& prefix, const string& suffix); - RunCollector(const string& dirname, const string& prefix, const string& suffix, int min, int max); - ~RunCollector(); - void SetSearchParams(const string& dirname, const string& prefix, const string& suffix, int min, int max); - int Merge_hadd(const string& outname); - int Merge_TChain(const string& outname); - int GrabAllFiles(); - int GrabFilesInRange(); - std::string GrabFile(int runNum); - inline std::string GetSearchDir() {return dir.Data();}; - inline std::string GetSearchPrefix() {return run.Data();}; - inline std::string GetSearchSuffix() {return end.Data();}; - inline int GetRunMin() {return MinRun;}; - inline int GetRunMax() {return MaxRun;}; - vector filelist; - - private: - bool initFlag; - TString dir; - TString run; - TString end; - Int_t MaxRun, MinRun; //user run limits - const Int_t LITERALMAX = 1000; //class run limit -}; - -#endif diff --git a/include/SlowSort.h b/include/SlowSort.h deleted file mode 100644 index a120e2a..0000000 --- a/include/SlowSort.h +++ /dev/null @@ -1,50 +0,0 @@ -/*SlowSort.h - *Class designed to first time-order raw data, and then based on a given coincidence window - *sort the raw data into coincidence structures. Utilizes dictionary elements DPPChannel and - *CoincEvent. Based on work by S. Balak, K. Macon, and E. Good from LSU. - * - *Gordon M. Oct. 2019 - * - *Refurbished and updated Jan 2020 GWM - */ -#ifndef SLOW_SORT_H -#define SLOW_SORT_H - -#include "CompassHit.h" -#include "DataStructs.h" -#include - -using namespace std; - -class SlowSort { - - public: - SlowSort(); - SlowSort(double windowSize); - ~SlowSort(); - inline void SetWindowSize(double window) { coincWindow = window; }; - bool AddHitToEvent(CompassHit& mhit); - vector GetEvent(); - inline TH2F* GetEventStats() { return event_stats; }; - void FlushHitsToEvent(); //For use with *last* hit list - inline bool IsEventReady() { return eventFlag; }; - - private: - void InitVariableMaps(); - void Reset(); - void StartEvent(); - void ProcessEvent(); - - double coincWindow; - vector hitList; - vector event; - bool eventFlag; - DPPChannel hit; - - double startTime, previousHitTime; - - TH2F* event_stats; - -}; - -#endif diff --git a/include/Stopwatch.h b/include/Stopwatch.h deleted file mode 100644 index af217c1..0000000 --- a/include/Stopwatch.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - Stopwatch.h - Simple class designed to provide timing info on parts of the process. - Only for use in development. - - Written by G.W. McCann Oct. 2020 -*/ -#ifndef STOPWATCH_H -#define STOPWATCH_H - -#include - -class Stopwatch { - -public: - Stopwatch(); - ~Stopwatch(); - void Start(); - void Stop(); - double GetElapsedSeconds(); - double GetElapsedMilliseconds(); - -private: - using Time = std::chrono::high_resolution_clock::time_point; - using Clock = std::chrono::high_resolution_clock; - - Time start_time, stop_time; -}; - -#endif \ No newline at end of file diff --git a/input.txt b/input.txt index 67564c9..4872a05 100644 --- a/input.txt +++ b/input.txt @@ -1,15 +1,15 @@ -------Data Location---------- -WorkspaceDirectory: /home/gwm17/working/GWM_EventBuilder/example +WorkspaceDirectory: /home/gwm17/EventBuilder_Skeleton/example ------------------------------- ------Experimental Inputs------ -ScalerFile: /home/gwm17/working/GWM_EventBuilder/etc/ScalerFile.txt +ScalerFile: /home/gwm17/EventBuilder_Skeleton/etc/ScalerFile.txt ------------------------------- -------Timing Information------ -BoardOffsetFile: /home/gwm17/working/GWM_EventBuilder/etc/ShiftMap_April2020_newFormat_10102020.txt +BoardOffsetFile: /home/gwm17/EventBuilder_Skeleton/etc/ShiftMap_April2020_newFormat_10102020.txt SlowCoincidenceWindow(ps): 1.5e+06 ------------------------------- --------Run Information-------- MinRun: 75 MaxRun: 75 -BufferSize(hits): 200000 +BufferSize: 200000 ------------------------------- diff --git a/lib/.gitignore b/lib/.gitignore deleted file mode 100644 index 647adb9..0000000 --- a/lib/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -###ignore these files#### -*.dylib -*.so -*.pcm - -###keep this one### -!.gitignore diff --git a/makefile b/makefile deleted file mode 100644 index da7809e..0000000 --- a/makefile +++ /dev/null @@ -1,96 +0,0 @@ -OS_NAME := $(shell uname -s) -CC=g++ -ROOTCFLAGS= `root-config --cflags` -ROOTGLIBS=`root-config --glibs` - -ROOTDICT_INCL=./ -CFLAGS= -std=c++11 -fPIC -g -Wall $(ROOTCFLAGS) -INCLDIR=./include -SRCDIR=./src -BINDIR=./bin -LIBDIR=./lib -CPPFLAGS= -I$(INCLDIR) -LDFLAGS=$(ROOTGLIBS) - -EVBSRCDIR=$(SRCDIR)/evb -GUISRCDIR=$(SRCDIR)/gui - -OBJDIR=./objs - -EVBSRC=$(wildcard $(EVBSRCDIR)/*.cpp) -GUISRC=$(wildcard $(GUISRCDIR)/*.cpp) -EVBOBJS=$(EVBSRC:$(EVBSRCDIR)/%.cpp=$(OBJDIR)/%.o) -GUIOBJS=$(GUISRC:$(GUISRCDIR)/%.cpp=$(OBJDIR)/%.o) - -DICT_PAGES= $(INCLDIR)/DataStructs.h $(INCLDIR)/LinkDef_evb.h -DICT=$(SRCDIR)/evb_dict.cxx -DICTOBJ=$(OBJDIR)/evb_dict.o -DICTLIB=$(LIBDIR)/libEVBDict - -GDICT_PAGES=$(INCLDIR)/EVBMainFrame.h $(INCLDIR)/FileViewFrame.h $(INCLDIR)/LinkDef_Gui.h -GDICT=$(SRCDIR)/gui_dict.cxx -GDICTOBJ=$(OBJDIR)/gui_dict.o - -#entry points -EVBGUIMSRC=$(SRCDIR)/gui_main.cpp -EVBGUIMAIN=$(OBJDIR)/gui_main.o - -EVBMSRC=$(SRCDIR)/main.cpp -EVBMAIN=$(OBJDIR)/main.o - -PCH_FILE=$(INCLDIR)/EventBuilder.h -PCH=$(INCLDIR)/EventBuilder.h.gch - -EVBEXE=$(BINDIR)/GWMEVB -EVBCLEXE=$(BINDIR)/GWMEVB_CL - -EXES = $(EVBEXE) $(EVBCLEXE) -OBJS = $(EVBOBJS) $(GUIOBJS) $(DICTOBJ) $(GDICTOBJ) $(EVBGUIMAIN) $(EVBMAIN) - - -.PHONY: all clean clean_header - -all: $(PCH) $(EVBEXE) $(EVBCLEXE) - -$(PCH): $(PCH_FILE) - $(CC) $(CFLAGS) -x c++-header $^ - -$(EVBEXE): $(DICTOBJ) $(GDICTOBJ) $(EVBOBJS) $(GUIOBJS) $(EVBGUIMAIN) - $(CC) $^ -o $@ $(LDFLAGS) - -$(EVBCLEXE): $(DICTOBJ) $(EVBOBJS) $(EVBMAIN) - $(CC) $^ -o $@ $(LDFLAGS) - -$(DICTOBJ): $(DICT) - $(CC) $(CFLAGS) -I $(ROOTDICT_INCL) -o $@ -c $^ -ifeq ($(OS_NAME), Darwin) - $(CC) $(CFLAGS) $(LDFLAGS) $@ -dynamiclib -o $(DICTLIB).dylib - cp $(SRCDIR)/*.pcm $(LIBDIR) -else -ifeq ($(OS_NAME), Linux) - $(CC) $(CFLAGS) $(LDFLAGS) $@ -shared -o $(DICTLIB).so - cp $(SRCDIR)/*.pcm $(LIBDIR) -endif -endif - mv $(SRCDIR)/*.pcm ./$(BINDIR)/ - -$(GDICTOBJ): $(GDICT) - $(CC) $(CFLAGS) -I $(ROOTDICT_INCL) -o $@ -c $^ - mv $(SRCDIR)/*.pcm $(BINDIR)/ - -$(DICT): $(DICT_PAGES) - rootcint -f $@ $^ - -$(GDICT): $(GDICT_PAGES) - rootcint -f $@ $^ - -clean: - $(RM) $(OBJS) $(EXES) $(DICT) $(GDICT) $(DICTLIB) ./$(LIBDIR)/*.pcm ./$(BINDIR)/*.pcm - -clean_header: - $(RM) $(PCH) - -VPATH= $(SRCDIR):$(EVBSRCDIR):$(GUISRCDIR) - -$(OBJDIR)/%.o: %.cpp - $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $^ diff --git a/objs/.gitignore b/objs/.gitignore deleted file mode 100644 index 1ce6034..0000000 --- a/objs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -### dont include any files, but include this dir ### -* -!.gitignore diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..c3a7cf1 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,25 @@ +add_subdirectory(evbdict) +add_subdirectory(guidict) +add_subdirectory(evb) + + +add_executable(EventBuilder) +target_include_directories(EventBuilder SYSTEM PUBLIC ../vendor/spdlog/include ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_sources(EventBuilder PRIVATE main.cpp) +target_link_libraries(EventBuilder + EVBDict + EventBuilderCore + ${ROOT_LIBRARIES} +) +set_target_properties(EventBuilder PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EVB_BINARY_DIR}) + +add_executable(EventBuilderGui) +target_include_directories(EventBuilderGui SYSTEM PUBLIC ../vendor/spdlog/include ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_sources(EventBuilderGui PRIVATE gui_main.cpp) +target_link_libraries(EventBuilderGui + EVBDict + GuiDict + EventBuilderCore + ${ROOT_LIBRARIES} +) +set_target_properties(EventBuilderGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EVB_BINARY_DIR}) \ No newline at end of file diff --git a/include/EventBuilder.h b/src/EventBuilder.h similarity index 93% rename from include/EventBuilder.h rename to src/EventBuilder.h index 4c41c9b..774abf5 100644 --- a/include/EventBuilder.h +++ b/src/EventBuilder.h @@ -24,5 +24,8 @@ #include #include +//Mine +#include "Logger.h" + #endif diff --git a/src/evb/CMakeLists.txt b/src/evb/CMakeLists.txt new file mode 100644 index 0000000..78386dc --- /dev/null +++ b/src/evb/CMakeLists.txt @@ -0,0 +1,38 @@ +add_library(EventBuilderCore STATIC) +target_include_directories(EventBuilderCore SYSTEM PUBLIC ../../vendor/spdlog/include ${ROOT_INCLUDE_DIRS} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ +) + +target_precompile_headers(EventBuilderCore PRIVATE ../EventBuilder.h) + +target_sources(EventBuilderCore PRIVATE + CompassRun.h + FlagHandler.cpp + Stopwatch.cpp + FlagHandler.h + OrderChecker.cpp + Stopwatch.h + OrderChecker.h + CompassFile.cpp + EVBApp.cpp + ProgressCallback.h + ShiftMap.cpp + CompassFile.h + EVBApp.h + Logger.cpp + RunCollector.cpp + ShiftMap.h + CompassHit.h + Logger.h + RunCollector.h + SlowSort.cpp + CompassRun.cpp + SlowSort.h +) + +target_link_libraries(EventBuilderCore PUBLIC + EVBDict + ${ROOT_LIBRARIES} +) + +set_target_properties(EventBuilderCore PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${EVB_LIBRARY_DIR}) \ No newline at end of file diff --git a/src/evb/CompassFile.cpp b/src/evb/CompassFile.cpp index b78ea7f..622682e 100644 --- a/src/evb/CompassFile.cpp +++ b/src/evb/CompassFile.cpp @@ -11,154 +11,194 @@ #include "EventBuilder.h" #include "CompassFile.h" -CompassFile::CompassFile() : - m_filename(""), bufferIter(nullptr), bufferEnd(nullptr), m_smap(nullptr), hitUsedFlag(true), m_file(std::make_shared()), eofFlag(false) -{ - m_buffersize = bufsize*hitsize; - hitBuffer.resize(m_buffersize); -} +namespace EventBuilder { -CompassFile::CompassFile(const std::string& filename) : - m_filename(""), bufferIter(nullptr), bufferEnd(nullptr), m_smap(nullptr), hitUsedFlag(true), m_file(std::make_shared()), eofFlag(false) -{ - m_buffersize = bufsize*hitsize; - hitBuffer.resize(m_buffersize); - Open(filename); -} - -CompassFile::CompassFile(const std::string& filename, unsigned int bsize) : - m_filename(""), bufferIter(nullptr), bufferEnd(nullptr), m_smap(nullptr), hitUsedFlag(true), - bufsize(bsize), m_file(std::make_shared()), eofFlag(false) -{ - m_buffersize = bufsize*hitsize; - hitBuffer.resize(m_buffersize); - Open(filename); -} - -CompassFile::~CompassFile() { - Close(); -} - -void CompassFile::Open(const std::string& filename) { - eofFlag = false; - hitUsedFlag = true; - m_filename = filename; - m_file->open(m_filename, std::ios::binary | std::ios::in); - - m_file->seekg(0, std::ios_base::end); - m_size = m_file->tellg(); - if(m_size <= 24) { - eofFlag = true; - m_nHits = 0; - } else { - m_file->seekg(0, std::ios_base::beg); - hitsize = GetHitSize(); - m_buffersize = hitsize*bufsize; - hitBuffer.resize(m_buffersize); - m_nHits = m_size/hitsize; + CompassFile::CompassFile() : + m_filename(""), m_bufferIter(nullptr), m_bufferEnd(nullptr), m_smap(nullptr), m_hitUsedFlag(true), m_hitsize(0), m_buffersize(0), + m_file(std::make_shared()), m_eofFlag(false) + { } -} - -void CompassFile::Close() { - if(IsOpen()) { - m_file->close(); - } -} - -unsigned int CompassFile::GetHitSize() { - if(!IsOpen()) { - std::cerr<<"Unable to get hit size due to file not being open!"<read(firstHit, 24); - uint32_t nsamples = *((uint32_t*) &firstHit[20]); - - m_file->seekg(0, std::ios_base::beg); - - delete[] firstHit; - - return 24 + nsamples*4; - -} - -/* - GetNextHit() is the function which... gets the next hit - Has to check if the buffer needs refilled/filled for the first time - Upon pulling a hit, sets the UsedFlag to false, letting the next level know - that the hit should be free game. - - If the file cannot be opened, signals as though file is EOF -*/ -bool CompassFile::GetNextHit() { - if(!IsOpen()) return true; - - if((bufferIter == nullptr || bufferIter == bufferEnd) && !IsEOF()) { - GetNextBuffer(); + CompassFile::CompassFile(const std::string& filename) : + m_filename(""), m_bufferIter(nullptr), m_bufferEnd(nullptr), m_smap(nullptr), m_hitUsedFlag(true), m_hitsize(0), m_buffersize(0), + m_file(std::make_shared()), m_eofFlag(false) + { + Open(filename); } - - if(!IsEOF()) { - ParseNextHit(); - hitUsedFlag = false; + + CompassFile::CompassFile(const std::string& filename, int bsize) : + m_filename(""), m_bufferIter(nullptr), m_bufferEnd(nullptr), m_smap(nullptr), m_hitUsedFlag(true), m_bufsize(bsize), m_hitsize(0), + m_buffersize(0), m_file(std::make_shared()), m_eofFlag(false) + { + Open(filename); } - - return eofFlag; -} - -/* - GetNextBuffer() ... self-explanatory name - Note tht this is where the EOF flag is set. The EOF is only singaled - after the LAST buffer is completely read (i.e literally no more data). ifstream sets its eof - bit upon pulling the last buffer, but this class waits until that entire - last buffer is read to singal EOF (the true end of file). -*/ -void CompassFile::GetNextBuffer() { - - if(m_file->eof()) { - eofFlag = true; - return; + + CompassFile::~CompassFile() + { + Close(); } - - m_file->read(hitBuffer.data(), hitBuffer.size()); - - bufferIter = hitBuffer.data(); - bufferEnd = bufferIter + m_file->gcount(); //one past the last datum - -} - -void CompassFile::ParseNextHit() { - - m_currentHit.board = *((UShort_t*)bufferIter); - bufferIter += 2; - m_currentHit.channel = *((UShort_t*)bufferIter); - bufferIter += 2; - m_currentHit.timestamp = *((ULong64_t*)bufferIter); - bufferIter += 8; - m_currentHit.lgate = *((UShort_t*)bufferIter); - bufferIter += 2; - m_currentHit.sgate = *((UShort_t*)bufferIter); - bufferIter += 2; - m_currentHit.flags = *((UInt_t*)bufferIter); - bufferIter += 4; - m_currentHit.Ns = *((UInt_t*)bufferIter); - bufferIter += 4; - - if(m_smap != nullptr) { //memory safety - int gchan = m_currentHit.channel + m_currentHit.board*16; - m_currentHit.timestamp += m_smap->GetShift(gchan); + + void CompassFile::Open(const std::string& filename) + { + m_eofFlag = false; + m_hitUsedFlag = true; + m_filename = filename; + m_file->open(m_filename, std::ios::binary | std::ios::in); + + m_file->seekg(0, std::ios_base::end); + m_size = m_file->tellg(); + if(m_size == 2) + { + m_eofFlag = true; + } + else + { + m_file->seekg(0, std::ios_base::beg); + ReadHeader(); + m_nHits = m_size/m_hitsize; + m_buffersize = m_hitsize*m_bufsize; + m_hitBuffer.resize(m_buffersize); + } } + + void CompassFile::Close() + { + if(IsOpen()) + { + m_file->close(); + } + } + + void CompassFile::ReadHeader() + { + if(!IsOpen()) + { + EVB_WARN("Unable to read header from file. State not validated", m_filename); + return; + } + char* header = new char[2]; + m_file->read(header, 2); + m_header = *((uint16_t*)header); + m_hitsize = 16; //default hitsize of 16 bytes + if(IsEnergy()) + m_hitsize += 2; + if(IsEnergyCalibrated()) + m_hitsize += 8; + if(IsEnergyShort()) + m_hitsize += 2; + if(IsWaves()) + { + m_hitsize += 5; + char* firstHit = new char[m_hitsize]; //A compass hit by default has 24 bytes (at least in our setup) + m_file->read(firstHit, m_hitsize); + firstHit += m_hitsize - 4; + uint32_t nsamples = *((uint32_t*) firstHit); + m_hitsize += nsamples * 2; //Each sample is a 2 byte data value + m_file->seekg(0, std::ios_base::beg); + m_file->read(header, 2); + delete[] firstHit; + } + + delete[] header; + } + /* - if(m_currentHit.Ns*2 + 24 != hitsize) { - std::cerr<<"WARNING! Hit size does not match current value of samples... Try to proceed, but expect seg fault."<eof()) + { + m_eofFlag = true; + return; + } + + m_file->read(m_hitBuffer.data(), m_hitBuffer.size()); + + m_bufferIter = m_hitBuffer.data(); + m_bufferEnd = m_bufferIter + m_file->gcount(); //one past the last datum + + } + + void CompassFile::ParseNextHit() + { + + m_currentHit.board = *((uint16_t*)m_bufferIter); + m_bufferIter += 2; + m_currentHit.channel = *((uint16_t*)m_bufferIter); + m_bufferIter += 2; + m_currentHit.timestamp = *((uint64_t*)m_bufferIter); + m_bufferIter += 8; + if(IsEnergy()) + { + m_currentHit.energy = *((uint16_t*)m_bufferIter); + m_bufferIter += 2; + } + if(IsEnergyCalibrated()) + { + m_currentHit.energyCalibrated = *((uint64_t*)m_bufferIter); + m_bufferIter += 8; + } + if(IsEnergyShort()) + { + m_currentHit.energyShort = *((uint16_t*)m_bufferIter); + m_bufferIter += 2; + } + m_currentHit.flags = *((uint32_t*)m_bufferIter); + m_bufferIter += 4; + if(IsWaves()) + { + m_currentHit.waveCode = *((uint8_t*)m_bufferIter); + m_bufferIter += 1; + m_currentHit.Ns = *((uint32_t*)m_bufferIter); + m_bufferIter += 4; + if(m_currentHit.samples.size() != m_currentHit.Ns) + m_currentHit.samples.resize(m_currentHit.Ns); + for(size_t i=0; iGetShift(gchan); + } + + } + +} \ No newline at end of file diff --git a/src/evb/CompassFile.h b/src/evb/CompassFile.h new file mode 100644 index 0000000..457d56b --- /dev/null +++ b/src/evb/CompassFile.h @@ -0,0 +1,89 @@ +/* + CompassFile.h + Wrapper class around a shared pointer to an ifstream. Here the shared pointer is used + to overcome limitations of the ifstream class, namely that it is written such that ifstream + cannot be modified by move semantics. Contains all information needed to parse a single binary + CompassFile. Currently has a class wide defined buffer size; may want to make this user input + in the future. + + Written by G.W. McCann Oct. 2020 +*/ +#ifndef COMPASSFILE_H +#define COMPASSFILE_H + +#include "CompassHit.h" +#include "ShiftMap.h" +#include + +namespace EventBuilder { + + class CompassFile + { + + public: + CompassFile(); + CompassFile(const std::string& filename); + CompassFile(const std::string& filename, int bsize); + ~CompassFile(); + void Open(const std::string& filename); + void Close(); + bool GetNextHit(); + + inline bool IsOpen() const { return m_file->is_open(); }; + inline CompassHit GetCurrentHit() const { return m_currentHit; } + inline std::string GetName() const { return m_filename; } + 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 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 unsigned int GetSize() const { return m_size; } + inline unsigned int GetNumberOfHits() const { return m_nHits; } + + + private: + void ReadHeader(); + void ParseNextHit(); + void GetNextBuffer(); + + inline bool IsEnergy() { return (m_header & CoMPASSHeaders::Energy) != 0; } + inline bool IsEnergyCalibrated() { return (m_header & CoMPASSHeaders::EnergyCalibrated) != 0; } + inline bool IsEnergyShort() { return (m_header & CoMPASSHeaders::EnergyShort) != 0; } + inline bool IsWaves() { return (m_header & CoMPASSHeaders::Waves) != 0; } + + using Buffer = std::vector; + + using FilePointer = std::shared_ptr; //to make this class copy/movable + + std::string m_filename; + Buffer m_hitBuffer; + char* m_bufferIter; + char* m_bufferEnd; + ShiftMap* m_smap; //NOT owned by CompassFile. DO NOT delete + + bool m_hitUsedFlag; + int m_bufsize = 200000; //size of the buffer in hits + int m_hitsize; //size of a CompassHit in bytes (without alignment padding) + int m_channels_per_board = 16; //Number of channels per digitzer board, important for generating id! + uint16_t m_header; + int m_buffersize; + + CompassHit m_currentHit; + FilePointer m_file; + bool m_eofFlag; + unsigned int m_size; //size of the file in bytes + unsigned int m_nHits; //number of hits in the file (m_size/24) + + enum CoMPASSHeaders + { + Energy = 0x0001, + EnergyCalibrated = 0x0002, + EnergyShort = 0x0004, + Waves = 0x0008, + }; + + }; + +} + +#endif diff --git a/src/evb/CompassHit.h b/src/evb/CompassHit.h new file mode 100644 index 0000000..59b30e1 --- /dev/null +++ b/src/evb/CompassHit.h @@ -0,0 +1,22 @@ +#ifndef COMPASS_HIT_H +#define COMPASS_HIT_H + +namespace EventBuilder { + + struct CompassHit + { + uint16_t board = 400; + uint16_t channel = 400; + uint64_t timestamp = 0; + uint16_t energy = 0; + uint64_t energyCalibrated = 0; + uint16_t energyShort = 0; + uint32_t flags = 0; + uint8_t waveCode = 0; + uint32_t Ns = 0; + std::vector samples; + }; + +} + +#endif diff --git a/src/evb/CompassRun.cpp b/src/evb/CompassRun.cpp index a928825..41c912d 100644 --- a/src/evb/CompassRun.cpp +++ b/src/evb/CompassRun.cpp @@ -15,247 +15,267 @@ #include "SlowSort.h" #include "FlagHandler.h" -CompassRun::CompassRun() : - directory(""), m_scalerinput(""), runNum(0), m_buffersize(200000), m_scaler_flag(false), m_pb(nullptr) -{ +namespace EventBuilder { -} - -CompassRun::CompassRun(const std::string& dir, unsigned int bsize) : - directory(dir), m_scalerinput(""), runNum(0), m_buffersize(bsize), m_scaler_flag(false), m_pb(nullptr) -{ - -} - -CompassRun::~CompassRun() {} - - -/*Load em into a map*/ -void CompassRun::SetScalers() { - std::ifstream input(m_scalerinput); - if(!input.is_open()) return; - - m_scaler_flag = true; - std::string junk, filename, varname; - Long64_t init = 0; - std::getline(input, junk); - std::getline(input, junk); - m_scaler_map.clear(); - while(input>>filename) { - input>>varname; - filename = directory+filename+"_run_"+to_string(runNum)+".bin"; - m_scaler_map[filename] = TParameter(varname.c_str(), init); + CompassRun::CompassRun() : + directory(""), m_scalerinput(""), runNum(0), m_buffersize(200000), m_scaler_flag(false) + { + } - input.close(); -} - -bool CompassRun::GetBinaryFiles() { - std::string prefix = ""; - std::string suffix = ".bin"; //binaries - RunCollector grabber(directory, prefix, suffix); - grabber.GrabAllFiles(); - - m_datafiles.clear(); //so that the CompassRun can be reused - m_datafiles.reserve(grabber.filelist.size()); - bool scalerd; - m_totalHits = 0; //reset total run size - - for(auto& entry : grabber.filelist) { - //Handle scaler files, if they exist - if(m_scaler_flag) { - scalerd = false; - for(auto& scaler_pair : m_scaler_map) { - if(std::string(entry.Data()) == scaler_pair.first) { - ReadScalerData(entry.Data()); - scalerd = true; - break; + + CompassRun::CompassRun(const std::string& dir, size_t bsize) : + directory(dir), m_scalerinput(""), runNum(0), m_buffersize(bsize), m_scaler_flag(false) + { + + } + + CompassRun::~CompassRun() {} + + + /*Load em into a map*/ + void CompassRun::SetScalers() + { + std::ifstream input(m_scalerinput); + if(!input.is_open()) return; + + m_scaler_flag = true; + std::string junk, filename, varname; + int64_t init = 0; + std::getline(input, junk); + std::getline(input, junk); + m_scaler_map.clear(); + while(input>>filename) + { + input>>varname; + filename = directory+filename+"_run_"+std::to_string(runNum)+".BIN"; + m_scaler_map[filename] = TParameter(varname.c_str(), init); + } + input.close(); + } + + bool CompassRun::GetBinaryFiles() + { + std::string prefix = ""; + std::string suffix = ".BIN"; //binaries + RunCollector grabber(directory, prefix, suffix); + grabber.GrabAllFiles(); + + m_datafiles.clear(); //so that the CompassRun can be reused + m_datafiles.reserve(grabber.GetFileList().size()); + bool scalerd; + m_totalHits = 0; //reset total run size + + for(auto& entry : grabber.GetFileList()) + { + //Handle scaler files, if they exist + if(m_scaler_flag) + { + scalerd = false; + for(auto& scaler_pair : m_scaler_map) + { + if(entry == scaler_pair.first) + { + ReadScalerData(entry); + scalerd = true; + break; + } } + if(scalerd) + continue; } - if(scalerd) continue; + m_datafiles.emplace_back(entry, m_buffersize); + m_datafiles[m_datafiles.size()-1].AttachShiftMap(&m_smap); + //Any time we have a file that fails to be found, we terminate the whole process + if(!m_datafiles[m_datafiles.size() - 1].IsOpen()) + return false; + + m_totalHits += m_datafiles[m_datafiles.size()-1].GetNumberOfHits(); } - m_datafiles.emplace_back(entry.Data()); - m_datafiles[m_datafiles.size()-1].AttachShiftMap(&m_smap); - //Any time we have a file that fails to be found, we terminate the whole process - if(!m_datafiles[m_datafiles.size() - 1].IsOpen()) { - return false; + + return true; + } + + /* + Pure counting of scalers. Potential upgrade path to something like + average count rate etc. + */ + void CompassRun::ReadScalerData(const std::string& filename) + { + if(!m_scaler_flag) + return; + + int64_t count = 0; + CompassFile file(filename); + auto& this_param = m_scaler_map[file.GetName()]; + while(true) + { + file.GetNextHit(); + if(file.IsEOF()) + break; + count++; } - m_totalHits += m_datafiles[m_datafiles.size()-1].GetNumberOfHits(); + this_param.SetVal(count); } - - return true; -} - -/* - Pure counting of scalers. Potential upgrade path to something like - average count rate etc. -*/ -void CompassRun::ReadScalerData(const std::string& filename) { - if(!m_scaler_flag) return; - - Long64_t count; - count = 0; - CompassFile file(filename); - auto& this_param = m_scaler_map[file.GetName()]; - while(true) { - file.GetNextHit(); - if(file.IsEOF()) break; - count++; - } - this_param.SetVal(count); -} - -/* - 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 - 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. -*/ -bool CompassRun::GetHitsFromFiles() { - - std::pair earliestHit = make_pair(CompassHit(), nullptr); - for(unsigned int i=startIndex; iBranch("Board", &hit.board); - outtree->Branch("Channel", &hit.channel); - outtree->Branch("Energy", &hit.lgate); - outtree->Branch("EnergyShort", &hit.sgate); - outtree->Branch("Timestamp", &hit.timestamp); - outtree->Branch("Flags", &hit.flags); - - if(!m_smap.IsSet()) { - std::cerr<<"Bad shift map at CompassRun::Convert()."<Increment(count); - gSystem->ProcessEvents(); - count=0; - } else { - count = 0; - flush_count++; - std::cout<<"\rPercent of run built: "<Fill(); - } - - output->cd(); - outtree->Write(outtree->GetName(), TObject::kOverwrite); - for(auto& entry : m_scaler_map) { - entry.second.Write(); - } - output->Close(); -} - -void CompassRun::Convert2SortedRoot(const std::string& name, double window) { - TFile* output = TFile::Open(name.c_str(), "RECREATE"); - TTree* outtree = new TTree("SortTree", "SortTree"); - - outtree->Branch("event", &event); - - if(!m_smap.IsSet()) { - std::cerr<<"Bad shift map at CompassRun::Convert()."<Increment(count); - gSystem->ProcessEvents(); - count=0; - } else { - count = 0; - flush_count++; - std::cout<<"\rPercent of run built: "< earliestHit = std::make_pair(CompassHit(), nullptr); + for(unsigned int i=startIndex; iBranch("Board", &hit.board); + outtree->Branch("Channel", &hit.channel); + outtree->Branch("Energy", &hit.energy); + outtree->Branch("EnergyShort", &hit.energyShort); + outtree->Branch("EnergyCal", &hit.energyCalibrated); + outtree->Branch("Timestamp", &hit.timestamp); + outtree->Branch("Flags", &hit.flags); + outtree->Branch("Ns", &hit.Ns); + outtree->Branch("Samples", &hit.samples); + + if(!m_smap.IsSet()) + { + std::cerr<<"Bad shift map at CompassRun::Convert()."<Fill(); - if(killFlag) break; } + + output->cd(); + outtree->Write(outtree->GetName(), TObject::kOverwrite); + for(auto& entry : m_scaler_map) + entry.second.Write(); + output->Close(); + } + + void CompassRun::Convert2SortedRoot(const std::string& name, double window) { + TFile* output = TFile::Open(name.c_str(), "RECREATE"); + TTree* outtree = new TTree("SortTree", "SortTree"); + + outtree->Branch("event", &event); + + if(!m_smap.IsSet()) + { + std::cerr<<"Bad shift map at CompassRun::Convert()."<Fill(); + if(killFlag) + break; + } + } + + output->cd(); + outtree->Write(outtree->GetName(), TObject::kOverwrite); + for(auto& entry : m_scaler_map) + entry.second.Write(); + coincidizer.GetEventStats()->Write(); + output->Close(); } - output->cd(); - outtree->Write(outtree->GetName(), TObject::kOverwrite); - for(auto& entry : m_scaler_map) { - entry.second.Write(); - } - coincidizer.GetEventStats()->Write(); - output->Close(); -} - -void CompassRun::SetProgressBar() { - m_pb->SetMax(m_totalHits); - m_pb->SetMin(0); - m_pb->SetPosition(0); - gSystem->ProcessEvents(); -} +} \ No newline at end of file diff --git a/src/evb/CompassRun.h b/src/evb/CompassRun.h new file mode 100644 index 0000000..07d86cc --- /dev/null +++ b/src/evb/CompassRun.h @@ -0,0 +1,68 @@ +/* + CompassRun.h + Class designed as abstraction of a collection of binary files that represent the total data in a single + Compass data run. It handles the user input (shift maps, file collection etc.) and creates a list of + CompassFiles from which to draw data. It then draws data from these files, organizes them in time, + and writes to a ROOT file for further processing. + + Written by G.W. McCann Oct. 2020 +*/ +#ifndef COMPASSRUN_H +#define COMPASSRUN_H + +#include "CompassFile.h" +#include "DataStructs.h" +#include "RunCollector.h" +#include "ShiftMap.h" +#include "ProgressCallback.h" +#include + +namespace EventBuilder { + + class CompassRun + { + public: + CompassRun(); + CompassRun(const std::string& dir, uint64_t bsize); + ~CompassRun(); + inline void SetDirectory(const std::string& dir) { directory = dir; } + inline void SetScalerInput(const std::string& filename) { m_scalerinput = filename; } + inline void SetRunNumber(int n) { runNum = n; }; + inline void SetShiftMap(const std::string& filename) { m_smap.SetFile(filename); } + void Convert2RawRoot(const std::string& name); + void Convert2SortedRoot(const std::string& name, double window); + + inline void SetProgressCallbackFunc(ProgressCallbackFunc& func) { m_progressCallback = func; } + inline void SetProgressFraction(double frac) { m_progressFraction = frac; } + + private: + bool GetBinaryFiles(); + bool GetHitsFromFiles(); + void SetScalers(); + void ReadScalerData(const std::string& filename); + + std::string directory, m_scalerinput; + std::vector m_datafiles; + unsigned int startIndex; //this is the file we start looking at; increases as we finish files. + ShiftMap m_smap; + std::unordered_map> m_scaler_map; //maps scaler files to the TParameter to be saved + + //Potential branch variables + CompassHit hit; + std::vector event; + + //what run is this + int runNum; + uint64_t m_totalHits; + uint64_t m_buffersize; + + //Scaler switch + bool m_scaler_flag; + + ProgressCallbackFunc m_progressCallback; + double m_progressFraction; + + }; + +} +#endif diff --git a/src/evb/EVBApp.cpp b/src/evb/EVBApp.cpp new file mode 100644 index 0000000..1925863 --- /dev/null +++ b/src/evb/EVBApp.cpp @@ -0,0 +1,215 @@ +/* + EVBApp.cpp + Class which represents the API of the event building environment. Wraps together the core concepts + of the event builder, from conversion to plotting. Even intended to be able to archive data. + Currently under development. + + Written by G.W. McCann Oct. 2020 +*/ +#include "EventBuilder.h" +#include +#include "EVBApp.h" +#include "RunCollector.h" +#include "CompassRun.h" +#include "SlowSort.h" + +namespace EventBuilder { + + EVBApp::EVBApp() : + m_rmin(0), m_rmax(0), + m_progressFraction(0.1), m_workspace("none"), m_shiftfile("none"), + m_scalerfile("none"), m_buffersize(200000), m_SlowWindow(0) + { + SetProgressCallbackFunc(BIND_PROGRESS_CALLBACK_FUNCTION(EVBApp::DefaultProgressCallback)); + } + + EVBApp::~EVBApp() + { + } + + void EVBApp::DefaultProgressCallback(long curVal, long totalVal) + { + double fraction = ((double)curVal)/totalVal; + EVB_INFO("Percent of run built: {0}", fraction*100); + } + + bool EVBApp::ReadConfigFile(const std::string& fullpath) + { + EVB_INFO("Reading in EVB configuration from file {0}...", fullpath); + std::ifstream input(fullpath); + if(!input.is_open()) + { + EVB_WARN("Read of EVB config failed, unable to open input file!"); + return false; + } + std::string junk; + + std::getline(input, junk); + input>>junk>>m_workspace; + input>>junk; + std::getline(input, junk); + std::getline(input, junk); + input>>junk>>m_scalerfile; + input>>junk; + std::getline(input, junk); + std::getline(input, junk); + input>>junk>>m_shiftfile; + input>>junk>>m_SlowWindow; + input>>junk; + std::getline(input, junk); + std::getline(input, junk); + input>>junk>>m_rmin; + input>>junk>>m_rmax; + input>>junk>>m_buffersize; + + input.close(); + + EVB_INFO("Successfully loaded EVB config."); + + return true; + } + + void EVBApp::WriteConfigFile(const std::string& fullpath) + { + + EVB_INFO("Writing EVB config to file {0}...",fullpath); + std::ofstream output(fullpath); + if(!output.is_open()) + { + EVB_WARN("Failed to write to config to file {0}, unable to open file!", fullpath); + return; + } + + output<<"-------Data Location----------"< + +namespace EventBuilder { + + struct FlagCount + { + int64_t total_counts=0; + int64_t dead_time=0; + int64_t time_roll=0; + int64_t time_reset=0; + int64_t fake_event=0; + int64_t mem_full=0; + int64_t trig_lost=0; + int64_t n_trig_lost=0; + int64_t sat_in_gate=0; + int64_t trig_1024=0; + int64_t sat_input=0; + int64_t n_trig_count=0; + int64_t event_not_matched=0; + int64_t fine_time=0; + int64_t pile_up=0; + int64_t pll_lock_loss=0; + int64_t over_temp=0; + int64_t adc_shutdown=0; + }; + + class FlagHandler + { + public: + FlagHandler(); + FlagHandler(const std::string& filename); + ~FlagHandler(); + void CheckFlag(int board, int channel, int flag); + + const int DEAD_TIME = 0x00000001; + const int TIME_ROLLOVER = 0x00000002; + const int TIME_RESET = 0x00000004; + const int FAKE_EVENT = 0x00000008; + const int MEM_FULL = 0x00000010; + const int TRIG_LOST = 0x00000020; + const int N_TRIG_LOST = 0x00000040; + const int SATURATING_IN_GATE = 0x00000080; + const int TRIG_1024_COUNTED = 0x00000100; + const int SATURATING_INPUT = 0x00000400; + const int N_TRIG_COUNTED = 0x00000800; + const int EVENT_NOT_MATCHED = 0x00001000; + const int FINE_TIME = 0x00004000; + const int PILE_UP = 0x00008000; + const int PLL_LOCK_LOSS = 0x00080000; + const int OVER_TEMP = 0x00100000; + const int ADC_SHUTDOWN = 0x00200000; + + private: + std::ofstream log; + std::map event_count_map; + + void WriteLog(); + }; + +} +#endif diff --git a/src/evb/GWMEventBuilder.cpp b/src/evb/GWMEventBuilder.cpp deleted file mode 100644 index e886f79..0000000 --- a/src/evb/GWMEventBuilder.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/* - GWMEventBuilder.cpp - Class which represents the API of the event building environment. Wraps together the core concepts - of the event builder, from conversion to plotting. Even intended to be able to archive data. - Currently under development. - - Written by G.W. McCann Oct. 2020 -*/ -#include "EventBuilder.h" -#include -#include "GWMEventBuilder.h" -#include "RunCollector.h" -#include "CompassRun.h" - -GWMEventBuilder::GWMEventBuilder() : - m_rmin(0), m_rmax(0), m_workspace("none"), m_shiftfile("none"), m_SlowWindow(0), m_buffersize(200000), m_pb(nullptr) -{ -} - -GWMEventBuilder::~GWMEventBuilder() -{ -} - -bool GWMEventBuilder::ReadConfigFile(const std::string& fullpath) { - std::cout<<"Reading in configuration from file: "<>junk>>m_workspace; - input>>junk; - std::getline(input, junk); - std::getline(input, junk); - input>>junk>>m_scalerfile; - input>>junk; - std::getline(input, junk); - std::getline(input, junk); - input>>junk>>m_shiftfile; - input>>junk>>m_SlowWindow; - input>>junk; - std::getline(input, junk); - std::getline(input, junk); - input>>junk>>m_rmin; - input>>junk>>m_rmax; - input>>junk>>m_buffersize; - - input.close(); - - std::cout<<"Completed."< Logger::s_logger; + + void Logger::Init() + { + spdlog::set_pattern("%^[%T] %n: %v%$"); + + s_logger = spdlog::stdout_color_mt("EVB"); + s_logger->set_level(spdlog::level::trace); + } + +} \ No newline at end of file diff --git a/src/evb/Logger.h b/src/evb/Logger.h new file mode 100644 index 0000000..105baa8 --- /dev/null +++ b/src/evb/Logger.h @@ -0,0 +1,28 @@ +#ifndef LOGGER_H +#define LOGGER_H + +#include +#include "spdlog/spdlog.h" +#include "spdlog/fmt/ostr.h" + +namespace EventBuilder { + + class Logger + { + public: + static void Init(); + + inline static std::shared_ptr GetLogger() { return s_logger; } + + private: + static std::shared_ptr s_logger; + }; + + #define EVB_CRITICAL(...) ::EventBuilder::Logger::GetLogger()->critical(__VA_ARGS__) + #define EVB_ERROR(...) ::EventBuilder::Logger::GetLogger()->error(__VA_ARGS__) + #define EVB_WARN(...) ::EventBuilder::Logger::GetLogger()->warn(__VA_ARGS__) + #define EVB_INFO(...) ::EventBuilder::Logger::GetLogger()->info(__VA_ARGS__) + #define EVB_TRACE(...) ::EventBuilder::Logger::GetLogger()->trace(__VA_ARGS__) +} + +#endif \ No newline at end of file diff --git a/src/evb/OrderChecker.cpp b/src/evb/OrderChecker.cpp index f8b22e0..7eaa636 100644 --- a/src/evb/OrderChecker.cpp +++ b/src/evb/OrderChecker.cpp @@ -8,30 +8,33 @@ #include "EventBuilder.h" #include "OrderChecker.h" -OrderChecker::OrderChecker() { +namespace EventBuilder { -} - -OrderChecker::~OrderChecker() { - -} - -bool OrderChecker::IsOrdered(const std::string& filename) { - TFile* file = TFile::Open(filename.c_str(), "READ"); - TTree* tree = (TTree*) file->Get("Data"); - - ULong64_t ts; - tree->SetBranchAddress("Timestamp", &ts); - ULong64_t prevStamp = 0; - - for(Long64_t i=0; iGetEntries(); i++) { - tree->GetEntry(); - if(prevStamp >= ts) { - std::cerr<<"Bad order at entry "<GetEntries()<Get("Data"); + + uint64_t ts; + tree->SetBranchAddress("Timestamp", &ts); + uint64_t prevStamp = 0; + + for(int64_t i=0; iGetEntries(); i++) + { + tree->GetEntry(i); + if(prevStamp >= ts) + { + std::cerr<<"Bad order at entry "<GetEntries()<Close(); + return true; } - file->Close(); - return true; -} +} \ No newline at end of file diff --git a/include/OrderChecker.h b/src/evb/OrderChecker.h similarity index 64% rename from include/OrderChecker.h rename to src/evb/OrderChecker.h index 9f4b360..f0eba9f 100644 --- a/include/OrderChecker.h +++ b/src/evb/OrderChecker.h @@ -8,11 +8,15 @@ #ifndef ORDERCHECKER_H #define ORDERCHECKER_H -class OrderChecker { -public: - OrderChecker(); - ~OrderChecker(); - bool IsOrdered(const std::string& filename); -}; +namespace EventBuilder { + + class OrderChecker + { + public: + OrderChecker(); + ~OrderChecker(); + bool IsOrdered(const std::string& filename); + }; +} #endif diff --git a/src/evb/ProgressCallback.h b/src/evb/ProgressCallback.h new file mode 100644 index 0000000..daa4977 --- /dev/null +++ b/src/evb/ProgressCallback.h @@ -0,0 +1,14 @@ +#ifndef PROGRESSCALLBACK_H +#define PROGRESSCALLBACK_H + +#include + +#define BIND_PROGRESS_CALLBACK_FUNCTION(func) std::bind(&func, this, std::placeholders::_1, std::placeholders::_2) + +namespace EventBuilder { + + using ProgressCallbackFunc = std::function; + +} + +#endif \ No newline at end of file diff --git a/src/evb/RunCollector.cpp b/src/evb/RunCollector.cpp index 0074170..3c983e1 100644 --- a/src/evb/RunCollector.cpp +++ b/src/evb/RunCollector.cpp @@ -1,196 +1,232 @@ #include "EventBuilder.h" #include "RunCollector.h" +#include +#include +#include +#include +#include +#include -using namespace std; +namespace EventBuilder { -RunCollector::RunCollector(): - initFlag(false), dir(""), run(""), end(""), MaxRun(0), MinRun(0) -{ -} + 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; + } - MinRun = 0; MaxRun = LITERALMAX; - initFlag = true; -} - -RunCollector::RunCollector(const string& dirname, const string& prefix, const string& suffix, int min, int max) { - dir = dirname.c_str(); - run = prefix.c_str(); - end = suffix.c_str(); - - MinRun = min; MaxRun = max; - initFlag = true; -} - -RunCollector::~RunCollector() {} - -void RunCollector::SetSearchParams(const string& dirname, const string& prefix, const string& suffix, int min, int max) { - dir = dirname.c_str(); - run = prefix.c_str(); - end = suffix.c_str(); - MinRun = min; MaxRun = max; - initFlag = true; -} - -int RunCollector::GrabAllFiles() { - if(!initFlag) {return 0;} - TSystemDirectory sysdir(dir.Data(), dir.Data()); - TList *flist = sysdir.GetListOfFiles(); - filelist.clear(); - int counter = 0; - if(flist) { //Make sure list is real. If not, means no directory - TSystemFile *file; - TString fname, temp; - TIter next_element(flist); //List iterator - while((file = (TSystemFile*)next_element())) { - temp = file->GetName(); - if(!file->IsDirectory() && temp.BeginsWith(run.Data()) && temp.EndsWith(end.Data())) { - counter++; - fname = dir+temp; - filelist.push_back(fname); - } - } - if(counter>0) { - delete flist; - return 1; - } else { - cerr<<"Unable to find files with matching run name in directory; check input.txt"<GetName(); - if(!file->IsDirectory() && temp.BeginsWith(run.Data()) && temp.EndsWith(runno.c_str())) { - fname = dir+temp; - break; - } - } - - return fname.Data(); -} - -/*Grabs all files within a specified run range*/ -int RunCollector::GrabFilesInRange() { - if(!initFlag) {return 0;} - TSystemDirectory sysdir(dir.Data(), dir.Data()); - TList *flist = sysdir.GetListOfFiles(); - filelist.clear(); - int counter = 0; - if(flist) { - TSystemFile *file; - TString fname, temp; - string runno; - for(int i=MinRun; i<=MaxRun; i++) {//loop over range - TIter next_element(flist);//list iterator - runno = "_"+to_string(i) + end.Data(); //suffix is now _#.endData - while((file = (TSystemFile*)next_element())) {//look through directory until file found - temp = file->GetName(); - if(!file->IsDirectory()&&temp.BeginsWith(run.Data())&&temp.EndsWith(runno.c_str())){ - counter++; - fname = dir+temp; - filelist.push_back(fname); - break; //if we find the file, break out of iterator loop - } - } - } - if(counter>0) { - delete flist; - return 1; - } else { - cerr<<"Unable to find files with matching run name in directory; check input.txt"<Add(filelist[i].Data()); - } - cout<<"Merging runs into single file..."<Merge(output,0,"fast"); - cout<<"Finished merging"<Add(filelist[i]); - } - cout<<"Merging runs "<Merge(output,0,"fast"); - cout<<"Finished merging"<IsOpen()) output->Close(); - return 0; -} +} \ No newline at end of file diff --git a/src/evb/RunCollector.h b/src/evb/RunCollector.h new file mode 100644 index 0000000..02822db --- /dev/null +++ b/src/evb/RunCollector.h @@ -0,0 +1,47 @@ +/*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 diff --git a/src/evb/ShiftMap.cpp b/src/evb/ShiftMap.cpp index 4a412e8..2cc4e58 100644 --- a/src/evb/ShiftMap.cpp +++ b/src/evb/ShiftMap.cpp @@ -12,58 +12,73 @@ #include "EventBuilder.h" #include "ShiftMap.h" -ShiftMap::ShiftMap() : - m_filename(""), is_set(false) -{ -} +namespace EventBuilder { -ShiftMap::ShiftMap(const std::string& filename) : - m_filename(filename), is_set(false) -{ - ParseFile(); -} - -ShiftMap::~ShiftMap() {} - -void ShiftMap::SetFile(const std::string& filename) { - m_filename = filename; - ParseFile(); -} - -Long64_t ShiftMap::GetShift(int gchan) { - if(!is_set) return 0.0; + ShiftMap::ShiftMap() : + m_filename(""), is_set(false) + { + } - auto iter = m_map.find(gchan); - if(iter == m_map.end()) { - return 0.0; - } else return iter->second; -} - -void ShiftMap::ParseFile() { - std::ifstream input(m_filename); - if(!input.is_open()) return; - - int board, channel, gchan; - Long64_t shift; - std::string junk, temp; - - std::getline(input, junk); - std::getline(input, junk); - - while(input>>board) { - input>>temp; - input>>shift; - if(temp == "all") { //keyword to set all channels in this board to same shift - for(int i=0; i<16; i++) { - gchan = board*16 + i; + ShiftMap::ShiftMap(const std::string& filename) : + m_filename(filename), is_set(false) + { + ParseFile(); + } + + ShiftMap::~ShiftMap() {} + + void ShiftMap::SetFile(const std::string& filename) + { + m_filename = filename; + ParseFile(); + } + + int64_t ShiftMap::GetShift(int gchan) + { + if(!is_set) + return 0.0; + + auto iter = m_map.find(gchan); + if(iter == m_map.end()) + return 0.0; + else + return iter->second; + } + + void ShiftMap::ParseFile() + { + std::ifstream input(m_filename); + if(!input.is_open()) + return; + + int board, channel, gchan; + int64_t shift; + std::string junk, temp; + + std::getline(input, junk); + std::getline(input, junk); + + while(input>>board) + { + input>>temp; + input>>shift; + if(temp == "all") + { //keyword to set all channels in this board to same shift + for(int i=0; i<16; i++) + { + gchan = board*16 + i; + m_map[gchan] = shift; + } + } + else + { + channel = stoi(temp); + gchan = channel + board*16; m_map[gchan] = shift; } - } else { - channel = stoi(temp); - gchan = channel + board*16; - m_map[gchan] = shift; } + + is_set = true; } - is_set = true; -} +} \ No newline at end of file diff --git a/include/ShiftMap.h b/src/evb/ShiftMap.h similarity index 51% rename from include/ShiftMap.h rename to src/evb/ShiftMap.h index 64eea5e..afb26aa 100644 --- a/include/ShiftMap.h +++ b/src/evb/ShiftMap.h @@ -12,24 +12,27 @@ #ifndef SHIFTMAP_H #define SHIFTMAP_H -class ShiftMap { -public: - ShiftMap(); - ShiftMap(const std::string& filename); - ~ShiftMap(); - void SetFile(const std::string& filename); - inline bool IsSet() { return is_set; }; - inline std::string GetFilename() { return m_filename; }; - Long64_t GetShift(int gchan); - -private: - void ParseFile(); - - std::string m_filename; - bool is_set; - - std::unordered_map m_map; - -}; - +namespace EventBuilder { + + class ShiftMap + { + public: + ShiftMap(); + ShiftMap(const std::string& filename); + ~ShiftMap(); + void SetFile(const std::string& filename); + inline bool IsSet() { return is_set; } + inline std::string GetFilename() { return m_filename; } + int64_t GetShift(int gchan); + + private: + void ParseFile(); + + std::string m_filename; + bool is_set; + + std::unordered_map m_map; + + }; +} #endif diff --git a/src/evb/SlowSort.cpp b/src/evb/SlowSort.cpp index 3d53c06..a18702a 100644 --- a/src/evb/SlowSort.cpp +++ b/src/evb/SlowSort.cpp @@ -10,78 +10,92 @@ #include "EventBuilder.h" #include "SlowSort.h" -/*Constructor takes input of coincidence window size, and fills sabre channel map*/ -SlowSort::SlowSort() : - coincWindow(-1.0), eventFlag(false) -{ - event_stats = new TH2F("coinc_event_stats","coinc_events_stats;global channel;number of coincident hits;counts",144,0,144,20,0,20); -} +namespace EventBuilder { + + /*Constructor takes input of coincidence window size, and fills sabre channel map*/ + SlowSort::SlowSort() : + coincWindow(-1.0), eventFlag(false) + { + event_stats = new TH2F("coinc_event_stats","coinc_events_stats;global channel;number of coincident hits;counts",144,0,144,20,0,20); + } + + SlowSort::SlowSort(double windowSize) : + coincWindow(windowSize), eventFlag(false) + { + event_stats = new TH2F("coinc_event_stats","coinc_events_stats;global channel;number of coincident hits;counts",144,0,144,20,0,20); + } + + SlowSort::~SlowSort() {} + + bool SlowSort::AddHitToEvent(CompassHit& mhit) + { + DPPChannel curHit; + curHit.Timestamp = mhit.timestamp/1.0e3; //convert to ns for easier drawing + curHit.Energy = mhit.energy; + curHit.EnergyShort = mhit.energyShort; + curHit.EnergyCal = mhit.energyCalibrated; + curHit.Channel = mhit.channel; + curHit.Board = mhit.board; + curHit.Flags = mhit.flags; + curHit.Samples = mhit.samples; + + if(hitList.empty()) + { + startTime = curHit.Timestamp; + hitList.push_back(curHit); + } + else if (curHit.Timestamp < previousHitTime) + return false; + else if ((curHit.Timestamp - startTime) < coincWindow) + hitList.push_back(curHit); + else + { + ProcessEvent(); + hitList.clear(); + startTime = curHit.Timestamp; + hitList.push_back(curHit); + eventFlag = true; + } + + return true; + } + + void SlowSort::FlushHitsToEvent() + { + if(hitList.empty()) + { + eventFlag = false; + return; + } + + ProcessEvent(); + hitList.clear(); + eventFlag = true; + } + + std::vector SlowSort::GetEvent() + { + eventFlag = false; + return event; + } + + /*Function called when a start of a coincidence event is detected*/ + void SlowSort::StartEvent() + { + if(hitList.size() != 0) + { + EVB_WARN("Attempting to initalize hitList when not cleared!! Check processing order."); + } + startTime = hit.Timestamp; + hitList.push_back(hit); + } + + /*Function called when an event outside the coincidence window is detected + *Process all of the hits in the list, and write them to the sorted tree + */ + void SlowSort::ProcessEvent() + { + event = hitList; + } -SlowSort::SlowSort(double windowSize) : - coincWindow(windowSize), eventFlag(false) -{ - event_stats = new TH2F("coinc_event_stats","coinc_events_stats;global channel;number of coincident hits;counts",144,0,144,20,0,20); -} - -SlowSort::~SlowSort() { -} - -bool SlowSort::AddHitToEvent(CompassHit& mhit) { - DPPChannel curHit; - curHit.Timestamp = mhit.timestamp/1.0e3; //convert to ns for easier drawing - curHit.Energy = mhit.lgate; - curHit.EnergyShort = mhit.sgate; - curHit.Channel = mhit.channel; - curHit.Board = mhit.board; - curHit.Flags = mhit.flags; - curHit.Samples = mhit.samples; - - if(hitList.empty()) { - startTime = curHit.Timestamp; - hitList.push_back(curHit); - } else if (curHit.Timestamp < previousHitTime) { - return false; - } else if ((curHit.Timestamp - startTime) < coincWindow) { - hitList.push_back(curHit); - } else { - ProcessEvent(); - hitList.clear(); - startTime = curHit.Timestamp; - hitList.push_back(curHit); - eventFlag = true; - } - - return true; -} - -void SlowSort::FlushHitsToEvent() { - if(hitList.empty()) { - eventFlag = false; - return; - } - - ProcessEvent(); - hitList.clear(); - eventFlag = true; -} - -vector SlowSort::GetEvent() { - eventFlag = false; - return event; -} - -/*Function called when a start of a coincidence event is detected*/ -void SlowSort::StartEvent() { - if(hitList.size() != 0) { - cerr<<"Attempting to initalize hitList when not cleared!! Check processing order."< + +namespace EventBuilder { + + class SlowSort + { + public: + SlowSort(); + SlowSort(double windowSize); + ~SlowSort(); + inline void SetWindowSize(double window) { coincWindow = window; } + bool AddHitToEvent(CompassHit& mhit); + std::vector GetEvent(); + inline TH2F* GetEventStats() { return event_stats; } + void FlushHitsToEvent(); //For use with *last* hit list + inline bool IsEventReady() { return eventFlag; } + + private: + void InitVariableMaps(); + void Reset(); + void StartEvent(); + void ProcessEvent(); + + double coincWindow; + std::vector hitList; + std::vector event; + bool eventFlag; + DPPChannel hit; + + double startTime, previousHitTime; + + TH2F* event_stats; + + }; + +} + +#endif diff --git a/src/evb/Stopwatch.cpp b/src/evb/Stopwatch.cpp index e607529..bf5441d 100644 --- a/src/evb/Stopwatch.cpp +++ b/src/evb/Stopwatch.cpp @@ -8,25 +8,34 @@ #include "EventBuilder.h" #include "Stopwatch.h" -Stopwatch::Stopwatch() { - start_time = Clock::now(); - stop_time = start_time; -} +namespace EventBuilder { -Stopwatch::~Stopwatch() {} + Stopwatch::Stopwatch() + { + start_time = Clock::now(); + stop_time = start_time; + } + + Stopwatch::~Stopwatch() {} + + void Stopwatch::Start() + { + start_time = Clock::now(); + } + + void Stopwatch::Stop() + { + stop_time = Clock::now(); + } + + double Stopwatch::GetElapsedSeconds() + { + return std::chrono::duration_cast>(stop_time-start_time).count(); + } + + double Stopwatch::GetElapsedMilliseconds() + { + return std::chrono::duration_cast>(stop_time-start_time).count()*1000.0; + } -void Stopwatch::Start() { - start_time = Clock::now(); -} - -void Stopwatch::Stop() { - stop_time = Clock::now(); -} - -double Stopwatch::GetElapsedSeconds() { - return std::chrono::duration_cast>(stop_time-start_time).count(); -} - -double Stopwatch::GetElapsedMilliseconds() { - return std::chrono::duration_cast>(stop_time-start_time).count()*1000.0; } \ No newline at end of file diff --git a/src/evb/Stopwatch.h b/src/evb/Stopwatch.h new file mode 100644 index 0000000..d1ac8c8 --- /dev/null +++ b/src/evb/Stopwatch.h @@ -0,0 +1,33 @@ +/* + Stopwatch.h + Simple class designed to provide timing info on parts of the process. + Only for use in development. + + Written by G.W. McCann Oct. 2020 +*/ +#ifndef STOPWATCH_H +#define STOPWATCH_H + +#include + +namespace EventBuilder { + + class Stopwatch + { + public: + Stopwatch(); + ~Stopwatch(); + void Start(); + void Stop(); + double GetElapsedSeconds(); + double GetElapsedMilliseconds(); + + private: + using Time = std::chrono::high_resolution_clock::time_point; + using Clock = std::chrono::high_resolution_clock; + + Time start_time, stop_time; + }; + +} +#endif \ No newline at end of file diff --git a/src/evbdict/CMakeLists.txt b/src/evbdict/CMakeLists.txt new file mode 100644 index 0000000..b7fac64 --- /dev/null +++ b/src/evbdict/CMakeLists.txt @@ -0,0 +1,17 @@ +add_library(EVBDict SHARED) + +target_include_directories(EVBDict SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +ROOT_GENERATE_DICTIONARY(evbdict DataStructs.h LINKDEF LinkDef_evb.h MODULE EVBDict) + +target_sources(EVBDict PRIVATE + DataStructs.h + DataStructs.cpp +) +target_link_libraries(EVBDict ${ROOT_LIBRARIES}) +set_target_properties(EVBDict PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${EVB_LIBRARY_DIR}) + +add_custom_command(TARGET EVBDict POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_BINARY_DIR}/libEVBDict_rdict.pcm + ${EVB_LIBRARY_DIR}/libEVBDict_rdict.pcm +) \ No newline at end of file diff --git a/src/evbdict/DataStructs.cpp b/src/evbdict/DataStructs.cpp new file mode 100644 index 0000000..bef9d3a --- /dev/null +++ b/src/evbdict/DataStructs.cpp @@ -0,0 +1,3 @@ +#include "DataStructs.h" + +bool EnforceDictonaryLinked() { return true; } \ No newline at end of file diff --git a/src/evbdict/DataStructs.h b/src/evbdict/DataStructs.h new file mode 100644 index 0000000..db8160a --- /dev/null +++ b/src/evbdict/DataStructs.h @@ -0,0 +1,28 @@ +/*DataStructs.h + *Data structures for analysis. To be implemented as a dictionary for ROOT in LinkDef + *Based on: FocalPlane_SABRE.h + *Gordon M. Oct. 2019 + */ +#ifndef DATA_STRUCTS_H +#define DATA_STRUCTS_H + +#include +#include + +struct DPPChannel +{ + double Timestamp; + int Channel, Board, Energy, EnergyShort; + int64_t EnergyCal; + int Flags; + std::vector Samples; +}; + +/* + ROOT does a bad job of ensuring that header-only type dictionaries (the only type they explicity accept) + are linked when compiled as shared libraries (the recommended method). As a work around, a dummy function that + ensures the library is linked (better than no-as-needed which I dont think is in general supported across platforms) +*/ +bool EnforceDictonaryLinked(); + +#endif diff --git a/include/LinkDef_evb.h b/src/evbdict/LinkDef_evb.h similarity index 100% rename from include/LinkDef_evb.h rename to src/evbdict/LinkDef_evb.h diff --git a/src/gui_main.cpp b/src/gui_main.cpp index be2cb82..b406efd 100644 --- a/src/gui_main.cpp +++ b/src/gui_main.cpp @@ -3,6 +3,8 @@ #include "EVBMainFrame.h" int main(int argc, char** argv) { + EventBuilder::Logger::Init(); + TApplication app("app", &argc, argv); UInt_t h = 400; UInt_t w = 400; diff --git a/src/guidict/CMakeLists.txt b/src/guidict/CMakeLists.txt new file mode 100644 index 0000000..f434e36 --- /dev/null +++ b/src/guidict/CMakeLists.txt @@ -0,0 +1,23 @@ +add_library(GuiDict SHARED) + +target_include_directories(GuiDict SYSTEM PUBLIC ../../vendor/spdlog/include/ ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +ROOT_GENERATE_DICTIONARY(guidict EVBMainFrame.h FileViewFrame.h LINKDEF LinkDef_Gui.h MODULE GuiDict) + +target_sources(GuiDict PRIVATE + FileViewFrame.h + FileViewFrame.cpp + EVBMainFrame.h + EVBMainFrame.cpp +) +target_link_libraries(GuiDict + EVBDict + EventBuilderCore + ${ROOT_LIBRARIES} +) +set_target_properties(GuiDict PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${EVB_LIBRARY_DIR}) + +add_custom_command(TARGET GuiDict POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_BINARY_DIR}/libGuiDict_rdict.pcm + ${EVB_LIBRARY_DIR}/libGuiDict_rdict.pcm +) \ No newline at end of file diff --git a/src/gui/EVBMainFrame.cpp b/src/guidict/EVBMainFrame.cpp similarity index 79% rename from src/gui/EVBMainFrame.cpp rename to src/guidict/EVBMainFrame.cpp index c565e84..d43a82f 100644 --- a/src/gui/EVBMainFrame.cpp +++ b/src/guidict/EVBMainFrame.cpp @@ -1,4 +1,3 @@ -#include "EventBuilder.h" #include "EVBMainFrame.h" #include "FileViewFrame.h" #include @@ -12,6 +11,8 @@ EVBMainFrame::EVBMainFrame(const TGWindow* p, UInt_t w, UInt_t h) : SetCleanup(kDeepCleanup); MAIN_W = w; MAIN_H = h; + fInfo = new TGFileInfo(); + //Organization hints TGLayoutHints *fchints = new TGLayoutHints(kLHintsExpandX|kLHintsExpandY,5,5,5,5); TGLayoutHints *fhints = new TGLayoutHints(kLHintsExpandX|kLHintsCenterY,5,5,5,5); @@ -76,9 +77,9 @@ EVBMainFrame::EVBMainFrame(const TGWindow* p, UInt_t w, UInt_t h) : TGLabel *typelabel = new TGLabel(RunFrame, "Operation Type:"); fTypeBox = new TGComboBox(RunFrame, TYPEBOX); //Needs modification for new conversion based sorting GWM -- Dec 2020 - fTypeBox->AddEntry("Convert Slow", GWMEventBuilder::CONVERT_S); - fTypeBox->AddEntry("Convert", GWMEventBuilder::CONVERT); - fTypeBox->AddEntry("Merge ROOT", GWMEventBuilder::MERGE); + fTypeBox->AddEntry("Convert Slow", EventBuilder::EVBApp::Operation::ConvertSlow); + fTypeBox->AddEntry("Convert", EventBuilder::EVBApp::Operation::Convert); + fTypeBox->AddEntry("Merge ROOT", EventBuilder::EVBApp::Operation::Merge); fTypeBox->Resize(200,20); fTypeBox->Connect("Selected(Int_t, Int_t)","EVBMainFrame",this,"HandleTypeSelection(Int_t,Int_t)"); TGLabel *rminlabel = new TGLabel(RunFrame, "Min Run:"); @@ -105,7 +106,6 @@ EVBMainFrame::EVBMainFrame(const TGWindow* p, UInt_t w, UInt_t h) : fProgressBar = new TGHProgressBar(PBFrame, TGProgressBar::kFancy, w); fProgressBar->ShowPosition(); fProgressBar->SetBarColor("lightblue"); - fBuilder.AttachProgressBar(fProgressBar); PBFrame->AddFrame(pbLabel, lhints); PBFrame->AddFrame(fProgressBar, fhints); @@ -121,6 +121,8 @@ EVBMainFrame::EVBMainFrame(const TGWindow* p, UInt_t w, UInt_t h) : AddFrame(InputFrame, fchints); AddFrame(PBFrame, fpbhints); + fBuilder.SetProgressCallbackFunc(BIND_PROGRESS_CALLBACK_FUNCTION(EVBMainFrame::SetProgressBarPosition)); + fBuilder.SetProgressFraction(0.01); SetWindowName("GWM Event Builder"); MapSubwindows(); Resize(); @@ -128,54 +130,77 @@ EVBMainFrame::EVBMainFrame(const TGWindow* p, UInt_t w, UInt_t h) : } -EVBMainFrame::~EVBMainFrame() { +EVBMainFrame::~EVBMainFrame() +{ Cleanup(); + delete fInfo; delete this; } -void EVBMainFrame::CloseWindow() { +void EVBMainFrame::CloseWindow() +{ gApplication->Terminate(); } -void EVBMainFrame::HandleMenuSelection(int id) { - if(id == M_SAVE_CONFIG) new FileViewFrame(gClient->GetRoot(), this, MAIN_W*0.5, MAIN_H*0.25, this, M_SAVE_CONFIG); - else if(id == M_LOAD_CONFIG) new FileViewFrame(gClient->GetRoot(), this, MAIN_W*0.5, MAIN_H*0.25, this, M_LOAD_CONFIG); - else if(id == M_EXIT) CloseWindow(); +void EVBMainFrame::HandleMenuSelection(int id) +{ + if(id == M_SAVE_CONFIG) + { + new TGFileDialog(gClient->GetRoot(), this, kFDOpen, fInfo); + if(fInfo->fFilename) + SaveConfig(fInfo->fFilename); + } + else if(id == M_LOAD_CONFIG) + { + new TGFileDialog(gClient->GetRoot(), this, kFDOpen, fInfo); + if(fInfo->fFilename) + LoadConfig(fInfo->fFilename); + } + else if(id == M_EXIT) + CloseWindow(); } -void EVBMainFrame::DoOpenWorkdir() { +void EVBMainFrame::DoOpenWorkdir() +{ new FileViewFrame(gClient->GetRoot(), this, MAIN_W*0.5, MAIN_H*0.25, this, WORKDIR); } -void EVBMainFrame::DoOpenSMapfile() { - new FileViewFrame(gClient->GetRoot(), this, MAIN_W*0.5, MAIN_H*0.25, this, SMAP); +void EVBMainFrame::DoOpenSMapfile() +{ + new TGFileDialog(gClient->GetRoot(), this, kFDOpen, fInfo); + if(fInfo->fFilename) + DisplaySMap(fInfo->fFilename); } -void EVBMainFrame::DoOpenScalerfile() { - new FileViewFrame(gClient->GetRoot(), this, MAIN_W*0.5, MAIN_H*0.25, this, SCALER); +void EVBMainFrame::DoOpenScalerfile() +{ + new TGFileDialog(gClient->GetRoot(), this, kFDOpen, fInfo); + if(fInfo->fFilename) + DisplayScaler(fInfo->fFilename); } -void EVBMainFrame::DoRun() { +void EVBMainFrame::DoRun() +{ DisableAllInput(); SetParameters(); int type = fTypeBox->GetSelected(); - fBuilder.SetAnalysisType(type); - switch(type) { - case GWMEventBuilder::CONVERT : + switch(type) + { + case EventBuilder::EVBApp::Operation::Convert : { fBuilder.Convert2RawRoot(); break; } - case GWMEventBuilder::MERGE : + case EventBuilder::EVBApp::Operation::Merge : { fBuilder.MergeROOTFiles(); break; } - case GWMEventBuilder::CONVERT_S : + case EventBuilder::EVBApp::Operation::ConvertSlow : { fBuilder.Convert2SortedRoot(); break; @@ -185,11 +210,13 @@ void EVBMainFrame::DoRun() { EnableAllInput(); } -void EVBMainFrame::HandleTypeSelection(int box, int entry) { +void EVBMainFrame::HandleTypeSelection(int box, int entry) +{ fRunButton->SetState(kButtonUp); } -bool EVBMainFrame::SetParameters() { +bool EVBMainFrame::SetParameters() +{ fBuilder.SetRunRange(fRMinField->GetIntNumber(), fRMaxField->GetIntNumber()); fBuilder.SetSlowCoincidenceWindow(fSlowWindowField->GetNumber()); fBuilder.SetBufferSize(fBufferSizeField->GetNumber()); @@ -200,27 +227,32 @@ bool EVBMainFrame::SetParameters() { return true; } -void EVBMainFrame::DisplayWorkdir(const char* dir) { +void EVBMainFrame::DisplayWorkdir(const char* dir) +{ fWorkField->SetText(dir); fBuilder.SetWorkDirectory(dir); } -void EVBMainFrame::DisplaySMap(const char* file) { +void EVBMainFrame::DisplaySMap(const char* file) +{ fSMapField->SetText(file); fBuilder.SetBoardShiftFile(file); } -void EVBMainFrame::DisplayScaler(const char* file) { +void EVBMainFrame::DisplayScaler(const char* file) +{ fScalerField->SetText(file); fBuilder.SetScalerFile(file); } -void EVBMainFrame::SaveConfig(const char* file) { +void EVBMainFrame::SaveConfig(const char* file) +{ std::string filename = file; fBuilder.WriteConfigFile(filename); } -void EVBMainFrame::LoadConfig(const char* file) { +void EVBMainFrame::LoadConfig(const char* file) +{ std::string filename = file; fBuilder.ReadConfigFile(filename); @@ -236,24 +268,26 @@ void EVBMainFrame::LoadConfig(const char* file) { } -void EVBMainFrame::UpdateWorkdir() { +void EVBMainFrame::UpdateWorkdir() +{ const char* dir = fWorkField->GetText(); fBuilder.SetWorkDirectory(dir); } -void EVBMainFrame::UpdateSMap() { +void EVBMainFrame::UpdateSMap() +{ const char* file = fSMapField->GetText(); fBuilder.SetBoardShiftFile(file); } -void EVBMainFrame::UpdateScaler() { +void EVBMainFrame::UpdateScaler() +{ const char* file = fScalerField->GetText(); fBuilder.SetScalerFile(file); } -void EVBMainFrame::RunMerge(const char* file, const char* dir) {} - -void EVBMainFrame::DisableAllInput() { +void EVBMainFrame::DisableAllInput() +{ fRunButton->SetState(kButtonDisabled); fOpenWorkButton->SetState(kButtonDisabled); fOpenSMapButton->SetState(kButtonDisabled); @@ -272,7 +306,8 @@ void EVBMainFrame::DisableAllInput() { fSlowWindowField->SetState(false); } -void EVBMainFrame::EnableAllInput() { +void EVBMainFrame::EnableAllInput() +{ fRunButton->SetState(kButtonUp); fOpenWorkButton->SetState(kButtonUp); fOpenSMapButton->SetState(kButtonUp); @@ -289,5 +324,12 @@ void EVBMainFrame::EnableAllInput() { fRMinField->SetState(true); fSlowWindowField->SetState(true); - } + +void EVBMainFrame::SetProgressBarPosition(uint64_t val, uint64_t total) +{ + fProgressBar->SetMin(0); + fProgressBar->SetMax(total); + fProgressBar->SetPosition(val); + gSystem->ProcessEvents(); +} \ No newline at end of file diff --git a/include/EVBMainFrame.h b/src/guidict/EVBMainFrame.h similarity index 88% rename from include/EVBMainFrame.h rename to src/guidict/EVBMainFrame.h index de79195..0196ae4 100644 --- a/include/EVBMainFrame.h +++ b/src/guidict/EVBMainFrame.h @@ -10,12 +10,14 @@ #include #include #include +#include #include #include -#include "GWMEventBuilder.h" +#include "../evb/EVBApp.h" -class EVBMainFrame : public TGMainFrame { +class EVBMainFrame : public TGMainFrame +{ public: EVBMainFrame(const TGWindow* p, UInt_t w, UInt_t h); virtual ~EVBMainFrame(); @@ -38,6 +40,7 @@ public: void RunMerge(const char* dir, const char* file); void DisableAllInput(); void EnableAllInput(); + void SetProgressBarPosition(uint64_t val, uint64_t total); enum WidgetId { @@ -70,7 +73,9 @@ private: TGPopupMenu *fFileMenu; - GWMEventBuilder fBuilder; + TGFileInfo *fInfo; + + EventBuilder::EVBApp fBuilder; int counter; UInt_t MAIN_W, MAIN_H; diff --git a/src/gui/FileViewFrame.cpp b/src/guidict/FileViewFrame.cpp similarity index 99% rename from src/gui/FileViewFrame.cpp rename to src/guidict/FileViewFrame.cpp index 4ac5960..56faba3 100644 --- a/src/gui/FileViewFrame.cpp +++ b/src/guidict/FileViewFrame.cpp @@ -9,7 +9,6 @@ */ -#include "EventBuilder.h" #include "FileViewFrame.h" #include #include @@ -30,7 +29,7 @@ FileViewFrame::FileViewFrame(const TGWindow* p, const TGFrame* main, UInt_t w, U /*Layout orgainization hints*/ TGLayoutHints *fhints = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY,5,5,5,5); - TGLayoutHints *thints = new TGLayoutHints(kLHintsExpandX|kLHintsCenterY,5,5,5,5); + TGLayoutHints *thints = new TGLayoutHints(kLHintsExpandX|kLHintsBottom,5,5,5,5); TGLayoutHints *fchints = new TGLayoutHints(kLHintsExpandX|kLHintsExpandY,5,5,5,5); TGLayoutHints *lhints = new TGLayoutHints(kLHintsLeft|kLHintsTop,5,5,5,5); TGLayoutHints *fbhints = new TGLayoutHints(kLHintsCenterX|kLHintsBottom,5,5,5,5); diff --git a/include/FileViewFrame.h b/src/guidict/FileViewFrame.h similarity index 100% rename from include/FileViewFrame.h rename to src/guidict/FileViewFrame.h diff --git a/include/LinkDef_Gui.h b/src/guidict/LinkDef_Gui.h similarity index 100% rename from include/LinkDef_Gui.h rename to src/guidict/LinkDef_Gui.h diff --git a/src/main.cpp b/src/main.cpp index e90eec5..d91fd02 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,11 +1,14 @@ #include "EventBuilder.h" -#include "GWMEventBuilder.h" +#include "EVBApp.h" #include "Stopwatch.h" int main(int argc, char** argv) { - if(argc != 3) { - std::cerr<<"Incorrect number of command line arguments!"<