Skip to content

Commit

Permalink
Merge pull request #19419 from bsunanda/Run2-TB32
Browse files Browse the repository at this point in the history 
Run2-TB32 Add simulation for the Timing layer TB studies
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 4, 2017
2 parents 88e61f1 + 615e563 commit db12bb5
Show file tree
Hide file tree
Showing 10 changed files with 1,042 additions and 4 deletions.
433 changes: 433 additions & 0 deletions Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalBeam.xml
View file

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?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">

<SpecParSection label="hgcalReco.xml" eval="true">
<SpecPar name="HGCalEEWafer">
<PartSelector path="//HGCalEEWafer.*"/>
<Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
<Parameter name="WaferSize" value="[hgcal:WaferW]"/>
</SpecPar>
<SpecPar name="HGCalEECell">
<PartSelector path="//HGCalEECell.*"/>
<Parameter name="Volume" value="HGCalEECell" eval="false"/>
<Parameter name="CellSize" value="[hgcalwafer:CellWF]"/>
<Parameter name="CellSize" value="[hgcalwafer:CellWC]"/>
</SpecPar>
<SpecPar name="HGCalEEReco">
<PartSelector path="//HGCalEESensitive.*"/>
<Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
<Parameter name="Slope" value="0.0"/>
<Parameter name="GroupingZFine" value="1"/>
<Parameter name="GroupingZFine" value="1"/>
<Parameter name="GroupingZFine" value="1"/>
<Parameter name="GroupingZMid" value="1"/>
<Parameter name="GroupingZMid" value="1"/>
<Parameter name="GroupingZMid" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
80 changes: 80 additions & 0 deletions Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalEE.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?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="hgcalEE.xml" eval="true">
<Constant name="rMinFine" value="0.0*fm"/>
<Constant name="rMaxFine" value="0.0*cm"/>
<Constant name="rMaxMiddle" value="120.0*cm"/>
<Constant name="rMaxCoarse" value="2000.0*cm"/>
<Constant name="rMin" value="0.0*fm"/>
<Constant name="rMax" value="10.0*cm"/>
</ConstantsSection>

<PosPartSection label="hgcalEE.xml">
<Algorithm name="hgcal:DDHGCalModuleAlgo">
<rParent name="hgcal:HGCalEE"/>
<Vector name="WaferName" type="string" nEntries="2">
hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
<Vector name="MaterialNames" type="string" nEntries="31">
materials:Lead, materials:Tungsten, materials:Tungsten,
materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
hgcal:WCu, materials:Copper, materials:G10, materials:Air,
materials:Air, materials:Air, materials:Air, materials:Air,
materials:Air, materials:Air, materials:Air, materials:Air,
materials:Air, materials:Air, materials:Air, materials:Air,
materials:Air, materials:Air, materials:Copper, materials:Kapton, materials:M_NEMA FR4 plate, materials:G10, materials:M_NEMA FR4 plate, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="31">
EEAbsorber1, EEAbsorber2, EEAbsorber3, EEAbsorber4, EEAbsorber5,
EEAbsorber6, EEAbsorber7, EEAbsorber8, EEHeatShield, EEPCB,
EESensitive, EEAirGap1, EEAirGap2, EEAirGap3, EEAirGap4, EEAirGap5,
EEAirGap6, EEAirGap7, EEAirGap8, EEAirGap9, EEAirGap10, EEAirGap11,
EEAirGap12, EEAirGap13, EEAirGap14, EEHeatShield2, EEKapton, EECoverPlate, EEPCB2, EECoverPlate2, EEAirGap15</Vector>
<Vector name="Thickness" type="numeric" nEntries="31">
44.9*mm, 8.0*mm, 4.0*mm, 2.0*mm, 0.0*mm, 2.2*mm, 1.2*mm, 0.6*mm, 6.0*mm,
0.5*mm, 0.10*mm, 1.0*mm, 7.0*mm, 4.5*mm, 7.6*mm, 4.8*mm, 13.5*mm,
9.69*mm, 8.09*mm, 10.69*mm, 19.4*mm, 10.59*mm, 22.1*mm, 15.39*mm, 16.29*mm,
12.0*mm, 0.01*mm, 0.5*mm, 1.0*mm, 1.0*mm, 4.8*mm </Vector>
<Vector name="Layers" type="numeric" nEntries="1">
16</Vector>
<Vector name="LayerThick" type="numeric" nEntries="1">
60.31*mm
</Vector>
<Vector name="LayerType" type="numeric" nEntries="16">
2,12,2,12,2,12,2,12,2,12,2,26,10,10,10,29
</Vector>
<Vector name="LayerSense" type="numeric" nEntries="16">
0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0, 0, 1, 1, 1, 0
</Vector>
<Numeric name="zMinBlock" value="[hgcal:zminEE]"/>
<Numeric name="rMaxFine" value="[rMaxFine]"/>
<Numeric name="waferW" value="[hgcal:WaferW]"/>
<Numeric name="waferGap" value="0.0*fm"/>
<Numeric name="Sectors" value="12"/>
<Vector name="SlopeBottom" type="numeric" nEntries="2">
0.0, 0.0</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="2">
0, 0</Vector>
<Vector name="ZFront" type="numeric" nEntries="2">
[hgcal:zminEE], [hgcal:zmaxEE]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="2">
[hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
<String name="RotNameSpace" value="hgcalmodule"/>
</Algorithm>
</PosPartSection>

<SpecParSection label="hgcalEE.xml" eval="true">
<SpecPar name="HGCalEE">
<PartSelector path="//HGCalEESensitive.*"/>
<Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
<Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
<Parameter name="RadiusBound" value="[rMinFine]"/>
<Parameter name="RadiusBound" value="[rMaxFine]"/>
<Parameter name="RadiusBound" value="[rMaxMiddle]"/>
<Parameter name="RadiusBound" value="[rMaxCoarse]"/>
<Parameter name="RadiusLimits" value="[rMin]"/>
<Parameter name="RadiusLimits" value="[rMax]"/>
<Parameter name="LevelTop" value="99"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
2 changes: 1 addition & 1 deletion SimG4CMS/Calo/interface/HGCSD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class HGCSD : public CaloSD, public Observer<const BeginOfJob *> {
ForwardSubdetector myFwdSubdet_;
double slopeMin_;
int levelT_;
bool rejectMB_, waferRot_;
bool storeAllG4Hits_, rejectMB_, waferRot_;
double mouseBiteCut_;
std::vector<double> angles_;
};
Expand Down
7 changes: 5 additions & 2 deletions SimG4CMS/Calo/src/HGCSD.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ HGCSD::HGCSD(G4String name, const DDCompactView & cpv,

edm::ParameterSet m_HGC = p.getParameter<edm::ParameterSet>("HGCSD");
eminHit = m_HGC.getParameter<double>("EminHit")*CLHEP::MeV;
storeAllG4Hits_ = m_HGC.getParameter<bool>("StoreAllG4Hits");
rejectMB_ = m_HGC.getParameter<bool>("RejectMouseBite");
waferRot_ = m_HGC.getParameter<bool>("RotatedWafer");
angles_ = m_HGC.getUntrackedParameter<std::vector<double>>("WaferAngles");
Expand Down Expand Up @@ -77,6 +78,8 @@ HGCSD::HGCSD(G4String name, const DDCompactView & cpv,
#endif
edm::LogInfo("HGCSim") << "HGCSD:: Threshold for storing hits: " << eminHit
<< " for " << nameX << " subdet " << myFwdSubdet_;
edm::LogInfo("HGCSim") << "Flag for storing individual Geant4 Hits "
<< storeAllG4Hits_;
edm::LogInfo("HGCSim") << "Reject MosueBite Flag: " << rejectMB_
<< " Size of wafer " << waferSize << " Mouse Bite "
<< mouseBite << ":" << mouseBiteCut_ << " along "
Expand Down Expand Up @@ -112,8 +115,8 @@ bool HGCSD::ProcessHits(G4Step * aStep, G4TouchableHistory * ) {
// Apply fiducial cuts
if (r/z >= slopeMin_) {
if (getStepInfo(aStep)) {
if (hitExists() == false && edepositEM+edepositHAD>0.)
currentHit = createNewHit();
if ((storeAllG4Hits_ || (hitExists() == false)) &&
(edepositEM+edepositHAD>0.)) currentHit = createNewHit();
}
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ void HGCalTBAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descripti
desc.add<std::string>("CaloHitSrcBH","HcalHits");
desc.add<edm::InputTag>("DigiSrcBH",edm::InputTag("mix","HGCDigisHEback"));
desc.add<edm::InputTag>("RecHitSrcBH",edm::InputTag("HGCalRecHit","HGCHEBRecHits"));
desc.add<std::string>("DetectorBeam","HcalTB06BeamDetectorl");
desc.add<std::string>("DetectorBeam","HcalTB06BeamDetector");
desc.add<bool>("UseBeam",false);
desc.add<std::string>("CaloHitSrcBeam","HcalTB06BeamHits");
std::vector<int> ids = {1000,1001,1002,1003,1004,1005,1006,1007,1008,1011,1012,1013,1014,2001,2002,2003,2004,2005};
Expand Down
Loading

0 comments on commit db12bb5

Please sign in to comment.