Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4 to v5 Port #48

Merged
merged 149 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from 148 commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
8016812
Adding tc making and rearranging configuration a bit
alessandrothea Jan 26, 2024
a43b31f
Initial fragment removal.
aeoranday Feb 8, 2024
7041a43
Bug fix.
aeoranday Feb 8, 2024
92bb686
Prefer single row over single column.
aeoranday Feb 8, 2024
b55eace
Removed fragment separation.
aeoranday Feb 8, 2024
790d18f
Updated to make use of new TPData.tp_data definition.
aeoranday Feb 8, 2024
648cfd7
Updated to new format and added tick/second conversoin.
aeoranday Feb 8, 2024
844b3d2
Bug fix and conversion correction.
aeoranday Feb 8, 2024
cc3ded5
Small style improvements.
aeoranday Feb 8, 2024
d96eccd
Fetches run number and file index.
aeoranday Feb 8, 2024
8edc6fd
Shifted to double hist on PdfPages.
aeoranday Feb 13, 2024
7884c1b
Shifted to double hist on PdfPages.
aeoranday Feb 13, 2024
a3c04ac
Detailed analysis on ADC Integral vs ADC Peak.
aeoranday Feb 13, 2024
379adc9
Stops importing an empty binding.
aeoranday Feb 13, 2024
614c35b
Merge pull request #11 from DUNE-DAQ/aeoranday/fragment-removal
aeoranday Feb 13, 2024
0e607dc
Merge branch 'production/v4' into aeoranday/removing-pybindsrc-ref.
aeoranday Feb 13, 2024
6dbe5d6
Merge pull request #15 from DUNE-DAQ/aeoranday/removing-pybindsrc-ref
aeoranday Feb 13, 2024
7f1e14b
Flipped the linear/log ordering.
aeoranday Feb 13, 2024
cf86074
Added seconds option, variable bins, and xlabel.
aeoranday Feb 14, 2024
6f8e962
Merge branch 'production/v4' into aeoranday/hdf5-file-attributes.
aeoranday Feb 14, 2024
8cb33b2
Create dir on run id and file index and dump.
aeoranday Feb 14, 2024
706bb80
Added an overwrite option and better word choice.
aeoranday Feb 14, 2024
1031b64
--overwrite bug fix on mkdir logic.
aeoranday Feb 14, 2024
2172bbe
Abstract HDF5 reader class.
aeoranday Feb 15, 2024
fbf708f
Working TC data loading from raw HDF5.
aeoranday Feb 15, 2024
0dacb0b
TC data member plotting.
aeoranday Feb 16, 2024
14f19c1
Unique save names and stats writing bug fix.
aeoranday Feb 16, 2024
1e0ab28
Added time spans and ADC integral plots.
aeoranday Feb 16, 2024
0b8dede
Changed double scaling display order and improved xticks.
aeoranday Feb 18, 2024
b14fc9a
Changed double scaling display order.
aeoranday Feb 18, 2024
f6644ab
Merge pull request #17 from DUNE-DAQ/aeoranday/hdf5-file-attributes
aeoranday Feb 19, 2024
5bb0d54
Expanding paths and style changes.
aeoranday Feb 20, 2024
df64ac1
Syncing .github/workflows/dunedaq-v4-cpp-ci.yml
jcfreeman2 Feb 20, 2024
e53c427
Changed import style and comments.
aeoranday Feb 21, 2024
a96ac25
Corrected seconds/ticks unit change.
aeoranday Feb 21, 2024
226b3d5
Updated docs for new TC plots.
aeoranday Feb 21, 2024
876e71b
Updated to use relative links.
aeoranday Feb 21, 2024
ab949f9
Merge branch 'production/v4' into aeoranday/tc-data-and-plots.
aeoranday Feb 21, 2024
fbec67c
Updated to better debug phrasing.
aeoranday Feb 21, 2024
d4bd37b
Merge branch 'production/v4' into aeoranday/double-histogram.
aeoranday Feb 22, 2024
8c357c3
Cleaning some redundant info.
aeoranday Feb 22, 2024
335c917
Typo bug fix.
aeoranday Feb 22, 2024
7e5cda3
Produces TCs. Creates at least 1 bad TC.
aeoranday Feb 23, 2024
8e3d16e
Merge branch 'production/v4' into thea/tc_processing.
aeoranday Feb 23, 2024
b8f6f50
Merge pull request #19 from DUNE-DAQ/aeoranday/tc-data-and-plots
aeoranday Feb 23, 2024
e2c4897
Merge branch 'production/v4' into thea/tc_processing.
aeoranday Feb 24, 2024
9280a6c
Added a skip to saving empty frags.
aeoranday Feb 24, 2024
8eafd96
Merge branch 'production/v4' into aeoranday/double-histogram.
aeoranday Feb 26, 2024
9149d52
Moved to script dir and made executable.
aeoranday Feb 26, 2024
e73551b
Move histograms to 1 PDF and remove old plots.
aeoranday Feb 26, 2024
20a65bb
Added TA versions.
aeoranday Feb 26, 2024
2ddcf76
Updated documentation.
aeoranday Feb 26, 2024
37c3553
Updated help to include TCs.
aeoranday Feb 26, 2024
94e3f80
Merge pull request #21 from DUNE-DAQ/thea/tc_processing
aeoranday Feb 26, 2024
e54e0bb
Merge pull request #22 from DUNE-DAQ/aeoranday/double-histogram
aeoranday Feb 26, 2024
0919da8
Merge branch 'aeoranday/python-reader-refactoring' into aeoranday/pyt…
aeoranday Feb 26, 2024
e702558
Added flake8 style configuration.
aeoranday Feb 26, 2024
e703f27
Made concrete some common methods.
aeoranday Feb 26, 2024
6a409b9
Made fragment path filtering automatic and required.
aeoranday Feb 26, 2024
29c4dba
Changed naming and code structure to improve readability.
aeoranday Feb 26, 2024
62dfe38
Changed from --quiet to -v with levels.
aeoranday Feb 26, 2024
8824352
Changed coding style and plotting to single PDFs.
aeoranday Feb 27, 2024
39aa15a
Added a general PDF plotting class.
aeoranday Feb 27, 2024
c095d56
Making use of PDFPlotter in dump scripts.
aeoranday Feb 27, 2024
b711ca0
Added common useful function methods.
aeoranday Feb 27, 2024
80ec100
Added a pip requirements.txt.
aeoranday Feb 27, 2024
de7a70e
Added documentation on the Python trgtools module.
aeoranday Feb 27, 2024
d10cf85
Added more details on Python trgtools module.
aeoranday Feb 27, 2024
181d901
Removed a debug comment.
aeoranday Feb 27, 2024
64ebafc
Updated for the new save format.
aeoranday Feb 27, 2024
1600c8d
Merge pull request #24 from DUNE-DAQ/prep-release/dunedaq-v4.3.0
aeoranday Feb 28, 2024
eee32c3
Merge pull request #23 from DUNE-DAQ/aeoranday/python-styles
aeoranday Feb 28, 2024
eeaf9a6
Created templated emulation unit class.
aeoranday Feb 26, 2024
1588f3e
Making use of the emulation units.
aeoranday Feb 29, 2024
1bbfeae
Added a naive timing for TA and TC processes.
aeoranday Feb 29, 2024
935272a
Changed to relative start times.
aeoranday Mar 11, 2024
3be0902
Merge pull request #27 from DUNE-DAQ/aeoranday/event-display-relative…
aeoranday Mar 11, 2024
b95f7e7
Fixed shared Python data members.
aeoranday Mar 13, 2024
4e5798d
Merge pull request #28 from DUNE-DAQ/aeoranday/python-data-sharing-fix
aeoranday Mar 15, 2024
2a0816b
Adding a check for 0 TA/TC creation.
aeoranday Mar 12, 2024
9625822
Updated documentation.
aeoranday Mar 22, 2024
a1139cc
Merge pull request #29 from DUNE-DAQ/aeo/update-process-tpstream-md
aeoranday Mar 22, 2024
e202627
Added timing measures for TX into TY.
aeoranday Mar 26, 2024
5afe8cf
Added find_dependency.
aeoranday Mar 26, 2024
d9f4734
Merge pull request #31 from DUNE-DAQ/aeo/find-dependency
aeoranday Mar 26, 2024
915aa2c
Merge branch 'production/v4' into aeoranday/emulation-units.
aeoranday Mar 26, 2024
96d1905
Merge branch 'production/v4' into aeoranday/emulation-units.
aeoranday Mar 26, 2024
99877b4
Refined timing measure to creator TP/TA.
aeoranday Mar 26, 2024
c5402db
Merge pull request #26 from DUNE-DAQ/aeoranday/emulation-units
aeoranday Mar 26, 2024
b3f9c23
Updating to v1.1.0.
aeoranday Mar 28, 2024
e4b4aa8
Merge pull request #32 from DUNE-DAQ/aeo/v1.1.0
aeoranday Mar 28, 2024
a54d2f9
Fixed multi-fragment TimeSlice processing.
aeoranday Apr 2, 2024
67f038d
Merge pull request #33 from DUNE-DAQ/aeo/process-tpstream-multi-frag-…
aeoranday Apr 4, 2024
0060057
Updated version to v1.1.1
MRiganSUSX Apr 11, 2024
f08a29c
Merge pull request #34 from DUNE-DAQ/mrigan/version_update
MRiganSUSX Apr 11, 2024
9990ce9
Syncing .github/workflows/dunedaq-v4-cpp-ci.yml
Apr 13, 2024
da3da9c
Merge pull request #35 from DUNE-DAQ/prep-release/fddaq-v4.4.0
jcfreeman2 Apr 23, 2024
8bc7369
Syncing .github/workflows/dunedaq-v4-cpp-ci.yml
andrewmogan Apr 25, 2024
201ec58
Adding latency option to the emulation app, + more quiet
ArturSztuc May 8, 2024
547780c
More robust csv latencies filename/path for saving
ArturSztuc May 8, 2024
4cfd961
Adding full latency output per-tp in emulation
ArturSztuc May 8, 2024
55d7cc2
Script that converts large tp latency output to smaller TA latencies
ArturSztuc May 8, 2024
18779b1
Updating and adding the READMEs for latency measurements
ArturSztuc May 8, 2024
c5f9d65
Making latencies-gen python script executable
ArturSztuc May 15, 2024
3ba9ff7
Removing unused variables from tplatencies python script
ArturSztuc May 15, 2024
ae55600
Merge pull request #36 from DUNE-DAQ/feature/ta_latencies
ArturSztuc May 16, 2024
68ef959
Updating version to 1.1.2
ArturSztuc May 16, 2024
25398b5
Merge pull request #37 from DUNE-DAQ/asztuc/version_update
ArturSztuc May 16, 2024
9c1719f
Merge pull request #38 from DUNE-DAQ/patch/fddaq-v4.4.x
jcfreeman2 May 17, 2024
b4fb102
Syncing .github/workflows/dunedaq-v4-cpp-ci.yml
andrewmogan May 30, 2024
a60298c
Use trgdataformats TC Py-capsule.
aeoranday Jun 17, 2024
754a27e
Updating version to 1.1.2
ArturSztuc May 16, 2024
f014a37
Use trgdataformats Algorithms and Types.
aeoranday Jun 17, 2024
6c14dfe
Add Dynamic Algorithm and Type Plotting.
aeoranday Jun 17, 2024
8fa4108
Merge pull request #40 from DUNE-DAQ/aeo/tc-data-update
aeoranday Jun 18, 2024
368e1c5
Fix typo.
aeoranday Jun 18, 2024
ef1c760
Merge pull request #41 from DUNE-DAQ/aeo/enum-update
ArturSztuc Jun 18, 2024
8b231ba
Update To v1.1.3.
aeoranday Jun 18, 2024
a2ea4ed
Merge pull request #42 from DUNE-DAQ/aeo/v1.1.3-bump
aeoranday Jun 18, 2024
7d782bf
Merge pull request #43 from DUNE-DAQ/patch/fddaq-v4.4.x
jcfreeman2 Jun 20, 2024
f442706
Add No TX Fragment Guards.
aeoranday Jun 18, 2024
608ac2a
Add Alg/Type Histogram Fontsize.
aeoranday Jun 18, 2024
bd35e21
Squash Alg/Type Histogram Bins.
aeoranday Jun 18, 2024
0b18bf1
Add Color To Hist Axes.
aeoranday Jun 28, 2024
4c5f301
Add Unity And Transparency.
aeoranday Jun 28, 2024
8a2cfa3
Correct Help Descriptions
aeoranday Jul 1, 2024
830a432
Merge pull request #44 from DUNE-DAQ/aeo/style-update
aeoranday Jul 3, 2024
79c830e
Bumping version to v1.1.4
ArturSztuc Jul 5, 2024
a5ebda1
Merge pull request #45 from DUNE-DAQ/asztuc/version_bump_v1.1.4
ArturSztuc Jul 5, 2024
a93bb67
Merge pull request #47 from DUNE-DAQ/patch/fddaq-v4.4.x
jcfreeman2 Jul 10, 2024
032f259
Merge branch 'production/v4' into aeo/v4_to_v5.
aeoranday Aug 30, 2024
6e4fa1c
Update TA Types/Algs and Correct Docstrings.
aeoranday Aug 30, 2024
9f0a45f
Clean Compiler Warnings.
aeoranday Oct 1, 2024
b900eb9
Update Docs.
aeoranday Oct 2, 2024
0d7540d
Add Latency CSV Headers.
aeoranday Oct 2, 2024
333c2b2
Change Flag Order.
aeoranday Oct 2, 2024
cbca206
Use Integer X-Ticks.
aeoranday Oct 3, 2024
8eaaf82
Increase Errorbar Marker Size.
aeoranday Oct 3, 2024
dfb3b5d
Fix Minor Tick Coloring.
aeoranday Oct 3, 2024
24daedf
Add TP Transparency.
aeoranday Oct 3, 2024
e49494a
Remove Whitespace.
aeoranday Oct 3, 2024
04db73c
Remove Unused Option.
aeoranday Oct 3, 2024
a2c288a
Link Libraries.
aeoranday Oct 4, 2024
79a902c
Add Missing Edge Case & Remove Warning.
aeoranday Oct 4, 2024
19a51a4
Replace 'np.ndarray' With NDArray.
aeoranday Oct 7, 2024
f54a5de
Add Primary Data Indexing.
aeoranday Oct 7, 2024
de9184c
Update TX Extraction.
aeoranday Oct 7, 2024
28a96d3
Upgrade to v2.0.0.
aeoranday Oct 7, 2024
0378a6f
Remove Placeholder Unit Test.
aeoranday Oct 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions .github/workflows/dunedaq-v4-cpp-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: build-develop

# Controls when the action will run. Workflow runs when manually triggered using the UI
# or API.
on:
push:
branches:
- production/v4
- patch/*
- prep-release/*
paths-ignore:
- 'docs/**'
- '.github/**'
pull_request:
branches: [ production/v4 ]
schedule:
- cron: "0 9 * * *"

workflow_dispatch:


jobs:
Build_against_dev_release:
name: build_against_dev_on_${{ matrix.os_name }}
# The type of runner that the job will run on
runs-on: ubuntu-latest
strategy:
matrix:
include:
- image: "ghcr.io/dune-daq/nightly-release-alma9:production_v4"
os_name: "a9"
container:
image: ${{ matrix.image }}
defaults:
run:
shell: bash

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Runs a single command using the runners shell

- name: Checkout daq-release
uses: actions/checkout@v3
with:
repository: DUNE-DAQ/daq-release
path: daq-release

- name: setup dev area
run: |
export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
setup_dbt latest_v4 || true
release_name="last_fddaq"

dbt-create -n $release_name dev-${{ matrix.os_name }}

- name: checkout package for CI
uses: actions/checkout@v3
with:
path: ${{ github.repository }}

- name: setup build env, build the repo against the development release
run: |
export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
cd $GITHUB_WORKSPACE/dev-${{ matrix.os_name }}
source env.sh || true

spack unload $REPO || true
cp -pr $GITHUB_WORKSPACE/DUNE-DAQ/$REPO $GITHUB_WORKSPACE/dev-${{ matrix.os_name }}/sourcecode
dbt-build # --unittest # --lint

- name: upload build log file
uses: actions/upload-artifact@v3
with:
name: build_log_${{ matrix.os_name }}
path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/build*.log

# - name: upload linter output file
# uses: actions/upload-artifact@v3
# with:
# name: linting_log_${{ matrix.os_name }}
# path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/linting*

# - name: upload unittest output file
# uses: actions/upload-artifact@v3
# with:
# name: unit_tests_log_${{ matrix.os_name }}
# path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/unit_tests*
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# https://dune-daq-sw.readthedocs.io/en/latest/packages/daq-cmake/

cmake_minimum_required(VERSION 3.12)
project(trgtools VERSION 1.0.2)
project(trgtools VERSION 2.0.0)

find_package(daq-cmake REQUIRED)
find_package(CLI11 REQUIRED)
Expand Down Expand Up @@ -49,7 +49,7 @@ daq_add_python_bindings(*.cpp LINK_LIBRARIES ${PROJECT_NAME} ) # Any additional

daq_add_application(trgtools_tapipe tapipe.cxx LINK_LIBRARIES ${PROJECT_NAME} CLI11::CLI11 fmt::fmt) # Any libraries to link in not yet determined
daq_add_application(trgtools_copy_tpstream copy_tpstream.cxx LINK_LIBRARIES ${PROJECT_NAME} CLI11::CLI11 fmt::fmt) # Any libraries to link in not yet determined
daq_add_application(trgtools_process_tpstream process_tpstream.cxx LINK_LIBRARIES ${PROJECT_NAME} CLI11::CLI11 fmt::fmt) # Any libraries to link in not yet determined
daq_add_application(trgtools_process_tpstream process_tpstream.cxx LINK_LIBRARIES ${PROJECT_NAME} CLI11::CLI11 fmt::fmt triggeralgs::triggeralgs trgdataformats::trgdataformats hdf5libs::hdf5libs detchannelmaps::detchannelmaps)

##############################################################################

Expand Down
Loading
Loading