DCH v2 digitizer, which smears the position and adds cluster information

CMakeLists.txt

@@ -21,6 +21,7 @@ find_package(ROOT COMPONENTS RIO Tree MathCore)
 find_package(EDM4HEP)
 find_package(k4FWCore)
 find_package(Gaudi)
+find_package(GSL)
 #---------------------------------------------------------------
 
 include(GNUInstallDirs)

DCHdigi/CMakeLists.txt

@@ -28,7 +28,7 @@ install(FILES
 
 install(FILES
   dataFormatExtension/driftChamberHit.yaml
-  DESTINATION "${CMAKE_INSTALL_DATADIR}/extension" COMPONENT dev)
+  DESTINATION "${CMAKE_INSTALL_PREFIX}/extension" COMPONENT dev)
 
 install(FILES
   "${PROJECT_BINARY_DIR}/libextensionDict_rdict.pcm"
@@ -42,15 +42,29 @@ file(GLOB headers
   ${PROJECT_SOURCE_DIR}/include/*.h
 )
 
+include(CheckIncludeFileCXX)
+set(CMAKE_REQUIRED_LIBRARIES DD4hep::DDRec)
+CHECK_INCLUDE_FILE_CXX(DDRec/DCH_info.h DCH_INFO_H_EXIST)
+set(CMAKE_REQUIRED_LIBRARIES)
+set(FILES_DEPENDINGON_DCH_INFO_H "DCHdigi.cpp" )
+if(NOT DCH_INFO_H_EXIST)
+    list(FILTER sources EXCLUDE REGEX "${FILES_DEPENDINGON_DCH_INFO_H}")
+    message(WARNING "Gaudi algorithm defined in ${FILES_DEPENDINGON_DCH_INFO_H} will not be built because header file DDRec/DCH_info.h was not found")
+endif()
+
 gaudi_add_module(${PackageName}
   SOURCES ${sources}
   LINK
+  k4FWCore::k4FWCore
+  k4FWCore::k4Interface
   Gaudi::GaudiKernel
   EDM4HEP::edm4hep
   extensionDict
-  k4FWCore::k4FWCore
-  k4FWCore::k4Interface
   DD4hep::DDRec
+  DD4hep::DDCore
+  ROOT::MathCore
+  ROOT::MathMore
+  GSL::gsl
 )
 
 target_include_directories(${PackageName} PUBLIC
@@ -71,7 +85,7 @@ install(TARGETS ${PackageName}
   EXPORT ${CMAKE_PROJECT_NAME}Targets
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
-  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/@{CMAKE_PROJECT_NAME}" COMPONENT dev
+  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}" COMPONENT dev
 )
 
 install(FILES ${scripts} DESTINATION test)
@@ -83,3 +97,8 @@ set_test_env(${test_name})
 SET(test_name "test_DCHsimpleDigitizerExtendedEdm")
 ADD_TEST(NAME ${test_name} COMMAND k4run test/runDCHsimpleDigitizerExtendedEdm.py)
 set_test_env(${test_name})
+
+SET(test_name "test_runDCHdigiV2")
+ADD_TEST(NAME ${test_name} COMMAND sh +x test_DCHdigi.sh )
+set_test_env(${test_name})
+set_tests_properties(${test_name} PROPERTIES WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/DCHdigi/test/test_DCHdigi")

DCHdigi/dataFormatExtension/driftChamberHit.yaml

@@ -3,6 +3,7 @@ schema_version: 1
 options:
   # should getters / setters be prefixed with get / set?
   getSyntax: True
+  setSyntax: True
   # should POD members be exposed with getters/setters in classes that have them as members?
   exposePODMembers: False
   includeSubfolder: True
@@ -41,3 +42,45 @@ datatypes:
     OneToOneRelations:
       - extension::DriftChamberDigi digi    // reference to the digitized hit
       - edm4hep::SimTrackerHit sim // reference to the simulated hit
+
+  edm4hep::DriftChamberDigiV2:
+    Description: "Digitized hit (before tracking) for Drift Chamber v2 (requires data extension)."
+    Author: "A. Tolosa-Delgado, B. Francois, CERN"
+    Members:
+      - uint64_t cellID               // ID of the sensor that created this hit
+      - int32_t type                  // type of the raw data hit
+      - int32_t quality               // quality bit flag of the hit
+      - float time                    // time of the hit [ns]
+      - float eDep                    // energy deposited on the hit [GeV]
+      - float eDepError               // error measured on eDep [GeV]
+      - edm4hep::Vector3d position    // point on the sensitive wire (SW) which is closest to the simhit [mm]
+      - edm4hep::Vector3d directionSW // direction of SW
+      - float distanceToWire          // distance hit-wire [mm]
+      - uint32_t clusterCount         // number of clusters associated to this hit
+      - uint32_t clusterSize          // number of electrons per cluster
+
+  edm4hep::MCRecoDriftChamberDigiV2Association:
+    Description: "Association between a DriftChamberDigi and the corresponding simulated hit"
+    Author: "B. Francois, CERN"
+    Members:
+      - float weight              // weight of this association
+    OneToOneRelations:
+      - edm4hep::DriftChamberDigiV2 digi    // reference to the digitized hit
+      - edm4hep::SimTrackerHit sim // reference to the simulated hit
+
+interfaces:
+  edm4hep::TrackerHit:
+    Description: "Evolution of tracker hit interface class"
+    Author: "Thomas Madlener, DESY"
+    Members:
+      - uint64_t cellID // ID of the sensor that created this hit
+      - int32_t type // type of the raw data hit
+      - int32_t quality // quality bit flag of the hit
+      - float time [ns] // time of the hit
+      - float eDep [GeV] // energy deposited on the hit
+      - float eDepError [GeV] // error measured on eDep
+      - edm4hep::Vector3d position [mm] // hit position
+    Types:
+      - edm4hep::TrackerHit3D
+      - edm4hep::TrackerHitPlane
+      - edm4hep::DriftChamberDigiV2