diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt index fcaeaff3af598176610c49b3b7830121696e21a5..781eb6f0c0f8a925ec737215fa2af02787eccc4c 100644 --- a/examples/CLICSiD/CMakeLists.txt +++ b/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... #------------------------------------------------------- diff --git a/examples/CLICSiD/compact/materials.xml b/examples/CLICSiD/compact/materials.xml index 12107bafc23a2b39c32e457b34ec7568e5139993..cb555a1860b8add9657234aa211d99cdaf3e5768 100644 --- a/examples/CLICSiD/compact/materials.xml +++ b/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"> diff --git a/examples/CLICSiD/src/DiskTracker_geo.cpp b/examples/CLICSiD/src/DiskTracker_geo.cpp index 8322369c663374a8f6fb9e80691e26adab1834d8..2eae79c6cc6763e8ccfd40c19b028a0ec3879bb2 100644 --- a/examples/CLICSiD/src/DiskTracker_geo.cpp +++ b/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) { diff --git a/examples/CLICSiD/src/SiTrackerEndcap2_geo.cpp b/examples/CLICSiD/src/SiTrackerEndcap2_geo.cpp index d5df476d00a672f3532969da261a557b4287aea7..a8bfcd7194ebdc31a366d5ecc22003db2aac45ac 100644 --- a/examples/CLICSiD/src/SiTrackerEndcap2_geo.cpp +++ b/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) {