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

Hotfix for PID Hypothesis - switch to disable Canvas #12755

Merged
merged 16 commits into from
Feb 28, 2024

Conversation

HorstMa
Copy link
Contributor

@HorstMa HorstMa commented Feb 23, 2024

There was an issue with the last PR #12630 where TCanvas could not be merged. This PR allows to disable the TCanvas generation through the JSON file. This is paired with another PR in QC (AliceO2Group/QualityControl#2151).

@alibuild
Copy link
Collaborator

Error while checking build/O2/fullCI for 0a28b53 at 2024-02-23 22:45:

## sw/BUILD/O2-latest/log
c++: error: unrecognized command-line option '--rtlib=compiler-rt'
c++: error: unrecognized command-line option '--rtlib=compiler-rt'


## sw/BUILD/O2-full-system-test-latest/log
task timeout reached .. killing all processes


## sw/BUILD/o2checkcode-latest/log
--
========== List of errors found ==========
++ GRERR=0
++ grep -v clang-diagnostic-error error-log.txt
++ grep ' error:'
++ GRERR=1
++ [[ 1 == 0 ]]
++ mkdir -p /sw/INSTALLROOT/85dca648b06fb873216efd5ea131ca0c1d3a5b5d/slc8_x86-64/o2checkcode/1.0-local110/etc/modulefiles
++ cat
--

Full log here.

Detectors/TPC/qc/include/TPCQC/PID.h Outdated Show resolved Hide resolved
Detectors/TPC/qc/src/PID.cxx Outdated Show resolved Hide resolved
Detectors/TPC/qc/src/PID.cxx Outdated Show resolved Hide resolved
Detectors/TPC/qc/src/PID.cxx Outdated Show resolved Hide resolved
Detectors/TPC/qc/src/PID.cxx Outdated Show resolved Hide resolved
Detectors/TPC/qc/include/TPCQC/PID.h Outdated Show resolved Hide resolved
Detectors/TPC/qc/include/TPCQC/PID.h Outdated Show resolved Hide resolved
@HorstMa
Copy link
Contributor Author

HorstMa commented Feb 26, 2024

thanks, @wiechula I changed the naming convention and added a separate function.

@wiechula wiechula enabled auto-merge (squash) February 28, 2024 07:53
@wiechula
Copy link
Collaborator

Can be merged from my side, but should be squashed. The failure looks unrelated.

@shahor02 shahor02 disabled auto-merge February 28, 2024 09:56
@shahor02 shahor02 merged commit 1d50162 into AliceO2Group:dev Feb 28, 2024
12 of 13 checks passed
andreasmolander pushed a commit to andreasmolander/AliceO2 that referenced this pull request Apr 12, 2024
)

* Adding PID Hypothesis for PID Task

* Updated GetMostProbablePID

* formatting

* formatting 2

* formatting3

* formatting4

* added recommendations

* fromatting

* cleanup

* change runPID macro with new processTrack

* Added dummy processTrack to be compatible with QC

* Hotfix for PID Hypothesis to disable TCanvas generation

* quickfix

* Formatting

* naming Convention, added separate function for setCreateCanvas

---------

Co-authored-by: Maximilian Horst <[email protected]>
andreasmolander pushed a commit to andreasmolander/AliceO2 that referenced this pull request Apr 12, 2024
)

* Adding PID Hypothesis for PID Task

* Updated GetMostProbablePID

* formatting

* formatting 2

* formatting3

* formatting4

* added recommendations

* fromatting

* cleanup

* change runPID macro with new processTrack

* Added dummy processTrack to be compatible with QC

* Hotfix for PID Hypothesis to disable TCanvas generation

* quickfix

* Formatting

* naming Convention, added separate function for setCreateCanvas

---------

Co-authored-by: Maximilian Horst <[email protected]>
mwinn2 pushed a commit to mwinn2/AliceO2 that referenced this pull request Apr 25, 2024
)

* Adding PID Hypothesis for PID Task

* Updated GetMostProbablePID

* formatting

* formatting 2

* formatting3

* formatting4

* added recommendations

* fromatting

* cleanup

* change runPID macro with new processTrack

* Added dummy processTrack to be compatible with QC

* Hotfix for PID Hypothesis to disable TCanvas generation

* quickfix

* Formatting

* naming Convention, added separate function for setCreateCanvas

---------

Co-authored-by: Maximilian Horst <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants