Integrate PHOS into o2sim; Add PHOS dictionaries

sawenzel · sawenzel · commit f2986aaa4eac · 2018-01-12T15:59:20.000+01:00
diff --git a/Detectors/PHOS/base/src/PHOSBaseLinkDef.h b/Detectors/PHOS/base/src/PHOSBaseLinkDef.h
@@ -14,7 +14,8 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::phos::Geometry + ;
-#pragma link C++ class o2::phos::Hit + ;
+#pragma link C++ class o2::phos::Geometry+;
+#pragma link C++ class o2::phos::Hit+;
+#pragma link C++ class vector<o2::phos::Hit>+;
 
 #endif
diff --git a/Detectors/PHOS/simulation/src/PHOSSimulationLinkDef.h b/Detectors/PHOS/simulation/src/PHOSSimulationLinkDef.h
@@ -14,8 +14,8 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::phos::Detector + ;
-#pragma link C++ class o2::phos::GeometryParams + ;
-#pragma link C++ class o2::Base::DetImpl < o2::phos::Detector > +;
+#pragma link C++ class o2::phos::Detector+;
+#pragma link C++ class o2::phos::GeometryParams+;
+#pragma link C++ class o2::Base::DetImpl<o2::phos::Detector>+;
 
 #endif
diff --git a/cmake/O2Dependencies.cmake b/cmake/O2Dependencies.cmake
@@ -1133,6 +1133,7 @@ o2_define_bucket(
     EMCALSimulation
     TOFSimulation
     FITSimulation
+    PHOSSimulation
     Field
     Generators
     DataFormatsParameters
diff --git a/macro/build_geometry.C b/macro/build_geometry.C
@@ -28,6 +28,7 @@
 #include <TOFSimulation/Detector.h>
 #include <TRDSimulation/Detector.h>
 #include <FITSimulation/Detector.h>
+#include <PHOSSimulation/Detector.h>
 #include <DetectorsPassive/Cave.h>
 #include <DetectorsPassive/FrameStructure.h>
 #include <SimConfig/SimConfig.h>
@@ -157,6 +158,11 @@ void build_geometry(FairRunSim* run = nullptr)
     run->AddModule(new o2::EMCAL::Detector(true));
   }
 
+  if (isActivated("PHS")){
+    // phos
+    run->AddModule(new o2::phos::Detector(true));
+  }
+
   if (isActivated("FIT")) {
     // FIT
     run->AddModule(new o2::fit::Detector(true));
