eudaq icon indicating copy to clipboard operation
eudaq copied to clipboard

Merge CMS modifications to official EUDAQ repository

Open dinardo opened this issue 1 year ago • 5 comments

Merged with official EUDAQ repo to incorporate the latest updates

From the "CMS side" we made a new module called CMSIT to handle CMS phase-2 readout chip

dinardo avatar Aug 13 '24 10:08 dinardo

I need to look carefully through it and compare with https://github.com/eudaq/eudaq/pull/743 That is my pending merge request which contains among other things the MMC3/STCONTROL converter (which you were probably using but did not include), the necessary online monitor changes, online monitor changes for RD53A/B (single chip only) and xy correlation. At the first glance it seems that at some point you copied my changes so it might be compatible but will take time. Also I don't know whether your stuff also contains what Brainislav Ristic had pending for CMS (and general).

arummler avatar Aug 13 '24 11:08 arummler

Hi @arummler , sure I understand it might take some time: https://github.com/eudaq/eudaq/pull/756#issuecomment-2285973337

No problem

Many thanks

dinardo avatar Aug 13 '24 13:08 dinardo

Hi, I need to add that I didn't implement all these changes myself

Another colleague, that now left the project, made several changes to the code

I'm personally responsible for the CMSIT module

dinardo avatar Sep 05 '24 12:09 dinardo

Please let me know if there are other changes you want me to implement

dinardo avatar Sep 05 '24 12:09 dinardo

Hi, I was wondering what was the status of this merge request.

Many thanks.

  • Mauro.

dinardo avatar Oct 02 '24 14:10 dinardo

Sorry, still wanted to compare the online monitor stuff to what I have in #743 as we are sharing both MMC3 read out FEI4 timing plane as well as the RD53 modules (to some extent). Trying...

arummler avatar Oct 08 '24 11:10 arummler

Also would really like to merge my CI update before major merges.

arummler avatar Oct 08 '24 11:10 arummler

Dear Manager, I was wondering what was the status of the merging.

Cheers,

  • Mauro.

dinardo avatar Oct 31 '24 15:10 dinardo

I am fine with all the changes and if @arummler is not objecting, we can merge this from my side.

lhuth avatar Oct 31 '24 17:10 lhuth

I still wanted to cross check my online monitor changes #743 for compatibility (we are using the same chip but different daq/independent development). Will try asap.

arummler avatar Oct 31 '24 18:10 arummler

And I would prefer to have my CI MR #738 merged first to test on all OS.

arummler avatar Oct 31 '24 18:10 arummler

Dear Manager, I was wondering what was the status of the merging.

Cheers,

  • Mauro.

dinardo avatar Jan 20 '25 17:01 dinardo

Dear Manager, I was wondering what was the status of this Pull Request.

Cheers,

  • Mauro.

dinardo avatar Feb 07 '25 15:02 dinardo

Dear Mauro, I am unfortunately in the middle of the YETS and hence I did not have any time to continue. My only issues were: a) the online monitor extension for RD53b (as we are using the same chip in ATLAS and CMS but different producers and different module definitions) and b) your inclusion of ROOT which in principle is fine but redundant as we are already doing it centrally and using the old way of linking (should be done target based nowadays). As you now waiting already for months I will merge it, but if I run into conflicts in a) as soon as I get my MR approved we will need to discuss.

arummler avatar Feb 07 '25 15:02 arummler