Add SiPM digitization and waveforms

.github/workflows/test.yml

@@ -33,4 +33,4 @@ jobs:
         docker run -it --name CI_container -v ${GITHUB_WORKSPACE}:/Package -v /cvmfs:/cvmfs:shared -d clicdp/cc7-lcg /bin/bash
     - name: Compile and test
       run: |
-        docker exec CI_container /bin/bash -c "yum -y install environment-modules; source /etc/profile.d/modules.sh; ln -s /usr/lib64/liblzma.so.5.2.2 /usr/lib64/liblzma.so; cd ./Package; source init_lcg.sh; source init_k4.sh; ./.github/scripts/compile_and_test.sh;"
+        docker exec CI_container /bin/bash -c "yum -y install environment-modules; source /etc/profile.d/modules.sh; ln -s /usr/lib64/liblzma.so.5.2.2 /usr/lib64/liblzma.so; cd ./Package; source init_lcg.sh; source init_k4.sh; source init_sipm.sh; ./.github/scripts/compile_and_test.sh;"

CMakeLists.txt

@@ -18,6 +18,7 @@ find_package(FastJet)
 find_package(Gaudi REQUIRED)
 find_package(k4FWCore REQUIRED)
 find_package(k4SimGeant4 REQUIRED)
+find_package(sipm REQUIRED)
 
 #----------------------------------------------------------------------------
 # Find Geant4 package, activating all available UI and Vis drivers by default
@@ -50,6 +51,7 @@ add_subdirectory(edm4dr)
 add_subdirectory(Detector)
 add_subdirectory(DRsim)
 add_subdirectory(Sim)
+add_subdirectory(Digi)
 #add_subdirectory(Gen)
 add_subdirectory(Reco)
-#add_subdirectory(analysis)
+add_subdirectory(analysis)

DRsim/CMakeLists.txt

@@ -1,39 +1,39 @@
 project(DRsim)
 
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
 file(GLOB sources ${PROJECT_SOURCE_DIR}/src/*.cc)
 file(GLOB headers ${PROJECT_SOURCE_DIR}/include/*.hh)
 
 add_executable(DRsim DRsim.cc ${sources} ${headers})
 
 target_include_directories(
   DRsim PUBLIC
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${HEPMC3_INCLUDE_DIR}
-  ${HEPMC3_INTERFACES_DIR}
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>
 )
 
+set_target_properties(DRsim PROPERTIES PUBLIC_HEADER "${headers}")
+
 target_link_libraries(
   DRsim
   ${HEPMC3_LIBRARIES}
   ${HEPMC3_ROOTIO_LIB}
   DRcomponents
   ddDRcalo
-  ddDRsensitive
   DRSimG4Components
   DRSimG4Full
   DRSimG4Fast
 )
 
-file(GLOB DRsim_MACROS ${PROJECT_SOURCE_DIR}/*.mac compacts.txt)
+file(GLOB DRsim_MACROS ${PROJECT_SOURCE_DIR}/*.mac)
+file(GLOB compacts compacts.txt)
+
 file(COPY ${DRsim_MACROS} DESTINATION ${PROJECT_BINARY_DIR})
+file(COPY ${compacts} DESTINATION ${PROJECT_BINARY_DIR})
 
 install(TARGETS DRsim
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT dev
 )
 
-install(FILES ${DRsim_MACROS} DESTINATION .)
+install(FILES ${DRsim_MACROS} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+install(FILES ${compacts} DESTINATION ${CMAKE_INSTALL_PREFIX})

DRsim/compacts.txt

@@ -1 +1 @@
-./bin/compact/DRcalo.xml
+./share/compact/DRcalo.xml

Detector/DRcalo/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(ddDRcalo)
 
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
+file(GLOB headers
+  ${PROJECT_SOURCE_DIR}/include/*.h
 )
 
 dd4hep_add_plugin(ddDRcalo SOURCES src/*.cpp USES
@@ -11,16 +11,21 @@ dd4hep_add_plugin(ddDRcalo SOURCES src/*.cpp USES
   ROOT::Geom
   ROOT::GenVector
   ROOT::MathCore
-  ddDRsegmentation
+  DRsegmentation
 )
 
+target_include_directories(ddDRcalo PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>
+)
+
+set_target_properties(ddDRcalo PROPERTIES PUBLIC_HEADER "${headers}")
+
 install(TARGETS ddDRcalo
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT dev
 )
 
-install(DIRECTORY
-  compact DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
-)
+install(DIRECTORY compact DESTINATION ${CMAKE_INSTALL_DATADIR})
 
 dd4hep_configure_scripts( ddDRcalo DEFAULT_SETUP WITH_TESTS )

Detector/DRcalo/compact/DRcalo.xml

@@ -358,40 +358,42 @@
       3.54241*eV 0.
       4.13281*eV 0.
     "/>
+    <!-- Hamamatsu S14160-1310PS -->
     <matrix name="eff_SiPM" coldim="2" values="
-      1.37760*eV 0.03
-      1.45864*eV 0.05
-      1.54980*eV 0.07
-      1.65312*eV 0.09
-      1.71013*eV 0.1
-      1.77120*eV 0.11
-      1.83680*eV 0.13
-      1.90745*eV 0.15
-      1.98375*eV 0.17
-      2.06640*eV 0.18
-      2.10143*eV 0.188
-      2.13766*eV 0.195
-      2.17516*eV 0.203
-      2.21400*eV 0.21
-      2.25426*eV 0.218
-      2.29600*eV 0.225
-      2.33932*eV 0.233
-      2.38431*eV 0.24
-      2.43106*eV 0.245
-      2.47968*eV 0.25
-      2.53029*eV 0.255
-      2.58300*eV 0.26
-      2.63796*eV 0.255
-      2.69531*eV 0.25
-      2.75520*eV 0.245
-      2.81782*eV 0.24
-      2.88335*eV 0.23
-      2.95200*eV 0.22
-      3.09960*eV 0.21
-      3.54241*eV 0.17
-      4.13281*eV 0.1
+      1.37760*eV 0.02
+      1.45864*eV 0.025
+      1.54980*eV 0.045
+      1.65312*eV 0.06
+      1.71013*eV 0.0675
+      1.77120*eV 0.075
+      1.83680*eV 0.0925
+      1.90745*eV 0.11
+      1.98375*eV 0.125
+      2.06640*eV 0.14
+      2.10143*eV 0.146
+      2.13766*eV 0.152
+      2.17516*eV 0.158
+      2.21400*eV 0.164
+      2.25426*eV 0.17
+      2.29600*eV 0.173
+      2.33932*eV 0.176
+      2.38431*eV 0.178
+      2.43106*eV 0.179
+      2.47968*eV 0.18
+      2.53029*eV 0.181
+      2.58300*eV 0.182
+      2.63796*eV 0.183
+      2.69531*eV 0.184
+      2.75520*eV 0.18
+      2.81782*eV 0.173
+      2.88335*eV 0.166
+      2.95200*eV 0.158
+      3.09960*eV 0.15
+      3.54241*eV 0.12
+      4.13281*eV 0.05
     "/>
     <!-- Optical surface is activated twice, apply sqrt to exterimental filter efficiency -->
+    <!-- Kodak Wratten #9 -->
     <matrix name="filterEff" coldim="2" values="
       1.37760*eV 0.950
       1.45864*eV 0.950