Skip to content

ctpdev#5758

Merged
shahor02 merged 17 commits intoAliceO2Group:devfrom
lietava:ctpdev
Apr 4, 2021
Merged

ctpdev#5758
shahor02 merged 17 commits intoAliceO2Group:devfrom
lietava:ctpdev

Conversation

@lietava
Copy link
Copy Markdown
Contributor

@lietava lietava commented Mar 21, 2021

No description provided.

Copy link
Copy Markdown
Collaborator

@shahor02 shahor02 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @lietava

See comments below. After a few files I stopped mentioning missing license notices in the beginning of all h/cxx files, they are required by the codechecker.

@shahor02 shahor02 requested a review from sawenzel March 21, 2021 16:30
@lietava lietava force-pushed the ctpdev branch 2 times, most recently from c8f9515 to 163854c Compare March 27, 2021 15:13
@lietava lietava force-pushed the ctpdev branch 2 times, most recently from 11c515e to 3970b11 Compare March 29, 2021 17:41
Copy link
Copy Markdown
Collaborator

@shahor02 shahor02 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @lietava

see a few more comments below. Since doing an incremental reviews becomes complicated, I would suggest to apply these fixes, make sure that the core produces an output you expect, remove the draft tag and merge after the CI's passed (unless @sawenzel has other comments). The skeleton should be good enough, the rest can be added in other PRs

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Mar 30, 2021

Hi @lietava

see a few more comments below. Since doing an incremental reviews becomes complicated, I would suggest to apply these fixes, make sure that the core produces an output you expect, remove the draft tag and merge after the CI's passed (unless @sawenzel has other comments). The skeleton should be good enough, the rest can be added in other PRs

Hi @shahor02
when I run o2-sim-digitizer-workflow (after o2-sim)
1.) I do not see CTP in the list
Detectors: Cont.RO Triggers
ITS: - -
TPC: - - ..
2.)
[INFO] CTP is in grp? no; is skipped? no

@shahor02
Copy link
Copy Markdown
Collaborator

@lietava one should probably impose it as a dummy detector in the simulation. Is all your code committed? Will try to fix this later.

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Mar 30, 2021

@lietava one should probably impose it as a dummy detector in the simulation. Is all your code committed? Will try to fix this later.

OK. All code is commited.

@lietava lietava marked this pull request as ready for review March 30, 2021 16:21
@lietava lietava requested review from a team as code owners March 30, 2021 16:21
@shahor02
Copy link
Copy Markdown
Collaborator

@lietava I've opened a PR in your repository. After merging it the digitization should work, tested it with

o2-sim -n 10 -m FT0 FV0 ITS CTP -g pythia8 -j10
o2-sim-digitizer-workflow -b

produces ctpdigits.root which seems to be meaningful (lot or after-pulses from FV0)

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Mar 31, 2021

@lietava I've opened a PR in your repository. After merging it the digitization should work, tested it with

o2-sim -n 10 -m FT0 FV0 ITS CTP -g pythia8 -j10
o2-sim-digitizer-workflow -b

produces ctpdigits.root which seems to be meaningful (lot or after-pulses from FV0)

Thanks. I guess I should merge it - there are three options on web interface, to be safe - I use top option 'Create merge commit' ?

@shahor02
Copy link
Copy Markdown
Collaborator

No, just to "Rebase and merge", anyway, we have to squash the multiple commits of your PR.

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Mar 31, 2021

No, just to "Rebase and merge", anyway, we have to squash the multiple commits of your PR.

Done

shahor02
shahor02 previously approved these changes Mar 31, 2021
Copy link
Copy Markdown
Collaborator

@shahor02 shahor02 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conditionally approving to trigger CI tests

@shahor02
Copy link
Copy Markdown
Collaborator

@lietava could you fix this (complains from fullCI):

/mnt/mesos/sandbox/sandbox/o2-fullci/sw/SOURCES/O2/5758/0/Detectors/CTP/simulation/src/Digitizer.cxx:30:11: error: statement should be inside braces [readability-braces-around-statements]
/mnt/mesos/sandbox/sandbox/o2-fullci/sw/SOURCES/O2/5758/0//Detectors/CTP/simulation/src/CTPSimulationLinkDef.h:1:1: error: missing or malformed copyright notice

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Mar 31, 2021

@lietava could you fix this (complains from fullCI):

/mnt/mesos/sandbox/sandbox/o2-fullci/sw/SOURCES/O2/5758/0/Detectors/CTP/simulation/src/Digitizer.cxx:30:11: error: statement should be inside braces [readability-braces-around-statements]
/mnt/mesos/sandbox/sandbox/o2-fullci/sw/SOURCES/O2/5758/0//Detectors/CTP/simulation/src/CTPSimulationLinkDef.h:1:1: error: missing or malformed copyright notice

Fixed.

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Apr 1, 2021

Please, review.

@shahor02
Copy link
Copy Markdown
Collaborator

shahor02 commented Apr 1, 2021

@lietava did you run the test I mentioned above. If its output is ok for you, I would merge this PR once its passed CI tests.

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Apr 1, 2021

@shahor02 I fixed two issues from fullCI. Which test should I run ?

@shahor02
Copy link
Copy Markdown
Collaborator

shahor02 commented Apr 1, 2021

@shahor02 I fixed two issues from fullCI. Which test should I run ?

#5758 (comment)

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Apr 1, 2021

I run
o2-sim -n 10 -m FT0 FV0 ITS CTP -g pythia8 -j10
o2-sim-digitizer-workflow -b
I see in the output
...
[INFO] CTP is in grp? yes; is skipped? no
...
[INFO] Starting CTPDigitizer on pid 27460
File ctpdigits.root created.
I browsed it and I can see there something reasonable. I would leave the content check for later if you agree ?

@shahor02
Copy link
Copy Markdown
Collaborator

shahor02 commented Apr 1, 2021

OK, will merge after CIs are passed

@shahor02 shahor02 merged commit dcb864a into AliceO2Group:dev Apr 4, 2021
@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Apr 25, 2021

HI Ruben, I fixed small bug. Please, merge.

@davidrohr
Copy link
Copy Markdown
Collaborator

Hi @lietava : I am a bit confused. This PR was already merged several weeks ago. Are you sure you commented on the right PR?

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Apr 26, 2021

@davidrohr I understood from Ruben that minor bugs fixes are done in the same PR. I did minor fix related to this PR.

@davidrohr
Copy link
Copy Markdown
Collaborator

Hi Roman, but this PR here was already merged. If you push additional fixes to its branch, it will not do anything. You can only add minor fixes to the PR before it is merged.
If you want to apply a fix now, you have to open a new PR. If it is urgent you can ping @shahor02 or me to merge it quickly.

@lietava
Copy link
Copy Markdown
Contributor Author

lietava commented Apr 26, 2021

OK, thanks. It is not urgent I will open new PR or better leave it for more changes.

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.

3 participants