Fix to DiskTracker

examples/CLICSiD/CMakeLists.txt

@@ -64,10 +64,10 @@ endif()
 
 add_library(${PackageName} SHARED ${sources})
 
-add_executable(CalorimeterReco CalorimeterReco.cpp)
+#add_executable(CalorimeterReco CalorimeterReco.cpp)
 
 target_link_libraries(${PackageName} ${DD4hep_LIBRARIES} ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES} )
-target_link_libraries(CalorimeterReco ${PackageName} ${DD4hep_LIBRARIES}  ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES} )
+#target_link_libraries(CalorimeterReco ${PackageName} ${DD4hep_LIBRARIES}  ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES} )
 
 #---Rootmap generation--------------------------------------------------------------
 
@@ -102,6 +102,10 @@ install(TARGETS ${PackageName}
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   )
+install(DIRECTORY compact
+  DESTINATION examples/${PackageName}
+  PATTERN ".svn" EXCLUDE )
+
 # to do: add corresponding uninstall...
 #-------------------------------------------------------
 

examples/CLICSiD/compact/materials.xml

@@ -13,9 +13,12 @@
     <fraction n="0.012" ref="Ar"/>
   </material>
   
-  <material name="Vacuum">
-    <D type="density" unit="g/cm3" value="0.00000001" />
-    <fraction n="1" ref="H" />
+  <!-- We model vakuum just as very thin air -->
+  <material name="Vacuum">  
+    <D type="density" unit="g/cm3" value="0.0000000001" />
+    <fraction n="0.754" ref="N"/>
+    <fraction n="0.234" ref="O"/>
+    <fraction n="0.012" ref="Ar"/>
   </material>
 
   <material name="Epoxy">

examples/CLICSiD/src/DiskTracker_geo.cpp

@@ -35,7 +35,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens)  {
       double thickness = xml_comp_t(j).thickness();
       layerWidth += thickness;
     }
-    Tube    l_tub(rmin,rmax,layerWidth,2*M_PI*tgeo::rad);
+    Tube    l_tub(rmin,rmax,layerWidth,2*M_PI);
     Volume  l_vol(l_nam,l_tub,air);
     l_vol.setVisAttributes(lcdd,x_layer.visStr());
     for(xml_coll_t j(x_layer,_U(slice)); j; ++j, ++s_num)  {

examples/CLICSiD/src/SiTrackerEndcap2_geo.cpp

@@ -23,11 +23,13 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens)  {
   bool        reflect   = x_det.reflect(false);
   DetElement  sdet        (det_name,det_id);
   Assembly    assembly    (det_name+"_assembly");
+  //Volume      assembly    (det_name+"_assembly",Box(10000,10000,10000),vacuum);
   Volume      motherVol = lcdd.pickMotherVolume(sdet);
   int         m_id=0, c_id=0, n_sensor=0;
   map<string,Volume> modules;
   PlacedVolume pv;
 
+  //assembly.setVisAttributes(lcdd.invisible());
   sens.setType("tracker");
 
   for(xml_coll_t mi(x_det,_U(module)); mi; ++mi, ++m_id)  {