Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fcc detector migration #282

Merged
merged 49 commits into from
Oct 4, 2023

Conversation

atolosadelgado
Copy link
Collaborator

@atolosadelgado atolosadelgado commented Jul 17, 2023

BEGINRELEASENOTES

  • Migration of IDEA and ALLEGRO detectors from FCCDetectors repository, becoming each one the option 1 version 01 of the corresponding detector
    • The compact files and detector constructors files, and the detector name therein, are renamed to avoid collision with FCCDetector components by appending the suffix _o1_v01
    • IDEA compact files are copied into ./FCCee/IDEA/compact/IDEA_o1_v01
    • ALLEGRO compact files are copied into ./FCCee/ALLEGRO/compact/ALLEGRO_o1_v01
    • The detector constructors are placed in the corresponding directory inside ./detector, and therein in the appropriate sub-directory;
      • calorimeter: CaloEndcapDiscs_o1_v01_geo.cpp, HCalThreePartsEndcap_o1_v01_geo.cpp, HCalTileBarrel_o1_v01_geo.cpp
      • other: SimpleCylinder_geo_o1_v01.cpp
      • tracker: parametrised_DriftChamber_o1_v01.cpp
    • DD4hep segmentations from FCCDetectors were also migrated into the directory detectorSegmentations, and renamed by appending the suffix _k4geo

ENDRELEASENOTES

Hi all,

this PR implements the changes stated here
#267 (comment)

this PR is not ready yet, and some things are open to discussion. Particularly, how to handle the non-detector parts migrated from FCC detector repo. At the moment they are placed in detector/{DetSegmentation, DetCommon, DetSensitive}

DetCommon defines a number of global functions that are needed mainly to reconstruction. Only the function cellID implemented in DetCommon is used in FCCDetectors by DetSensitive.

Thank you for your time.
Alvaro

@andresailer
Copy link
Contributor

As discussed in the Key4hep meeting, it would be better to remove things that are not needed, for example in the DetCommon folder.

@andresailer andresailer marked this pull request as draft August 7, 2023 08:55
atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Aug 31, 2023
to use the version existing already in k4geo, as said in
key4hep#282 (comment)
@BrieucF
Copy link
Contributor

BrieucF commented Aug 31, 2023

Breaking news: you can change NLB to ALLEGRO !

@atolosadelgado
Copy link
Collaborator Author

atolosadelgado commented Aug 31, 2023

Hi,

I purged some files out of DetCommon. I kept for testing purposes a simple box dummy detector. The simple box was used to test the Sensitive Detector actions, but actually the cmake test command is now commented. I still think a test is healthy for the repo, but since this PR is urgent I did not spend time on rewriting the test.

I moved the segmentation and senstive detector folders to main folder and renamed according to the proposal in #267

a test Gaudi simulation was run to check if the changes were consistent.

Renaming of the segmentation and sensitive detectors is still ongoing

@atolosadelgado atolosadelgado marked this pull request as ready for review August 31, 2023 16:06
@atolosadelgado atolosadelgado marked this pull request as draft August 31, 2023 16:43
@atolosadelgado
Copy link
Collaborator Author

Hi,

as discussed in the key4hep meeting, i have removed the DetCommon and sensitive detectors folder. The segmentation classes have been renamed, adding _k4geo to the name.

The detectors from FCCDetectors repo are also migrated, xml and cpp files. The name is also changed so they will not clash.

I hope there are not many issues... I changed a lot of code

Alvaro

@atolosadelgado atolosadelgado marked this pull request as ready for review September 6, 2023 10:07
@BrieucF
Copy link
Contributor

BrieucF commented Sep 21, 2023

Any further comment on this @andresailer ?

atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Sep 21, 2023
atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Sep 21, 2023
atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Sep 21, 2023
@atolosadelgado
Copy link
Collaborator Author

I think I have documented the corresponding READMEs
I still do not know what to do with the dependency of the drift chamber on segmentation library.

atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Sep 22, 2023
@atolosadelgado
Copy link
Collaborator Author

Should some release note comments be filled in the OP?

@andresailer
Copy link
Contributor

Should some release note comments be filled in the OP?

Yes, definitely! Thanks!

@atolosadelgado
Copy link
Collaborator Author

atolosadelgado commented Sep 28, 2023

Hi,

I have displayed the geometries of IDEA and ALLEGRO with geoDisplay tool, it worked. No warnings during compilation.

I found that for some reason the Drift chamber and calorimeter of IDEA were commented out from the main file, but now they are ready.

Anyway, these components were templates for the future ones, some of them already in PR or upcoming soon.

I can not think of further refinements, but please let me know if I can do something else.

Tests for the new detectors will be part of an upcoming PR

atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Oct 3, 2023
to use the version existing already in k4geo, as said in
key4hep#282 (comment)
atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Oct 3, 2023
atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Oct 3, 2023
atolosadelgado added a commit to atolosadelgado/k4geo that referenced this pull request Oct 3, 2023
@andresailer andresailer enabled auto-merge (rebase) October 4, 2023 10:41
@andresailer andresailer merged commit 5b395e4 into key4hep:master Oct 4, 2023
andresailer pushed a commit that referenced this pull request Oct 4, 2023
to use the version existing already in k4geo, as said in
#282 (comment)
andresailer pushed a commit that referenced this pull request Oct 4, 2023
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.

3 participants