diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b6968e..b5f9636 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(EDM4EIC LANGUAGES CXX) SET( ${PROJECT_NAME}_VERSION_MAJOR 8 ) -SET( ${PROJECT_NAME}_VERSION_MINOR 2 ) +SET( ${PROJECT_NAME}_VERSION_MINOR 3 ) SET( ${PROJECT_NAME}_VERSION_PATCH 0 ) SET( ${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}" ) diff --git a/edm4eic.yaml b/edm4eic.yaml index 8aeead7..9af6826 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -9,7 +9,7 @@ ## If there are schema version changes that can be evolved, see the podio documentation ## for an example: https://github.com/AIDASoft/podio/tree/master/tests/schema_evolution ## -schema_version: 820 +schema_version: 830 options : # should getters / setters be prefixed with get / set? @@ -191,6 +191,15 @@ components: - uint32_t boundValuesSize // size of bound values - std::array transform // row-wise 4x4 affine transform [R T; 0 1] with 3x3 rotation matrix R and translation column 3-vector T + ## An individual sample output by an HGCROC chip + edm4eic::HGCROCSample: + Members: + - uint16_t ADC // [ADC Counts], amplitude of signal during sample, valid IFF TOTInProgress is false + - uint16_t timeOfArrival // Time of arrival (TOA) [TDC counts], nonzero IFF ADC crossed threshold upwards during sample + - uint16_t timeOverThreshold // Time over threshold (TOT) [TDC counts], nonzero IFF ADC crossed threshold downwards during sample AND if TOA fired in a previous sample + - bool TOTInProgress // Flag which indicates if TOT calculation is ongoing, ADC value may be corrupted if this is true + - bool TOTComplete // Flag which indicates if a TOT calculation is complete and TOT value is valid + datatypes: edm4eic::Tensor: @@ -265,6 +274,17 @@ datatypes: ## ========================================================================== ## Calorimetry ## ========================================================================== + + edm4eic::RawHGCROCHit: + Description: "Raw hit from an HGCROC chip" + Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky, D. Kalinkin" + Members: + - uint64_t cellID // Detector specific (geometrical) cell id + - int32_t samplePhase // Phase of samples in [# samples], for synchronizing across chips + - int32_t timeStamp // [TDC counts] + VectorMembers: + - edm4eic::HGCROCSample samples // ADC, Time of Arrival (TOA), and Time over Threshold (TOT) values for each sample read out + edm4eic::CalorimeterHit: Description: "Calorimeter hit" Author: "W. Armstrong, S. Joosten"