diff --git a/doc/build.sh b/doc/build.sh index eb7a13dad9dbcfac4bea540702ef55f77329e78e..1b246b676b97567d17c58d3ee93db6647ee3161b 100644 --- a/doc/build.sh +++ b/doc/build.sh @@ -7,7 +7,7 @@ if test -z "$GCC_VSN"; GCC_VSN=gcc46; echo "Using default gcc version:${GCC_VSN}"; fi; -if test -z "$1"; +if test -z "${ARCH_OS}"; then echo "You must supply the architecture as first argument:"; echo "$0 [os-version:slc5,slc6] [gcc-version:gcc43,gcc46]"; @@ -32,8 +32,7 @@ else echo "PATH=${PATH}"; cmake -DCMAKE_BUILD_TYPE=Debug -DDD4HEP_WITH_GEANT4=OFF -DDD4HEP_USE_PYROOT=OFF ../DD4hep; - . thisdd4hep.sh; make -j 5; - ./bin/geoDisplay file:../DD4hep/DDExamples/ILDExDet/compact/CLIC_ILD_CDR.xml - + . thisdd4hep.sh; + ./bin/geoDisplay file:../DD4hep/DDExamples/ILDExDet/compact/CLIC_ILD_CDR.xml fi; diff --git a/examples/CLICSiD/compact/compact_polycones.xml b/examples/CLICSiD/compact/compact_polycones.xml index 94aa2bde2bf3adc61ab2dac5627849accc747f97..009310a22d512fd3d64a35422f38fcf9c9dc1a41 100644 --- a/examples/CLICSiD/compact/compact_polycones.xml +++ b/examples/CLICSiD/compact/compact_polycones.xml @@ -782,57 +782,6 @@ </detectors> <readouts> - <readout name="SiTrackerEndcapHits"> - <id>system:6,barrel:3,layer:4,module:16,sensor:1,side:32:-2,strip:20</id> - </readout> - <readout name="SiTrackerBarrelHits"> - <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:v32:-2,strip:20</id> - </readout> - <readout name="SiVertexBarrelHits"> - <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:24</id> - </readout> - <readout name="SiVertexEndcapHits"> - <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:26</id> - </readout> - <readout name="EcalBarrelHits"> - <segmentation type="EcalBarrelCartesianGridXY" gridSizeX="3.5" gridSizeY="3.5" /> - <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id> - </readout> - <readout name="EcalEndcapHits"> - <segmentation type="GlobalGridXY" gridSizeX="3.5" gridSizeY="3.5" /> - <id>system:6,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id> - </readout> - <readout name="HcalBarrelHits"> - <segmentation type="RegularNgonCartesianGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" /> - <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id> - </readout> - <readout name="HcalEndcapHits"> - <segmentation type="GlobalGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" /> - <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id> - </readout> - <readout name="HcalPlugHits"> - <segmentation type="GlobalGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" /> - <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id> - </readout> - <readout name="MuonBarrelHits"> - <segmentation type="RegularNgonCartesianGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" /> - <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id> - </readout> - <readout name="MuonEndcapHits"> - <segmentation type="GlobalGridXY" gridSizeX="3.0*cm" gridSizeY="3.0*cm" /> - <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id> - </readout> - <readout name="SiTrackerForwardHits"> - <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:28</id> - </readout> - <readout name="LumiCalHits"> - <segmentation type="GridXYZ" gridSizeX="0.35*cm" gridSizeY="0.35*cm" /> - <id>system:8,layer:8,barrel:3,x:32:-16,y:-16</id> - </readout> - <readout name="BeamCalHits"> - <segmentation type="GridXYZ" gridSizeX="0.35*cm" gridSizeY="0.35*cm" /> - <id>system:8,layer:8,barrel:3,x:32:-16,y:-16</id> - </readout> </readouts> <fields> <field name="GlobalSolenoid" type="solenoid"