Skip to content

Commit cb7f2af

Browse files
Add Track-Protocluster Association (#130)
### Briefly, what does this PR introduce? This PR introduces the `edm4eic::TrackProtoClusterMatch`, which parallels `edm4eic::TrackProtoClusterLink` but is an association and thus works with JANA2 2.4.2. This type is intended to provide a stopgap as described in [EDM4eic#129](#129). ### What kind of change does this PR introduce? - [x] Bug fix (issue #129) - [ ] New feature (issue #__) - [ ] Documentation update - [ ] Other: __ ### Please check if this PR fulfills the following: - [ ] Tests for the changes have been added - [ ] Documentation has been added / updated - [x] Changes have been communicated to collaborators ### Does this PR introduce breaking changes? What changes might users need to make to their code? No. ### Does this PR change default behavior? No. --------- Co-authored-by: Dmitry Kalinkin <[email protected]>
1 parent c9129be commit cb7f2af

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project(EDM4EIC
77
LANGUAGES CXX)
88

99
SET( ${PROJECT_NAME}_VERSION_MAJOR 8 )
10-
SET( ${PROJECT_NAME}_VERSION_MINOR 3 )
10+
SET( ${PROJECT_NAME}_VERSION_MINOR 4 )
1111
SET( ${PROJECT_NAME}_VERSION_PATCH 0 )
1212
SET( ${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}" )
1313

edm4eic.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
## If there are schema version changes that can be evolved, see the podio documentation
1010
## for an example: https://github.com/AIDASoft/podio/tree/master/tests/schema_evolution
1111
##
12-
schema_version: 830
12+
schema_version: 840
1313

1414
options :
1515
# should getters / setters be prefixed with get / set?
@@ -614,6 +614,15 @@ datatypes:
614614
- edm4eic::Cluster cluster // reference to the cluster
615615
- edm4eic::Track track // reference to the track
616616

617+
edm4eic::TrackProtoClusterMatch:
618+
Description: "Match between a ProtoCluster and a Track"
619+
Author: "D. Anderson, D. Kalinkin"
620+
Members:
621+
- float weight // weight of this association
622+
OneToOneRelations:
623+
- edm4eic::Track from // reference to the track
624+
- edm4eic::ProtoCluster to // reference to the protocluster
625+
617626
links:
618627
edm4eic::TrackProtoClusterLink:
619628
Description: "Link between a ProtoCluster and a Track"

0 commit comments

Comments
 (0)