Merge pull request #121 from fucd/gear

Geometry: move convertor from GeomSvc to GearSvc

Service/GearSvc/CMakeLists.txt

 gaudi_subdir(GearSvc v0r0)
 
 find_package(GEAR REQUIRED)
+find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
+
+gaudi_depends_on_subdirs(
+    Detector/DetInterface
+)
 
 set(GearSvc_srcs
     src/*.cpp
@@ -10,5 +15,5 @@ gaudi_install_headers(GearSvc)
 
 gaudi_add_module(GearSvc ${GearSvc_srcs}
     INCLUDE_DIRS GaudiKernel gear
-    LINK_LIBRARIES GaudiKernel ${GEAR_LIBRARIES}
+    LINK_LIBRARIES GaudiKernel ${GEAR_LIBRARIES} ${DD4hep_COMPONENT_LIBRARIES}
 )

Service/GearSvc/src/GearSvc.h

@@ -3,6 +3,9 @@
 
 #include "GearSvc/IGearSvc.h"
 #include <GaudiKernel/Service.h>
+#include "DD4hep/Detector.h"
+class dd4hep::DetElement;
+class TGeoNode;
 
 class GearSvc : public extends<Service, IGearSvc>
 {
@@ -16,6 +19,13 @@ class GearSvc : public extends<Service, IGearSvc>
         StatusCode finalize() override;
 
     private:
+	StatusCode convertBeamPipe(dd4hep::DetElement& pipe);
+	StatusCode convertVXD(dd4hep::DetElement& vxd);
+	StatusCode convertSIT(dd4hep::DetElement& sit);
+	StatusCode convertTPC(dd4hep::DetElement& tpc);
+	StatusCode convertSET(dd4hep::DetElement& set);
+	StatusCode convertFTD(dd4hep::DetElement& ftd);
+	TGeoNode* FindNode(TGeoNode* mother, char* name);
 
         Gaudi::Property<std::string> m_gearFile{this, "GearXMLFile", ""};
 

Service/TrackSystemSvc/src/MarlinKalTest.cc

@@ -70,8 +70,8 @@ namespace MarlinTrk{
   
   void MarlinKalTest::init() {
     
-    //streamlog_out( DEBUG4 ) << "  MarlinKalTest - call  this init " << std::endl ;
-    
+    std::cout << "debug: MarlinKalTest - call  this init " << std::endl ;
+    //ILDSITKalDetector* sitdet = new ILDSITKalDetector( *_gearMgr, _geoSvc )  ;
     
     MeasurementSurfaceStore& surfstore = _gearMgr->getMeasurementSurfaceStore();
     
@@ -84,11 +84,9 @@ namespace MarlinTrk{
       
     }
     else {
-      
-      //streamlog_out( DEBUG4 ) << "  MarlinKalTest - MeasurementSurfaceStore is already full. Using store as filled by MeasurementSurfaceStoreFiller " << surfstore.getFillerName() << std::endl ;
-      
+      std::cout << "debug: MarlinKalTest - MeasurementSurfaceStore is already full. Using store as filled by MeasurementSurfaceStoreFiller " << surfstore.getFillerName() << std::endl ;
     }
-
+    
     if (_gearMgr -> getDetectorName() == "LPTPC") {
       try{
         kaldet::LCTPCKalDetector* tpcdet = new kaldet::LCTPCKalDetector( *_gearMgr )  ;
@@ -125,7 +123,6 @@ namespace MarlinTrk{
 	std::cout << "Warning: " << "  MarlinKalTest - VXD missing in gear file: VXD Material Not Built " << std::endl ;
       }
       
-      
       bool SIT_found = false ;
       try{
         ILDSITKalDetector* sitdet = new ILDSITKalDetector( *_gearMgr, _geoSvc )  ;
@@ -160,7 +157,6 @@ namespace MarlinTrk{
 	std::cout << "Warning: " << "  MarlinKalTest - SET missing in gear file: SET Not Built " << std::endl ;
       }
 
-
       bool FTD_found = false ;
       try{
         ILDFTDKalDetector* ftddet = new ILDFTDKalDetector( *_gearMgr, _geoSvc )  ;
@@ -184,7 +180,7 @@ namespace MarlinTrk{
 	  std::cout << "Warning: " << "  MarlinKalTest - Simple Disc Based FTD missing in gear file: Simple Disc Based FTD Not Built " << std::endl ;
         }
       }
-
+      
       try{
         ILDTPCKalDetector* tpcdet = new ILDTPCKalDetector( *_gearMgr, _geoSvc )  ;
         // store the measurement layer id's for the active layers
@@ -194,6 +190,7 @@ namespace MarlinTrk{
       catch( gear::UnknownParameterException& e){   
 	std::cout << "Warning: " << "  MarlinKalTest - TPC missing in gear file: TPC Not Built " << std::endl ;
       }
+      
     }
 
     _det->Close() ;          // close the cradle

Service/TrackSystemSvc/src/MarlinKalTest.h

@@ -48,7 +48,7 @@ namespace MarlinTrk{
     
     
     /** Default c'tor, initializes the geometry from GEAR. */
-    MarlinKalTest( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc) ;
+    MarlinKalTest( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc = 0) ;
     
     /** d'tor */
     ~MarlinKalTest() ;

Service/TrackSystemSvc/src/TrackSystemSvc.cpp

@@ -35,7 +35,8 @@ MarlinTrk::IMarlinTrkSystem* TrackSystemSvc::getTrackSystem(void* address){
       return 0;
     }
     debug() << "GearMgr=" << mgr << " GeomSvc=" << _geoSvc << endmsg;
-    MarlinTrk::IMarlinTrkSystem* sys = new MarlinTrk::MarlinKalTest( *mgr, _geoSvc );
+    //MarlinTrk::IMarlinTrkSystem* sys = new MarlinTrk::MarlinKalTest( *mgr, _geoSvc );
+    MarlinTrk::IMarlinTrkSystem* sys = new MarlinTrk::MarlinKalTest(*mgr);
     m_trackSystems[address] = sys;
     debug() << "Track system created successfully for " << address << endmsg;
     return sys;