Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New ETL geometry with 11 rings based on engineering drawings, add approximate support plate #23603

Merged
merged 1 commit into from Jun 18, 2018
Merged

New ETL geometry with 11 rings based on engineering drawings, add approximate support plate #23603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,441 changes: 978 additions & 463 deletions Geometry/MTDCommonData/data/CrystalBar/mtd.xml
View file
Open in desktop

Large diffs are not rendered by default.

1,441 changes: 978 additions & 463 deletions Geometry/MTDCommonData/data/CrystalTile/mtd.xml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Geometry/MTDCommonData/data/etl.xml
View file
Open in desktop
@@ -1,20 +1,20 @@
<?xml version="1.0"?>
<!--
============= XML GENERATION METADATA HEADER =============
tkLayout revision: fabio_devel_mtd-2135-1a8913cf on https://github.com/fabiocos/tkLayout.git
tkLayout revision: fc-mtd-newtile-2167-d332b7be on https://github.com/fabiocos/tkLayout.git
generated by: Fabio Cossutti (fabiocos on lxcloud-fc1.cern.ch)
generation date: 2018-02-25.19:01:43
note: see MTD_V0002_2018_02_25.cfg for full config files
generation date: 2018-06-15.13:53:11
note: see MTD_V0005_2018_06_15.cfg for full config files
=========== END XML GENERATION METADATA HEADER ===========
-->
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">

<ConstantsSection label="etl.xml" eval="true">
<Constant name="ETLrmin" value="[escon:R_MIN]"/>
<Constant name="ETLrmax" value="116.0*cm"/>
<Constant name="ETLrmax" value="[escon:Front_window_Al]"/>
<Constant name="ETLzmin" value="-50.0*mm"/>
<Constant name="ETLzmax" value="50.0*mm"/>
<Constant name="ETLoffset" value="[escon:ESFrontZ]"/>
<Constant name="ETLoffset" value="7.5*mm"/>
</ConstantsSection>

<SolidSection label="etl.xml">
Expand All @@ -35,7 +35,7 @@ note: see MTD_V0002_2018_02_25.cfg for full config files
<PosPart copyNumber="1">
<rParent name="esalgo:SF"/>
<rChild name="etl:EndcapTimingLayer"/>
<Translation x="0." y="0." z="[ETLoffset]+[ETLzmax]" />
<Translation x="0." y="0." z="[escon:ESFrontZ]+[ETLoffset]+[ETLzmax]" />
</PosPart>
</PosPartSection>

Expand Down
4 changes: 2 additions & 2 deletions Geometry/MTDCommonData/src/ETLNumberingScheme.cc
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ uint32_t ETLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
}

if( 1 > modCopy ||
148 < modCopy )
176 < modCopy )
{
edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
<< "****************** Bad module copy = "
Expand All @@ -85,7 +85,7 @@ uint32_t ETLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
}

if( 1 > ringCopy ||
9 < ringCopy )
11 < ringCopy )
{
edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
<< "****************** Bad ring copy = "
Expand Down
8 changes: 5 additions & 3 deletions Geometry/MTDSimData/data/CrystalBar/mtdProdCuts.xml
View file
Open in desktop
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
============= XML GENERATION METADATA HEADER =============
tkLayout revision: fc-mtd-newtile-2154-2c1c3221 on https://github.com/fabiocos/tkLayout.git
tkLayout revision: fc-mtd-newtile-2168-b5664b1a on https://github.com/fabiocos/tkLayout.git
generated by: Fabio Cossutti (fabiocos on lxcloud-fc1.cern.ch)
generation date: 2018-04-16.14:55:44
note: see MTD_ALT_V0004_2018_04_16.cfg for full config files
generation date: 2018-06-15.17:10:49
note: see MTD_ALT_V0005_2018_06_15.cfg for full config files
=========== END XML GENERATION METADATA HEADER ===========
-->
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
Expand All @@ -31,6 +31,8 @@ note: see MTD_ALT_V0004_2018_04_16.cfg for full config files
<PartSelector path="//EModule7Disc1Timingactive"/>
<PartSelector path="//EModule8Disc1Timingactive"/>
<PartSelector path="//EModule9Disc1Timingactive"/>
<PartSelector path="//EModule10Disc1Timingactive"/>
<PartSelector path="//EModule11Disc1Timingactive"/>
<Parameter name="CMSCutsRegion" value="FastTimerRegion" eval="false"/>
<Parameter name="ProdCutsForElectrons" value="0.1*mm"/>
<Parameter name="ProdCutsForPositrons" value="0.1*mm"/>
Expand Down
8 changes: 5 additions & 3 deletions Geometry/MTDSimData/data/CrystalBar/mtdsens.xml
View file
Open in desktop
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
============= XML GENERATION METADATA HEADER =============
tkLayout revision: fc-mtd-newtile-2154-2c1c3221 on https://github.com/fabiocos/tkLayout.git
tkLayout revision: fc-mtd-newtile-2168-b5664b1a on https://github.com/fabiocos/tkLayout.git
generated by: Fabio Cossutti (fabiocos on lxcloud-fc1.cern.ch)
generation date: 2018-04-16.14:55:44
note: see MTD_ALT_V0004_2018_04_16.cfg for full config files
generation date: 2018-06-15.17:10:49
note: see MTD_ALT_V0005_2018_06_15.cfg for full config files
=========== END XML GENERATION METADATA HEADER ===========
-->
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
Expand All @@ -27,6 +27,8 @@ note: see MTD_ALT_V0004_2018_04_16.cfg for full config files
<PartSelector path="//EModule7Disc1Timingactive"/>
<PartSelector path="//EModule8Disc1Timingactive"/>
<PartSelector path="//EModule9Disc1Timingactive"/>
<PartSelector path="//EModule10Disc1Timingactive"/>
<PartSelector path="//EModule11Disc1Timingactive"/>
<Parameter name="SensitiveDetector" value="MtdSensitiveDetector" eval="false"/>
<Parameter name="ReadOutName" value="FastTimerHitsEndcap" eval="false"/>
<Parameter name="Type" value="2"/>
Expand Down
8 changes: 5 additions & 3 deletions Geometry/MTDSimData/data/CrystalTile/mtdProdCuts.xml
View file
Open in desktop
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
============= XML GENERATION METADATA HEADER =============
tkLayout revision: fc-mtd-newtile-2154-2c1c3221 on https://github.com/fabiocos/tkLayout.git
tkLayout revision: fc-mtd-newtile-2168-b5664b1a on https://github.com/fabiocos/tkLayout.git
generated by: Fabio Cossutti (fabiocos on lxcloud-fc1.cern.ch)
generation date: 2018-04-16.13:52:34
note: see MTD_V0004_2018_04_16.cfg for full config files
generation date: 2018-06-15.17:10:26
note: see MTD_V0005_2018_06_15.cfg for full config files
=========== END XML GENERATION METADATA HEADER ===========
-->
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
Expand All @@ -31,6 +31,8 @@ note: see MTD_V0004_2018_04_16.cfg for full config files
<PartSelector path="//EModule7Disc1Timingactive"/>
<PartSelector path="//EModule8Disc1Timingactive"/>
<PartSelector path="//EModule9Disc1Timingactive"/>
<PartSelector path="//EModule10Disc1Timingactive"/>
<PartSelector path="//EModule11Disc1Timingactive"/>
<Parameter name="CMSCutsRegion" value="FastTimerRegion" eval="false"/>
<Parameter name="ProdCutsForElectrons" value="0.1*mm"/>
<Parameter name="ProdCutsForPositrons" value="0.1*mm"/>
Expand Down
8 changes: 5 additions & 3 deletions Geometry/MTDSimData/data/CrystalTile/mtdsens.xml
View file
Open in desktop
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
============= XML GENERATION METADATA HEADER =============
tkLayout revision: fc-mtd-newtile-2154-2c1c3221 on https://github.com/fabiocos/tkLayout.git
tkLayout revision: fc-mtd-newtile-2168-b5664b1a on https://github.com/fabiocos/tkLayout.git
generated by: Fabio Cossutti (fabiocos on lxcloud-fc1.cern.ch)
generation date: 2018-04-16.13:52:34
note: see MTD_V0004_2018_04_16.cfg for full config files
generation date: 2018-06-15.17:10:26
note: see MTD_V0005_2018_06_15.cfg for full config files
=========== END XML GENERATION METADATA HEADER ===========
-->
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
Expand All @@ -27,6 +27,8 @@ note: see MTD_V0004_2018_04_16.cfg for full config files
<PartSelector path="//EModule7Disc1Timingactive"/>
<PartSelector path="//EModule8Disc1Timingactive"/>
<PartSelector path="//EModule9Disc1Timingactive"/>
<PartSelector path="//EModule10Disc1Timingactive"/>
<PartSelector path="//EModule11Disc1Timingactive"/>
<Parameter name="SensitiveDetector" value="MtdSensitiveDetector" eval="false"/>
<Parameter name="ReadOutName" value="FastTimerHitsEndcap" eval="false"/>
<Parameter name="Type" value="2"/>
Expand Down