Skip to content

TPC CalDetPublisher: fetch CalPad in std::unordered_map from CCDB + add…#746

Merged
Barthelemy merged 1 commit into
AliceO2Group:masterfrom
tklemenz:CalDetPublisherWithZSCalibCheck
Jul 5, 2021
Merged

TPC CalDetPublisher: fetch CalPad in std::unordered_map from CCDB + add…#746
Barthelemy merged 1 commit into
AliceO2Group:masterfrom
tklemenz:CalDetPublisherWithZSCalibCheck

Conversation

@tklemenz
Copy link
Copy Markdown
Contributor

… ZS calibration file check

@tklemenz
Copy link
Copy Markdown
Contributor Author

tklemenz commented Jun 26, 2021

This needs this PR in O2 to have the getSpecificObjectFromCDB function.

@Barthelemy
Copy link
Copy Markdown
Collaborator

It seems that there is a problem with circular changes here. This PR depends on another PR in O2 which depends on this one.

One option is to force merge on both sides and prepare a new QC version quickly to avoid breaking every PR on O2 and having an unstable master in QC.

Another option, is to make the change backward compatible. In the specific case, you could keep the old methods (getCalPad, but mark them as deprecated. This way, you can merge the PR in O2 and then the one in QC.

I prefer the second one but understand that it is more work for you as you have to remove the methods in another iteration.

@tklemenz
Copy link
Copy Markdown
Contributor Author

tklemenz commented Jun 29, 2021

Hi Barth, thanks for the suggestions! I just discussed with Jens already that I will make a few changes to make it backward compatible.

@Barthelemy
Copy link
Copy Markdown
Collaborator

thank you

@tklemenz
Copy link
Copy Markdown
Contributor Author

tklemenz commented Jul 5, 2021

@Barthelemy The PR in O2 was just merged. Will the tests rerun on their own or do they need to be triggered?

@Barthelemy
Copy link
Copy Markdown
Collaborator

They restart occasionally

@Barthelemy
Copy link
Copy Markdown
Collaborator

alidoctor error in mac unrelated, merging.

@Barthelemy Barthelemy merged commit 4c3173f into AliceO2Group:master Jul 5, 2021
knopers8 pushed a commit that referenced this pull request Jul 13, 2021
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.

2 participants