Skip to content

Fix T0 filling #7846

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.

Sign up for GitHub

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

Merged
jgrosseo merged 2 commits into from
Dec 10, 2021
Merged

Fix T0 filling #7846

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ef77ca
Fix T0 filling
jgrosseo Dec 9, 2021
4366248
fix also V0A and FDD
jgrosseo Dec 9, 2021
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
6 changes: 3 additions & 3 deletions Detectors/AOD/src/AODProducerWorkflowSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,8 +1167,8 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
uint8_t dummyTriggerMask = 0;

int nFV0ChannelsAside = o2::fv0::Geometry::getNumberOfReadoutChannels();
std::vector<float> vFV0Amplitudes(nFV0ChannelsAside, 0.);
for (auto& fv0RecPoint : fv0RecPoints) {
std::vector<float> vFV0Amplitudes(nFV0ChannelsAside, 0.);
const auto channelData = fv0RecPoint.getBunchChannelData(fv0ChData);
for (auto& channel : channelData) {
vFV0Amplitudes[channel.channel] = channel.charge; // amplitude, mV
Expand Down Expand Up @@ -1316,9 +1316,9 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)

// vector of FDD amplitudes
int nFDDChannels = o2::fdd::Nchannels;
std::vector<float> vFDDAmplitudes(nFDDChannels, 0.);
// filling FDD table
for (const auto& fddRecPoint : fddRecPoints) {
std::vector<float> vFDDAmplitudes(nFDDChannels, 0.);
const auto channelData = fddRecPoint.getBunchChannelData(fddChData);
// TODO: switch to calibrated amplitude
for (const auto& channel : channelData) {
Expand Down Expand Up @@ -1353,9 +1353,9 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
// vector of FT0 amplitudes
int nFT0Channels = o2::ft0::Geometry::Nsensors;
int nFT0ChannelsAside = o2::ft0::Geometry::NCellsA * 4;
std::vector<float> vAmplitudes(nFT0Channels, 0.);
// filling FT0 table
for (auto& ft0RecPoint : ft0RecPoints) {
std::vector<float> vAmplitudes(nFT0Channels, 0.);
Copy link
Copy Markdown
Collaborator

@shahor02 shahor02 Dec 9, 2021

Choose a reason for hiding this comment

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

this means an allocation of a new vector for every trigger, I would simply get rid of it.

Copy link
Copy Markdown
Collaborator Author

@jgrosseo jgrosseo Dec 9, 2021

Choose a reason for hiding this comment

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

Yes, see mattermost. I already confirmed that.
https://mattermost.web.cern.ch/alice/pl/1pwtw45b1trmiygnp3tupu6qkr

Copy link
Copy Markdown
Contributor

@AllaMaevskaya AllaMaevskaya Dec 9, 2021

Choose a reason for hiding this comment

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

set amplitude vector in zero before each event #7848,
I think FV0 and FDD need similar fix

const auto channelData = ft0RecPoint.getBunchChannelData(ft0ChData);
// TODO: switch to calibrated amplitude
for (auto& channel : channelData) {
Expand Down