diff --git a/DDRec/include/DDRec/DetectorData.h b/DDRec/include/DDRec/DetectorData.h index fef36cd9f50938ae5581de34ea6818f905f680b6..21f8e7c9d9f706295c289bbbe80acc51a0953598 100644 --- a/DDRec/include/DDRec/DetectorData.h +++ b/DDRec/include/DDRec/DetectorData.h @@ -3,6 +3,8 @@ #include <bitset> +#include "DD4hep/Detector.h" + namespace DD4hep { namespace DDRec { diff --git a/DDRec/src/gear/createGearForCLIC.cpp b/DDRec/src/gear/createGearForCLIC.cpp index 3bece89f298381737534b000e67f47eb70d19cf8..21f3d929bb06e004c5a293da2b08efc746be1005 100644 --- a/DDRec/src/gear/createGearForCLIC.cpp +++ b/DDRec/src/gear/createGearForCLIC.cpp @@ -287,8 +287,8 @@ namespace DD4hep{ std::map< std::string, std::string > caloMap ; caloMap["HCalBarrel"] = "HcalBarrelParameters" ; -// caloMap["ECalBarrel"] = "EcalBarrelParameters" ; -// caloMap["ECalEndcap"] = "EcalEndcapParameters" ; + caloMap["ECalBarrel"] = "EcalBarrelParameters" ; + caloMap["ECalEndcap"] = "EcalEndcapParameters" ; // caloMap["ECalPlug"] = "EcalPlugParameters" ; // caloMap["YokeBarrel"] = "YokeBarrelParameters" ; // caloMap["YokeEndcap"] = "YokeEndcapParameters" ; @@ -343,6 +343,7 @@ namespace DD4hep{ } catch( std::runtime_error& e ){ std::cerr << " >>>> " << e.what() << std::endl ; + } } // calo loop diff --git a/examples/SimpleDetector/compact/Simple_CLIC.xml b/examples/SimpleDetector/compact/Simple_CLIC.xml index a4c1ad6f5a001b11bc130f379f64dbcd5534e586..cc9c23464bbeb38bb91bd327367abea5dcce95f3 100644 --- a/examples/SimpleDetector/compact/Simple_CLIC.xml +++ b/examples/SimpleDetector/compact/Simple_CLIC.xml @@ -65,28 +65,28 @@ <detector name="VXD" type="ZPlanarTracker" vis="VXDVis" id="1" limits="Tracker_limits" readout="VXDCollection" insideTrackingVolume="true"> <layer nLadders="18" phi0="-1.570796327e+00" id="0"> - <ladder distance="3.100000000e+01" thickness="6.700000000e-02" width="1.150000000e+01" length="1.300000000e+02" offset="-2.359601096e+00" material="CarbonFiber" /> - <sensitive distance="3.095000000e+01" thickness="5.000000000e-02" width="1.100000000e+01" length="1.300000000e+02" offset="-2.109601096e+00" material="G4_Si"/> + <ladder distance="3.100000000e+01*mm" thickness="6.700000000e-02*mm" width="1.150000000e+01*mm" length="1.300000000e+02*mm" offset="-2.359601096e+00*mm" material="CarbonFiber" /> + <sensitive distance="3.095000000e+01*mm" thickness="5.000000000e-02*mm" width="1.100000000e+01*mm" length="1.300000000e+02*mm" offset="-2.109601096e+00*mm" material="G4_Si"/> </layer> <layer nLadders="18" phi0="-1.570796327e+00" id="1"> - <ladder distance="3.293300000e+01" thickness="6.700000000e-02" width="1.150000000e+01" length="1.300000000e+02" offset="-2.359601096e+00" material="CarbonFiber" /> - <sensitive distance="3.300000000e+01" thickness="5.000000000e-02" width="1.100000000e+01" length="1.300000000e+02" offset="-2.109601096e+00" material="G4_Si"/> + <ladder distance="3.293300000e+01*mm" thickness="6.700000000e-02*mm" width="1.150000000e+01*mm" length="1.300000000e+02*mm" offset="-2.359601096e+00*mm" material="CarbonFiber" /> + <sensitive distance="3.300000000e+01*mm" thickness="5.000000000e-02*mm" width="1.100000000e+01*mm" length="1.300000000e+02*mm" offset="-2.109601096e+00*mm" material="G4_Si"/> </layer> <layer nLadders="13" phi0="-1.570796327e+00" id="2"> - <ladder distance="4.400000000e+01" thickness="6.700000000e-02" width="2.250000000e+01" length="1.300000000e+02" offset="-1.918990106e+00" material="CarbonFiber" /> - <sensitive distance="4.395000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.300000000e+02" offset="-1.668990106e+00" material="G4_Si"/> + <ladder distance="4.400000000e+01*mm" thickness="6.700000000e-02*mm" width="2.250000000e+01*mm" length="1.300000000e+02*mm" offset="-1.918990106e+00*mm" material="CarbonFiber" /> + <sensitive distance="4.395000000e+01*mm" thickness="5.000000000e-02*mm" width="2.200000000e+01*mm" length="1.300000000e+02*mm" offset="-1.668990106e+00*mm" material="G4_Si"/> </layer> <layer nLadders="13" phi0="-1.570796327e+00" id="3"> - <ladder distance="4.593300000e+01" thickness="6.700000000e-02" width="2.250000000e+01" length="1.300000000e+02" offset="-1.918990106e+00" material="CarbonFiber" /> - <sensitive distance="4.600000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.300000000e+02" offset="-1.668990106e+00" material="G4_Si"/> + <ladder distance="4.593300000e+01*mm" thickness="6.700000000e-02*mm" width="2.250000000e+01*mm" length="1.300000000e+02*mm" offset="-1.918990106e+00*mm" material="CarbonFiber" /> + <sensitive distance="4.600000000e+01*mm" thickness="5.000000000e-02*mm" width="2.200000000e+01*mm" length="1.300000000e+02*mm" offset="-1.668990106e+00*mm" material="G4_Si"/> </layer> <layer nLadders="17" phi0="-1.570796327e+00" id="4"> - <ladder distance="5.800000000e+01" thickness="6.700000000e-02" width="2.250000000e+01" length="1.300000000e+02" offset="-2.370870752e+00" material="CarbonFiber" /> - <sensitive distance="5.795000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.300000000e+02" offset="-2.120870752e+00" material="G4_Si"/> + <ladder distance="5.800000000e+01*mm" thickness="6.700000000e-02*mm" width="2.250000000e+01*mm" length="1.300000000e+02*mm" offset="-2.370870752e+00*mm" material="CarbonFiber" /> + <sensitive distance="5.795000000e+01*mm" thickness="5.000000000e-02*mm" width="2.200000000e+01*mm" length="1.300000000e+02*mm" offset="-2.120870752e+00*mm" material="G4_Si"/> </layer> <layer nLadders="17" phi0="-1.570796327e+00" id="5"> - <ladder distance="5.993300000e+01" thickness="6.700000000e-02" width="2.250000000e+01" length="1.300000000e+02" offset="-2.370870752e+00" material="CarbonFiber" /> - <sensitive distance="6.000000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.300000000e+02" offset="-2.120870752e+00" material="G4_Si"/> + <ladder distance="5.993300000e+01*mm" thickness="6.700000000e-02*mm" width="2.250000000e+01*mm" length="1.300000000e+02*mm" offset="-2.370870752e+00*mm" material="CarbonFiber" /> + <sensitive distance="6.000000000e+01*mm" thickness="5.000000000e-02*mm" width="2.200000000e+01*mm" length="1.300000000e+02*mm" offset="-2.120870752e+00*mm" material="G4_Si"/> </layer> </detector>