From 9804a374e5efb7e10711a17795a246b08c7c1ba4 Mon Sep 17 00:00:00 2001 From: Mateusz Jakub Fila Date: Mon, 11 Dec 2023 17:59:25 +0100 Subject: [PATCH 1/4] fixed broken contrib link in doxygen --- CMakeLists.txt | 5 ----- README.md | 3 +-- doc/DoxygenLayout.xml | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ff1f23e8..76dec8d5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,11 +73,6 @@ endif() #--- target for Doxygen documentation ------------------------------------------ if(BUILD_DOCS) include(cmake/EDM4HEPDoxygen.cmake) - # copy images needed for documentation to build folder and install them - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/edm4hep_diagram.svg - ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html/doc/edm4hep_diagram.svg COPYONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html/doc/edm4hep_diagram.svg - DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() #--- add version files --------------------------------------------------------- diff --git a/README.md b/README.md index 3ba42ff95..078b1766e 100644 --- a/README.md +++ b/README.md @@ -129,5 +129,4 @@ of the input file should be part of the output. ## Contributing -Contributions and bug reports are welcome! See our [contributing -guidelines](./doc/contributing.md) if you want to contribute code to EDM4hep. +Contributions and bug reports are welcome! See our [contributing guidelines](doc/contributing.md) if you want to contribute code to EDM4hep. diff --git a/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml index 138bf38d8..dc7aad62e 100644 --- a/doc/DoxygenLayout.xml +++ b/doc/DoxygenLayout.xml @@ -5,7 +5,7 @@ - + From 4df7c3ad3feb5b056cf40c87575d7a6ff182e476 Mon Sep 17 00:00:00 2001 From: Mateusz Jakub Fila Date: Mon, 11 Dec 2023 17:59:53 +0100 Subject: [PATCH 2/4] fixed typos --- README.md | 2 +- doc/contributing.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 078b1766e..62b368d47 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ The library files and dictionaries (`libedm4hep.so`, ...) must be put somewhere ## Python bindings There are python bindings for all the classes in the datamodel for working with -the clases individually (for working with collections podio has its own +the classes individually (for working with collections podio has its own bindings). Make sure that `/lib` is in `LD_LIBRARY_PATH`, `/python` is in `PYTHONPATH` and `/include` is in `ROOT_INCLUDE_PATH`: ```python diff --git a/doc/contributing.md b/doc/contributing.md index d2275ff7b..46fb52f8e 100644 --- a/doc/contributing.md +++ b/doc/contributing.md @@ -39,7 +39,7 @@ a PR, as we only allow *rebase merges* for PRs. git push downstream -- reload your own github website (https://github.com//EDM4HEP) +- reload your own Github website (https://github.com//EDM4HEP) - you should see your commit - now you can create a pull request on the web site From 280e3305ee0923c3931e4d64b1d89aafcd7be916 Mon Sep 17 00:00:00 2001 From: Mateusz Jakub Fila Date: Tue, 12 Dec 2023 10:08:08 +0100 Subject: [PATCH 3/4] fixed links to master/main branch undo master/main change to link to podio --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 62b368d47..14d4145c4 100644 --- a/README.md +++ b/README.md @@ -12,30 +12,30 @@ A generic event data model for future HEP collider experiments. | | | | |-|-|-| -| [Vector3f](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L11) | [Vector3d](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L26) | [Vector2i](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L42) | -| [Vector2f](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L56) | [TrackState](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L70) | [ObjectID](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L93) | -| [Quantity](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L105) | [Hypothesis](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L113) | [HitLevelData](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L120) | +| [Vector3f](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L11) | [Vector3d](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L26) | [Vector2i](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L42) | +| [Vector2f](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L56) | [TrackState](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L70) | [ObjectID](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L93) | +| [Quantity](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L105) | [Hypothesis](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L113) | [HitLevelData](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L120) | **Datatypes** | | | | |-|-|-| -| [EventHeader](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L130) | [MCParticle](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L140) | [SimTrackerHit](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L209) | -| [CaloHitContribution](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L243) | [SimCalorimeterHit](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L255) | [RawCalorimeterHit](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L267) | -| [CalorimeterHit](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L276) | [ParticleID](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L288) | [Cluster](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L301) | -| [TrackerHit](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L322) | [TrackerHitPlane](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L339) | [RawTimeSeries](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L360) | -| [Track](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L373) | [Vertex](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L392) | [ReconstructedParticle](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L409) | -| [SimPrimaryIonizationCluster](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L513) | [TrackerPulse](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L531) | [RecIonizationCluster](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L544) | -| [TimeSeries](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L555) | [RecDqdx](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L567) | | +| [EventHeader](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L130) | [MCParticle](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L140) | [SimTrackerHit](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L209) | +| [CaloHitContribution](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L243) | [SimCalorimeterHit](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L255) | [RawCalorimeterHit](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L267) | +| [CalorimeterHit](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L276) | [ParticleID](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L288) | [Cluster](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L301) | +| [TrackerHit](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L322) | [TrackerHitPlane](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L339) | [RawTimeSeries](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L360) | +| [Track](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L373) | [Vertex](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L392) | [ReconstructedParticle](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L409) | +| [SimPrimaryIonizationCluster](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L513) | [TrackerPulse](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L531) | [RecIonizationCluster](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L544) | +| [TimeSeries](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L555) | [RecDqdx](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L567) | | **Associations** | | | | |-|-|-| -| [MCRecoParticleAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L439) | [MCRecoCaloAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L448) | [MCRecoTrackerAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L457) | -| [MCRecoTrackerHitPlaneAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L466) | [MCRecoCaloParticleAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L475) | [MCRecoClusterParticleAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L484) | -| [MCRecoTrackParticleAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L493) | [RecoParticleVertexAssociation](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L502) | | +| [MCRecoParticleAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L439) | [MCRecoCaloAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L448) | [MCRecoTrackerAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L457) | +| [MCRecoTrackerHitPlaneAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L466) | [MCRecoCaloParticleAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L475) | [MCRecoClusterParticleAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L484) | +| [MCRecoTrackParticleAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L493) | [RecoParticleVertexAssociation](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L502) | | The tests and examples in the `tests` directory show how to read, write, and use these types in your code. From a1ee79d0f58ad8b68ef0e7406962c70c106d0fe4 Mon Sep 17 00:00:00 2001 From: Mateusz Jakub Fila Date: Tue, 12 Dec 2023 14:33:35 +0100 Subject: [PATCH 4/4] updated ReadmeLinks script with master/main change --- scripts/updateReadmeLinks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/updateReadmeLinks.py b/scripts/updateReadmeLinks.py index 72db2248c..86e431726 100755 --- a/scripts/updateReadmeLinks.py +++ b/scripts/updateReadmeLinks.py @@ -21,7 +21,7 @@ def check_readme_links(): links_are_ok = True for readme_line in readme_content: - edm4hep_objects = re.findall("\[(.*?)\]\(https:\/\/github.com\/key4hep\/EDM4hep\/blob\/master\/edm4hep\.yaml#L(\d+?)\)", readme_line) + edm4hep_objects = re.findall("\[(.*?)\]\(https:\/\/github.com\/key4hep\/EDM4hep\/blob\/main\/edm4hep\.yaml#L(\d+?)\)", readme_line) if edm4hep_objects: for edm4hep_object, original_line_number in edm4hep_objects: regex = f".*edm4hep::{edm4hep_object} *: *" @@ -32,7 +32,7 @@ def check_readme_links(): sys.exit(1) if edm4hep_yaml_line_numbers_with_match[0] != original_line_number: links_are_ok = False - readme_line = readme_line.replace(f"[{edm4hep_object}](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L{original_line_number})", f"[{edm4hep_object}](https://github.com/key4hep/EDM4hep/blob/master/edm4hep.yaml#L{edm4hep_yaml_line_numbers_with_match[0]})") + readme_line = readme_line.replace(f"[{edm4hep_object}](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L{original_line_number})", f"[{edm4hep_object}](https://github.com/key4hep/EDM4hep/blob/main/edm4hep.yaml#L{edm4hep_yaml_line_numbers_with_match[0]})") print(f"{edm4hep_object} is wrongly linked (line {original_line_number} --> {edm4hep_yaml_line_numbers_with_match[0]})") new_readme_content += readme_line return links_are_ok, new_readme_content