Merge pull request #16000 from bsunanda/Run2-TB14

bsunanda:Run2-TB14 Add extra material for FNAL test beam setup
cms-sw · Oct 3, 2016 · 8ec3dc8 · 8ec3dc8
2 parents 5168d62 + 068ba85
commit 8ec3dc8
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 27 deletions.
diff --git a/Geometry/HGCalCommonData/data/TB160/16Module/hgcalEE.xml b/Geometry/HGCalCommonData/data/TB160/16Module/hgcalEE.xml
@@ -25,33 +25,33 @@
       EEPCB,       EECover,     EEKapton,    EEAirGap,     EEAirGap2</Vector>
     <Vector name="Thickness" type="numeric" nEntries="15">
       0.5*mm, 2.1*mm,  2.8*mm,  4.2*mm,  0.6*mm,  1.2*mm, 2.2*mm, 
-      0.5*mm, 6.0*mm, 0.10*mm,  1.2*mm,  0.5*mm, 0.01*mm, 7.0*mm,
+      0.5*mm, 6.0*mm, 0.10*mm,  0.5*mm,  0.5*mm, 0.01*mm, 6.0*mm,
       0.2*mm</Vector>
     <Vector name="Layers" type="numeric" nEntries="8"> 
-      14, 14, 14, 14, 14, 14, 14, 15</Vector>
+      18, 18, 18, 18, 18, 18, 18, 19</Vector>
     <Vector name="LayerThick" type="numeric" nEntries="8"> 
      24.30*mm, 24.30*mm, 24.90*mm, 26.20*mm, 26.20*mm,
      28.20*mm, 29.60*mm, 33.80*mm</Vector>
-    <Vector name="LayerType" type="numeric" nEntries="113"> 
-      1, 13,  9,  9,  9, 14,  4,  8,  4, 14,  9,  9,  9, 13,
-      1, 13,  9,  9,  9, 14,  4,  8,  4, 14,  9,  9,  9, 13,
-      1, 13,  9,  9,  9, 14,  4,  8,  5, 14,  9,  9,  9, 13,
-      2, 13,  9,  9,  9, 14,  5,  8,  5, 14,  9,  9,  9, 13,
-      2, 13,  9,  9,  9, 14,  5,  8,  5, 14,  9,  9,  9, 13,
-      2, 13,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 13,
-      3, 13,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 13,
-      3, 13,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 13,
+    <Vector name="LayerType" type="numeric" nEntries="145"> 
+      1, 10, 13, 10,  9,  9,  9, 14,  4,  8,  4, 14,  9,  9,  9, 10, 13, 10,
+      1, 10, 13, 10,  9,  9,  9, 14,  4,  8,  4, 14,  9,  9,  9, 10, 13, 10,
+      1, 10, 13, 10,  9,  9,  9, 14,  4,  8,  5, 14,  9,  9,  9, 10, 13, 10,
+      2, 10, 13, 10,  9,  9,  9, 14,  5,  8,  5, 14,  9,  9,  9, 10, 13, 10,
+      2, 10, 13, 10,  9,  9,  9, 14,  5,  8,  5, 14,  9,  9,  9, 10, 13, 10,
+      2, 10, 13, 10,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 10, 13, 10,
+      3, 10, 13, 10,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 10, 13, 10,
+      3, 10, 13, 10,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 10, 13, 10,
       3
     </Vector>
-    <Vector name="LayerSense" type="numeric" nEntries="113">
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
-      0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,
+    <Vector name="LayerSense" type="numeric" nEntries="145">
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
       0
     </Vector>
     <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>

diff --git a/Geometry/HGCalCommonData/data/TB160/cms.xml b/Geometry/HGCalCommonData/data/TB160/cms.xml
@@ -2,8 +2,8 @@
 <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">
 
 <SolidSection label="hgcalwafer.xml">
-  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="5.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="5.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="32.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="32.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
 </SolidSection>
 
 <LogicalPartSection label="cms.xml">

diff --git a/Geometry/HGCalCommonData/data/TB160/hgcalExtra.xml b/Geometry/HGCalCommonData/data/TB160/hgcalExtra.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<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="hgcalExtra.xml" eval="true">
+  <Constant name="rmaxExtra"   value="5.*cm"/>
+  <Constant name="zmaxExtra"   value="3.0*cm"/>
+  <Constant name="zposExtra"   value="-30.0*m"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalExtra.xml">
+  <Tubs name="HGCalExtra" rMin="0.0*fm" rMax="[rmaxExtra]" dz="[zmaxExtra]" startPhi="0*deg" deltaPhi="360*deg"/>
+ </SolidSection>
+
+<LogicalPartSection label="hgcalExtra.xml">
+  <LogicalPart name="HGCalExtra" category="unspecified">
+    <rSolid name="HGCalExtra"/>
+    <rMaterial name="materials:Glass"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalExtra.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalExtra:HGCalExtra"/>
+    <Translation x="0*fm" y="0*fm" z="[zposExtra]"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module16XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module16XML_cfi.py
@@ -5,6 +5,7 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/HGCalCommonData/data/TB160/cms.xml',
         'Geometry/HGCalCommonData/data/TB160/hgcal.xml',
+        'Geometry/HGCalCommonData/data/TB160/hgcalExtra.xml',
         'Geometry/HGCalCommonData/data/TB160/16Module/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml',

diff --git a/SimG4CMS/HGCalTestBeam/python/hgcalTBMBFNAL_cfi.py b/SimG4CMS/HGCalTestBeam/python/hgcalTBMBFNAL_cfi.py
@@ -11,6 +11,7 @@
                 'HGCScint2',
                 'HGCFSiTrack',
                 'HGCAlPlate',
+                'HGCalExtra',
                 ),
             MaximumZ = cms.double(200.),
             StopName = cms.string("HGCal"),

diff --git a/SimG4CMS/HGCalTestBeam/src/HGCalTBMB.cc b/SimG4CMS/HGCalTestBeam/src/HGCalTBMB.cc
@@ -14,8 +14,7 @@
 
 #include <iostream>
 
-#define DebugLog
-
+//#define DebugLog
 
 HGCalTBMB::HGCalTBMB(const edm::ParameterSet& p) {
 

diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimMB_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimMB_cfg.py
@@ -7,7 +7,7 @@
 process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
 process.load('Configuration.EventContent.EventContent_cff')
 process.load('SimGeneral.MixingModule.mixNoPU_cfi')
-process.load('SimG4CMS.HGCalTestBeam.HGCalTB160XML_cfi')
+process.load('SimG4CMS.HGCalTestBeam.HGCalTB160Module16XML_cfi')
 process.load('Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi')
 process.load('Geometry.HGCalCommonData.hgcalParametersInitialization_cfi')
 process.load('Configuration.StandardSequences.MagneticField_0T_cff')
@@ -89,9 +89,9 @@
     ),
     Verbosity = cms.untracked.int32(0),
     firstRun = cms.untracked.uint32(1),
-    psethack = cms.string('single muon E 100')
+    psethack = cms.string('single neutrino E 100')
 )
-process.VtxSmeared.MeanZ = -499.90
+process.VtxSmeared.MeanZ = -3100.0
 process.VtxSmeared.SigmaZ = 0
 process.HGCalTBAnalyzer.DoDigis = False
 process.HGCalTBAnalyzer.DoRecHits = False