Skip to content

Adding prodition service to CaloRecoDigiMaker#1703

Open
giro94 wants to merge 8 commits intoMu2e:mainfrom
giro94:dev
Open

Adding prodition service to CaloRecoDigiMaker#1703
giro94 wants to merge 8 commits intoMu2e:mainfrom
giro94:dev

Conversation

@giro94
Copy link
Collaborator

@giro94 giro94 commented Jan 30, 2026

Also, added fcl flag to be able to use proton bunch time or not (in case no beam is present)

@FNALbuild
Copy link
Collaborator

Hi @giro94,
You have proposed changes to files in these packages:

  • CaloReco

which require these tests: build.

@Mu2e/write, @Mu2e/fnalbuild-users have access to CI actions on main.

⌛ The following tests have been triggered for 178fe4e: build (Build queue - API unavailable)

About FNALbuild. Code review on Mu2e/Offline.

@giro94
Copy link
Collaborator Author

giro94 commented Jan 30, 2026

I just realized that the clang-format command changed so much that the PR edits are now barely recognizable

@FNALbuild
Copy link
Collaborator

☔ The build tests failed for 178fe4e.

Test Result Details
test with Command did not list any other PRs to include
merge Merged 178fe4e at 30dbb4a
build (prof) Log file. Build time: 09 min 32 sec
ceSimReco Log file. Return Code 9.
g4test_03MT Log file.
transportOnly Log file.
POT Log file.
g4study Log file.
cosmicSimReco Log file.
cosmicOffSpill Log file.
ceSteps Log file.
ceDigi Log file.
muDauSteps Log file.
ceMix Log file.
rootOverlaps Log file.
g4surfaceCheck Log file.
trigger Log file.
check_cmake Log file.
FIXME, TODO TODO (0) FIXME (0) in 1 files
clang-tidy ➡️ 2 errors 12 warnings
whitespace check no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at 178fe4e after being merged into the base branch at 30dbb4a.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.

Copy link
Collaborator

@rlcee rlcee left a comment

Choose a reason for hiding this comment

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

Please remove these since they will be deleted very soon

#include "Offline/ConditionsService/inc/CalorimeterCalibrations.hh"
#include "Offline/ConditionsService/inc/ConditionsHandle.hh"

Please remove these since they are not needed and should not be accessed in modules as part of the conditions design. (as a archive table, CosmicEnergyCalib might be accessed directly, since that access is uncontrolled, but then that shouldn't be in a production module)

#include "Offline/DbTables/inc/CalCosmicEnergyCalib.hh"
#include "Offline/DbTables/inc/CalEnergyCalib.hh"

The proditions access looks good. Thanks

@rlcee
Copy link
Collaborator

rlcee commented Jan 30, 2026

In the CI run, the ceSimReco failure is saying you need to add your new required fcl parameter to the prolog

@giro94
Copy link
Collaborator Author

giro94 commented Jan 30, 2026

Please remove these since they will be deleted very soon

#include "Offline/ConditionsService/inc/CalorimeterCalibrations.hh"
#include "Offline/ConditionsService/inc/ConditionsHandle.hh"

Please remove these since they are not needed and should not be accessed in modules as part of the conditions design. (as a archive table, CosmicEnergyCalib might be accessed directly, since that access is uncontrolled, but then that shouldn't be in a production module)

#include "Offline/DbTables/inc/CalCosmicEnergyCalib.hh"
#include "Offline/DbTables/inc/CalEnergyCalib.hh"

The proditions access looks good. Thanks

Right, the last two were part of my tests, forgot to remove

@giro94
Copy link
Collaborator Author

giro94 commented Jan 30, 2026

@FNALbuild build

@FNALbuild
Copy link
Collaborator

⌛ The following tests have been triggered for 419c0d6: build (Build queue - API unavailable)

@FNALbuild
Copy link
Collaborator

☀️ The build tests passed at 419c0d6.

Test Result Details
test with Command did not list any other PRs to include
merge Merged 419c0d6 at 30dbb4a
build (prof) Log file. Build time: 04 min 33 sec
ceSimReco Log file.
g4test_03MT Log file.
transportOnly Log file.
POT Log file.
g4study Log file.
cosmicSimReco Log file.
cosmicOffSpill Log file.
ceSteps Log file.
ceDigi Log file.
muDauSteps Log file.
ceMix Log file.
rootOverlaps Log file.
g4surfaceCheck Log file.
trigger Log file.
check_cmake Log file.
FIXME, TODO TODO (0) FIXME (0) in 2 files
clang-tidy ➡️ 3 errors 16 warnings
whitespace check no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at 419c0d6 after being merged into the base branch at 30dbb4a.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.

@giro94
Copy link
Collaborator Author

giro94 commented Jan 30, 2026

Ready to be merged. Tested db calls in reco successfully!

@giro94
Copy link
Collaborator Author

giro94 commented Feb 2, 2026

@FNALbuild build

@FNALbuild
Copy link
Collaborator

⌛ The following tests have been triggered for de0f469: build (Build queue - API unavailable)

@FNALbuild
Copy link
Collaborator

☀️ The build tests passed at de0f469.

Test Result Details
test with Command did not list any other PRs to include
merge Merged de0f469 at 0728167
build (prof) Log file. Build time: 04 min 33 sec
ceSimReco Log file.
g4test_03MT Log file.
transportOnly Log file.
POT Log file.
g4study Log file.
cosmicSimReco Log file.
cosmicOffSpill Log file.
ceSteps Log file.
ceDigi Log file.
muDauSteps Log file.
ceMix Log file.
rootOverlaps Log file.
g4surfaceCheck Log file.
trigger Log file. Return Code 2.
check_cmake Log file.
FIXME, TODO TODO (0) FIXME (0) in 2 files
clang-tidy ➡️ 3 errors 16 warnings
whitespace check no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at de0f469 after being merged into the base branch at 0728167.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This pull request migrates the CaloRecoDigiMaker module from the legacy ConditionsService to the modern Proditions service for accessing calorimeter calibrations. Additionally, it adds a configuration flag to optionally disable the use of proton bunch time, which is useful for scenarios without beam.

Changes:

  • Migrated CaloRecoDigiMaker to use Proditions service (ProditionsHandle) instead of ConditionsHandle
  • Added UseProtonBunchTime fcl flag to allow optional use of proton bunch time (defaults to true)
  • Fixed CalCalibMaker to use _nChannelDB constant for database loading (includes spare channels)

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file
File Description
CaloReco/src/CaloRecoDigiMaker_module.cc Migrated to Proditions service and added conditional ProtonBunchTime usage; includes code formatting improvements
CaloReco/src/SConscript Added CaloConditions, DbService dependencies for Proditions support
CaloReco/CMakeLists.txt Added CaloConditions, DbService, DbTables dependencies for Proditions support
CaloReco/fcl/prolog.fcl Added UseProtonBunchTime flag (defaults to true for backward compatibility)
CaloConditions/src/CalCalibMaker.cc Fixed to use _nChannelDB for database loading to account for spare channels

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@giro94
Copy link
Collaborator Author

giro94 commented Feb 5, 2026

Can we merge this?

@oksuzian
Copy link
Collaborator

oksuzian commented Feb 5, 2026

We are still waiting for reviews from @brownd1978 and @bechenard.
I'll ping them on slack

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants