Connect CPV to simulation

sawenzel · sawenzel · commit fe55d16183e2 · 2019-04-16T15:17:36.000+02:00
diff --git a/cmake/O2Dependencies.cmake b/cmake/O2Dependencies.cmake
@@ -1885,6 +1885,7 @@ o2_define_bucket(
     FDDSimulation
     HMPIDSimulation
     PHOSSimulation
+    CPVSimulation
     PHOSReconstruction
     ZDCSimulation
     Field
diff --git a/macro/build_geometry.C b/macro/build_geometry.C
@@ -34,6 +34,7 @@
 #include <FDDSimulation/Detector.h>
 #include <HMPIDSimulation/Detector.h>
 #include <PHOSSimulation/Detector.h>
+#include <CPVSimulation/Detector.h>
 #include <ZDCSimulation/Detector.h>
 #include <DetectorsPassive/Cave.h>
 #include <DetectorsPassive/FrameStructure.h>
@@ -185,6 +186,11 @@ void build_geometry(FairRunSim* run = nullptr)
     run->AddModule(new o2::phos::Detector(true));
   }
 
+  if (isActivated("CPV")) {
+    // cpv
+    run->AddModule(new o2::cpv::Detector(true));
+  }
+
   if (isActivated("T0")) {
     // FIT-T0
     run->AddModule(new o2::t0::Detector(true));
diff --git a/run/O2HitMerger.h b/run/O2HitMerger.h
@@ -48,6 +48,7 @@
 #include <FDDSimulation/Detector.h>
 #include <HMPIDSimulation/Detector.h>
 #include <PHOSSimulation/Detector.h>
+#include <CPVSimulation/Detector.h>
 #include <MCHSimulation/Detector.h>
 #include <MIDSimulation/Detector.h>
 #include <ZDCSimulation/Detector.h>
@@ -484,6 +485,10 @@ void O2HitMerger::initDetInstances()
       mDetectorInstances[i] = std::move(std::make_unique<o2::phos::Detector>(true));
       counter++;
     }
+    if (i == DetID::CPV) {
+      mDetectorInstances[i] = std::move(std::make_unique<o2::cpv::Detector>(true));
+      counter++;
+    }
     if (i == DetID::EMC) {
       mDetectorInstances[i] = std::move(std::make_unique<o2::emcal::Detector>(true));
       counter++;
