Skip to content

Improving sensitive hit creation for HMPID in Detector.cxx#8340

Merged
shahor02 merged 7 commits intoAliceO2Group:devfrom
zovarga:hmpid_patch1
Mar 19, 2022
Merged

Improving sensitive hit creation for HMPID in Detector.cxx#8340
shahor02 merged 7 commits intoAliceO2Group:devfrom
zovarga:hmpid_patch1

Conversation

@zovarga
Copy link
Copy Markdown
Contributor

@zovarga zovarga commented Mar 14, 2022

  • For HMPID the Detector::ProcessHits(FairVolume* v) function had too many string comparisons which made it slow. The comparison was modified to be based on integer IDs instead.
  • The new integer IDs have been defined in Detector.h, then added to Detector.cxx (modified functions: Detector::InitializeO2Detector() and Detector::ProcessHits(FairVolume* v)).
  • The calculation of chamber number (idch) in Detector::ProcessHits(FairVolume* v) has been modified to be based on volume IDs.

zovarga and others added 5 commits March 14, 2022 06:59
@zovarga
Update Detector.h
82d2341 
The volume IDs have been defined.
@zovarga
Update Detector.cxx
1dfe933 
The new volume IDs have been added to Detector::InitializeO2Detector() and Detector::ProcessHits(FairVolume* v).
@zovarga
Formatting Detector.cxx
9d8b920 
Formatting changes to conform to clang-format.
@alibuild
Please consider the following formatting changes
44bc2f0
@zovarga
Merge pull request #3 from alibuild/alibot-cleanup-8340
a394f30 
Please consider the following formatting changes to AliceO2Group#8340
@zovarga zovarga marked this pull request as ready for review March 15, 2022 09:43
@shahor02
Copy link
Copy Markdown
Collaborator

shahor02 commented Mar 17, 2022

@zovarga the fullCI complains are genuine, could fix:

/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:91:32: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:93:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:95:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:97:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:99:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:101:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:103:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:142:32: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:144:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:146:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:148:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:150:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:152:37: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/8340-slc8_x86-64/0/Detectors/HMPID/simulation/src/Detector.cxx:154:37: error: statement should be inside braces [readability-braces-around-statements]
--

@zovarga
Formatting Detector.cxx
63008bd 
Formatting some lines for better readability.
@zovarga
Copy link
Copy Markdown
Contributor Author

zovarga commented Mar 18, 2022

Hello @shahor02, thank you for checking my PR. I fixed the fullCI complain.

@shahor02
Copy link
Copy Markdown
Collaborator

shahor02 commented Mar 18, 2022

Hi @zovarga

Now there are some conflicts, could you check if rebasing to dev reveals them? If not, I will do manual merge tomorrow.

@zovarga
Copy link
Copy Markdown
Contributor Author

zovarga commented Mar 19, 2022

Hi @shahor02, now it looks good.

@shahor02 shahor02 merged commit 54d91df into AliceO2Group:dev Mar 19, 2022
@zovarga zovarga deleted the hmpid_patch1 branch March 24, 2022 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@zovarga @shahor02 @alibuild