From d4ebec49d7dabc4888e19451c982bd0e10258d46 Mon Sep 17 00:00:00 2001 From: Gordon McCann <43148247+gwm17@users.noreply.github.com> Date: Wed, 22 Jun 2022 16:15:47 -0400 Subject: [PATCH 1/2] Fix orderchecker bug --- src/evb/OrderChecker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/evb/OrderChecker.cpp b/src/evb/OrderChecker.cpp index 55db24b..4beddb7 100644 --- a/src/evb/OrderChecker.cpp +++ b/src/evb/OrderChecker.cpp @@ -29,7 +29,7 @@ namespace EventBuilder { for(Long64_t i=0; iGetEntries(); i++) { - tree->GetEntry(); + tree->GetEntry(i); if(prevStamp >= ts) { EVB_WARN("Bad order at entry {0} out of {1}",i,tree->GetEntries()); @@ -41,4 +41,4 @@ namespace EventBuilder { return true; } -} \ No newline at end of file +} From af0228fac92b13bf74c7862e8f1b22495b609b35 Mon Sep 17 00:00:00 2001 From: Gordon McCann Date: Mon, 11 Jul 2022 15:05:44 -0400 Subject: [PATCH 2/2] Fix a few typos and old stuff in README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 31b0bd8..c456f17 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@ cmake .. make ``` -To clone the repository use `git clone --recursive https://github.com/sesps/SPS_SABRE_EventBuilder.git`. If you're using the devel branch be sure to specify this with the `--branch` flag. The recursive flag is important; this tells github to pull all submodules associated with the repository. +To clone the repository use `git clone --recursive https://github.com/sesps/SPS_SABRE_EventBuilder.git`. The recursive flag is important; this tells github to pull all submodules associated with the repository. The binaries are installed to the `bin` directory of the event builder, and should be run from the event builder directory (i.e. `./bin/EventBuilderGui`). -In general, one should only build for Release (this is the default), for maximum optimization. However, it can be useful to run in Debug (change the cmake command to `cmake -DCMAKE_BUILD_TYPE_DEBUG ..`) when testing new features. +In general, one should only build for Release (this is the default), for maximum optimization. However, it can be useful to run in Debug (change the cmake command to `cmake -DCMAKE_BUILD_TYPE=Debug ..`) when testing new features. ## EventBuilder vs. EventBuilderGui There are two programs provided. They are `EventBuilderGui` and `EventBuilder`. The first is a full GUI version of the event builder. The GUI supports all conversion methods and the plotting tool. @@ -90,6 +90,6 @@ size (again center the peak on 0, the width of the peak becomes the fast window) 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 -- Requires ROOT version which supports CMake dictionary generation -- Requires CMake > 3.16 +- Requires ROOT >= 6.22.04 for C++17 support +- Requires CMake > 3.16 for pch suport - This version is for data from CAEN CoMPASS > 2.0. Data from older CoMPASS versions are not compatible. \ No newline at end of file