Skip to content

[PR199 update] DEE Shield Readout module - from energy to ADC for the shield hits - #233

Open
vfioretti wants to merge 2 commits into
cositools:develop/emfrom
vfioretti:develop/em
Open

vfioretti wants to merge 2 commits into
cositools:develop/emfrom
vfioretti:develop/em

Conversation

@vfioretti

Copy link
Copy Markdown

This is an update for PR #199, that was closed because of conflicts with the master branch.

This PR modifies the following files:

GUI configuration to read the calibration file:

  • modified: include/MGUIOptionsDEESMEX.h
  • modified: include/MModuleDEESMEX.h
  • modified: src/MGUIOptionsDEESMEX.cxx

I added the ability in MReadOutElementVoxel3D to also map the detector/crystal ID with the detector and crystal ID listed in the calibration file:

  • modified: include/MReadOutElementVoxel3D.h
  • modified: src/MReadOutElementVoxel3D.cxx

new DEE submodule (Shield Readout) to convert from energy to ADC the shield hits:

  • modified: src/MSubModuleShieldReadout.cxx
  • modified: include/MSubModuleShieldReadout.h

A new file (energy to ADC calibration parameters) is added in resource/dee/ShieldEnergyCalibration_NRL.csv

Changes from PR #199:

  • ...ShieldReadoutFilename... moved to ShieldEnergyCalibrationFilename... for clarity
  • dead code removed (see this comment)
  • using false instead of ! (see this comment)

On this comment on include/MReadOutElementVoxel3D.h:
using bool without virtual in
bool operator<(const MReadOutElementVoxel3D& R) const;
is correct, because it only needs to order between two MReadOutElementVoxel3D objects, while
virtual bool operator==(const MReadOutElement& R) const;
should be able to compare any readout element from the derived class.

@vfioretti

Copy link
Copy Markdown
Author

@ckierans this PR replies to the reviewed PR #199 (closed because of conflicts)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant