Skip to content

Commit

Permalink
Merge branch 'main' of github.com:acts-project/acts into fix-lowestTr…
Browse files Browse the repository at this point in the history
…ackingVolume-allow-nullptr
  • Loading branch information
andiwand committed Aug 9, 2024
2 parents 40ad679 + 2c1d019 commit 74e5148
Show file tree
Hide file tree
Showing 291 changed files with 4,394 additions and 3,300 deletions.
4 changes: 1 addition & 3 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
BasedOnStyle: Google
Language: Cpp
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
PointerAlignment: Left
ColumnLimit: 80
Expand All @@ -28,4 +27,3 @@ IncludeCategories:
- Regex: '^<.*>'
Priority: 3
# all headers not explicitly listed will be assigned to the last group
---
4 changes: 2 additions & 2 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ FOR YOUR INFORMATION AND MUST BE REMOVED BEFORE SUBMITTING THE ISSUE.

- [ ] If the issue reports a bug:

- [ ] Please suggest whether this bug is critical / a blocker. One of the
- [ ] Please suggest whether this bug is critical / a blocker. One of the
maintainers will assign a corresponding labels.
- [ ] Does the description contain all necessary information to reproduce
the error?
the error?
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ REQUEST.

- If you push updates, and you know they will be superceded later on, consider adding
`[skip ci]` in the commit message. This will instruct the CI system not to run any
jobs on this commit.
jobs on this commit.
3 changes: 1 addition & 2 deletions .github/wip.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
- locations:
- locations:
- title
- label_name
terms:
- WIP

1 change: 1 addition & 0 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ jobs:
--preset=github-ci
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DCMAKE_CXX_FLAGS="-Werror"
-DACTS_BUILD_ODD=OFF
- name: Measure
run: cmakeperf collect build/compile_commands.json -o perf.csv
- name: Results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- closed
- labeled

concurrency:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

Expand Down
49 changes: 19 additions & 30 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,30 @@ concurrency:
cancel-in-progress: true

jobs:
format:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/format14:51
steps:
- uses: actions/checkout@v4
- name: Check
run: >
git config --global safe.directory "$GITHUB_WORKSPACE"
&& CI/check_format .
- uses: actions/upload-artifact@v4
if: failure()
with:
name: changed
path: changed
format-py:
lint:
runs-on: ubuntu-latest
env:
PRE_COMMIT_HOME: '/tmp/pre-commit'

steps:
- uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install black
run: pip install black[jupyter]==24.4.2
- name: Run black format check
run: black --check . --extend-exclude ".*thirdparty.*"

- uses: actions/cache@v4
with:
path: |
${{ env.PRE_COMMIT_HOME }}
key: ${{ runner.os }}-${{ hashFiles('.pre-commit-config.yaml') }}

- name: Install pre-commit
run: pip install pre-commit

- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure

license:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -67,16 +66,6 @@ jobs:
- name: Check
run: >
CI/check_pragma_once.sh
end_of_line:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Check
run: >
CI/check_end_of_file.py . --exclude "thirdparty/*" --reject-multiple-newlines --github
type_t:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
-b linkcheck
. _build/html/
- uses: actions/upload-artifact@v4
with:
name: acts-docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Release

on:
on:
push:
branches:
- 'releases'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
return false;
}
let number = Number(fs.readFileSync(file, {encoding: 'utf8'}).trim());
console.log('PR number is '+number);
core.exportVariable('PR_NUMBER', number)
Expand Down
4 changes: 2 additions & 2 deletions .merge-sentinel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rules:
- "main"
- "develop/*"
paths_ignore:
- "docs/*"
- "docs/*"

required_checks:
- Docs / docs
Expand All @@ -24,6 +24,6 @@ rules:
- "main"
- "develop/*"
paths:
- "docs/*"
- "docs/*"
required_checks:
- Docs / docs
4 changes: 2 additions & 2 deletions Alignment/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Alignment package

This packages provides tools for detector geometry alignment.
Currently, the KalmanFitter-based alignment with internal minimization is implemented.
In the future, the minimization will be done based on the external minimization package e.g. Millepede.
Currently, the KalmanFitter-based alignment with internal minimization is implemented.
In the future, the minimization will be done based on the external minimization package e.g. Millepede.
2 changes: 1 addition & 1 deletion CI/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Since [`poetry`](https://python-poetry.org) supports more robust dependency lock

```console
poetry export -f requirements.txt > requirements.txt
```
```
2 changes: 1 addition & 1 deletion CI/codespell_ignore.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ ans
dthe
dthe
vart
pixelx
pixelx
5 changes: 2 additions & 3 deletions CI/ctest2junit.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Extended by providing total Start date, total time, total test stats
<property name="ProcessorClockFrequency" value="{$ProcessorClockFrequency}" />
</properties>
<xsl:apply-templates select="Testing/Test"/>

<system-out>
BuildName: <xsl:value-of select="$BuildName" />
BuildStamp: <xsl:value-of select="$BuildStamp" />
Expand Down Expand Up @@ -101,7 +101,7 @@ Extended by providing total Start date, total time, total test stats
</xsl:if>
</xsl:for-each>
</xsl:variable>

<testcase name="{$testcasename}" classname="{$testclassname}" time="{$exectime}">
<xsl:if test="@Status = 'passed'">
<system-out><xsl:value-of select="Results/Measurement/Value/text()"/></system-out>
Expand Down Expand Up @@ -130,4 +130,3 @@ Extended by providing total Start date, total time, total test stats
</xsl:template>

</xsl:stylesheet>

24 changes: 0 additions & 24 deletions CI/physmon/ckf_truth_smeared.yml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ checks:
threshold: 3
IntegralCheck:
threshold: 3

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ histograms:
nbins: 100
min: 0.999
max: 1

"trk_weight":
nbins: 100
min: -0.01
max: 1.01

"sumPt2":
nbins: 100
min: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ histograms:
nbins: 100
min: 0.999
max: 1

"sumPt2":
nbins: 100
min: 0
Expand Down
Loading

0 comments on commit 74e5148

Please sign in to comment.