Skip to content

Commit

Permalink
Introduce the new way of defining wafer type
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Jul 6, 2018
1 parent c102820 commit 6f6d9cb
Show file tree
Hide file tree
Showing 27 changed files with 468 additions and 211 deletions.
4 changes: 3 additions & 1 deletion CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class PHGCalParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchRun
m_name = iConfig.getUntrackedParameter<std::string>( "Name" );
m_namew = iConfig.getUntrackedParameter<std::string>( "NameW" );
m_namec = iConfig.getUntrackedParameter<std::string>( "NameC" );
m_namet = iConfig.getUntrackedParameter<std::string>( "NameT" );
}

void beginRun( edm::Run const& iEvent, edm::EventSetup const& ) override;
Expand All @@ -31,6 +32,7 @@ class PHGCalParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchRun
std::string m_name;
std::string m_namew;
std::string m_namec;
std::string m_namet;
};

void
Expand All @@ -48,7 +50,7 @@ PHGCalParametersDBBuilder::beginRun( const edm::Run&, edm::EventSetup const& es

HGCalParameters* ptp = new HGCalParameters( m_name );
HGCalParametersFromDD builder;
builder.build( &(*cpv), *ptp, m_name, m_namew, m_namec );
builder.build( &(*cpv), *ptp, m_name, m_namew, m_namec, m_namet );
swapParameters( ptp, phgp );

delete ptp;
Expand Down
11 changes: 8 additions & 3 deletions CondTools/Geometry/test/hgcalgeometrywriter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,22 @@
process.HGCalEEParametersWriter = cms.EDAnalyzer("PHGCalParametersDBBuilder",
Name = cms.untracked.string("HGCalEESensitive"),
NameW = cms.untracked.string("HGCalWafer"),
NameC = cms.untracked.string("HGCalCell"))
NameC = cms.untracked.string("HGCalCell"),
NameT = cms.untracked.string("HGCal")
)

process.HGCalHEParametersWriter = cms.EDAnalyzer("PHGCalParametersDBBuilder",
Name = cms.untracked.string("HGCalHESiliconSensitive"),
NameW = cms.untracked.string("HGCalWafer"),
NameC = cms.untracked.string("HGCalCell"))
NameC = cms.untracked.string("HGCalCell"),
NameT = cms.untracked.string("HGCal")
)

process.HGCalHEScParametersWriter = cms.EDAnalyzer("PHGCalParametersDBBuilder",
Name = cms.untracked.string("HGCalHEScintillatorSensitive"),
NameW = cms.untracked.string("HGCalWafer"),
NameC = cms.untracked.string("HGCalCell"))
NameC = cms.untracked.string("HGCalCell")),
NameT = cms.untracked.string("HGCal")

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
Expand Down
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
<Constant name="rad200300P3" value="1.59796E+02"/>
<Constant name="rad200300P4" value="-1.64217E+04"/>
<Constant name="zMinForRadPar" value="330.0*cm"/>
<Constant name="ChoiceType" value="0"/>
<Constant name="NCornerCut" value="2"/>
<Constant name="FracAreaMin" value="0.2"/>
<Constant name="radMixL0" value="1365.0*mm"/>
<Constant name="radMixL1" value="1304.0*mm"/>
<Constant name="radMixL2" value="1190.0*mm"/>
Expand Down
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/data/hgcal/v9p/hgcal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
<Constant name="rad200300P3" value="1.59796E+02"/>
<Constant name="rad200300P4" value="-1.64217E+04"/>
<Constant name="zMinForRadPar" value="330.0*cm"/>
<Constant name="ChoiceType" value="0"/>
<Constant name="NCornerCut" value="2"/>
<Constant name="FracAreaMin" value="0.2"/>
<Constant name="radMixL0" value="1462.9*mm"/>
<Constant name="radMixL1" value="1424.1*mm"/>
<Constant name="radMixL2" value="1300.6*mm"/>
Expand Down
85 changes: 67 additions & 18 deletions Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@
<Vector name="CellThickness" type="numeric" nEntries="3">
[hgcal:CellThicknessFine], [hgcal:CellThicknessCoarse1],
[hgcal:CellThicknessCoarse2] </Vector>
<Vector name="Radius100to200" type="numeric" nEntries="5">
[hgcal:rad100200P0], [hgcal:rad100200P1], [hgcal:rad100200P2],
[hgcal:rad100200P3], [hgcal:rad100200P4] </Vector>
<Vector name="Radius200to300" type="numeric" nEntries="5">
[hgcal:rad200300P0], [hgcal:rad200300P1], [hgcal:rad200300P2],
[hgcal:rad200300P3], [hgcal:rad200300P4] </Vector>
<Vector name="RadiusCuts" type="numeric" nEntries="2">
[hgcal:NCornerCut], [hgcal:zMinForRadPar] </Vector>
<Vector name="RadiusMixBoundary" type="numeric" nEntries="16">
[hgcal:radMixL0], [hgcal:radMixL1], [hgcal:radMixL2], [hgcal:radMixL3],
[hgcal:radMixL4], [hgcal:radMixL5], [hgcal:radMixL6], [hgcal:radMixL7],
Expand All @@ -22,16 +14,6 @@
<Vector name="NPhiBinBH" type="numeric" nEntries="16">
360, 360, 360, 360, 240, 240, 240, 240, 240, 240,
240, 240, 240, 240, 240, 240 </Vector>
<Vector name="SlopeBottom" type="numeric" nEntries="2">
[etaMax:slope], [etaMax:slope]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFront" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3],
[hgcal:zHGCal4]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3],
[hgcal:rMaxHGCal4]</Vector>
<Vector name="ZRanges" type="numeric" nEntries="4">
[hgcal:zMinEE], [hgcal:zMinHEsil], [hgcal:zMinHEmix],
[hgcal:zMaxHEmix]</Vector>
Expand All @@ -44,13 +26,67 @@
<Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon8Full" eval="false"/>
<Parameter name="LevelTop" value="5"/>
<Parameter name="LevelTop" value="5"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P1]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P2]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P3]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P4]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P0]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P1]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P2]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P3]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P4]"/>
<Parameter name="RadiusCuts" value="[hgcal:ChoiceType]"/>
<Parameter name="RadiusCuts" value="[hgcal:NCornerCut]"/>
<Parameter name="RadiusCuts" value="[hgcal:FracAreaMin]"/>
<Parameter name="RadiusCuts" value="[hgcal:zMinForRadPar]"/>
<Parameter name="SlopeBottom" value="[etaMax:slope]"/>
<Parameter name="SlopeTop" value="[hgcal:slope2]"/>
<Parameter name="SlopeTop" value="[hgcal:slope3]"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="ZFront" value="[hgcal:zHGCal1]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal2]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal3]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal4]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal1]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal2]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal3]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal4]"/>
</SpecPar>
<SpecPar name="HGCalHEsil">
<PartSelector path="//HGCalHESiliconSensitive.*"/>
<Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
<Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon8Full" eval="false"/>
<Parameter name="LevelTop" value="5"/>
<Parameter name="LevelTop" value="7"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P1]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P2]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P3]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P4]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P0]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P1]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P2]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P3]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P4]"/>
<Parameter name="RadiusCuts" value="[hgcal:ChoiceType]"/>
<Parameter name="RadiusCuts" value="[hgcal:NCornerCut]"/>
<Parameter name="RadiusCuts" value="[hgcal:FracAreaMin]"/>
<Parameter name="RadiusCuts" value="[hgcal:zMinForRadPar]"/>
<Parameter name="SlopeBottom" value="[etaMax:slope]"/>
<Parameter name="SlopeTop" value="[hgcal:slope2]"/>
<Parameter name="SlopeTop" value="[hgcal:slope3]"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="ZFront" value="[hgcal:zHGCal1]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal2]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal3]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal4]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal1]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal2]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal3]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal4]"/>
</SpecPar>
<SpecPar name="HGCalHEsci">
<PartSelector path="//HGCalHEScintillatorSensitive.*"/>
Expand All @@ -61,6 +97,19 @@
<Parameter name="LevelTop" value="7"/>
<Parameter name="FirstLayer" value="9"/>
<Parameter name="WaferThickness" value="[hgcal:ScintillatorThickness]"/>
<Parameter name="SlopeBottom" value="[etaMax:slope]"/>
<Parameter name="SlopeTop" value="[hgcal:slope2]"/>
<Parameter name="SlopeTop" value="[hgcal:slope3]"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="ZFront" value="[hgcal:zHGCal1]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal2]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal3]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal4]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal1]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal2]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal3]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal4]"/>
</SpecPar>
<SpecPar name="HGCalWafer">
<PartSelector path="//HGCalEECell.*"/>
Expand Down
85 changes: 67 additions & 18 deletions Geometry/HGCalCommonData/data/hgcalCons/v9p/hgcalCons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@
<Vector name="CellThickness" type="numeric" nEntries="3">
[hgcal:CellThicknessFine], [hgcal:CellThicknessCoarse1],
[hgcal:CellThicknessCoarse2] </Vector>
<Vector name="Radius100to200" type="numeric" nEntries="5">
[hgcal:rad100200P0], [hgcal:rad100200P1], [hgcal:rad100200P2],
[hgcal:rad100200P3], [hgcal:rad100200P4] </Vector>
<Vector name="Radius200to300" type="numeric" nEntries="5">
[hgcal:rad200300P0], [hgcal:rad200300P1], [hgcal:rad200300P2],
[hgcal:rad200300P3], [hgcal:rad200300P4] </Vector>
<Vector name="RadiusCuts" type="numeric" nEntries="2">
[hgcal:NCornerCut], [hgcal:zMinForRadPar] </Vector>
<Vector name="RadiusMixBoundary" type="numeric" nEntries="16">
[hgcal:radMixL0], [hgcal:radMixL1], [hgcal:radMixL2], [hgcal:radMixL3],
[hgcal:radMixL4], [hgcal:radMixL5], [hgcal:radMixL6], [hgcal:radMixL7],
Expand All @@ -22,16 +14,6 @@
<Vector name="NPhiBinBH" type="numeric" nEntries="16">
360, 360, 360, 360, 240, 240, 240, 240, 240, 240,
240, 240, 240, 240, 240, 240 </Vector>
<Vector name="SlopeBottom" type="numeric" nEntries="2">
[etaMax:slope], [etaMax:slope]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFront" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3],
[hgcal:zHGCal4]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3],
[hgcal:rMaxHGCal4]</Vector>
<Vector name="ZRanges" type="numeric" nEntries="4">
[hgcal:zMinEE], [hgcal:zMinHEsil], [hgcal:zMinHEmix],
[hgcal:zMaxHEmix]</Vector>
Expand All @@ -44,13 +26,67 @@
<Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon8" eval="false"/>
<Parameter name="LevelTop" value="5"/>
<Parameter name="LevelTop" value="5"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P1]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P2]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P3]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P4]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P0]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P1]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P2]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P3]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P4]"/>
<Parameter name="RadiusCuts" value="[hgcal:ChoiceType]"/>
<Parameter name="RadiusCuts" value="[hgcal:NCornerCut]"/>
<Parameter name="RadiusCuts" value="[hgcal:FracAreaMin]"/>
<Parameter name="RadiusCuts" value="[hgcal:zMinForRadPar]"/>
<Parameter name="SlopeBottom" value="[etaMax:slope]"/>
<Parameter name="SlopeTop" value="[hgcal:slope2]"/>
<Parameter name="SlopeTop" value="[hgcal:slope3]"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="ZFront" value="[hgcal:zHGCal1]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal2]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal3]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal4]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal1]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal2]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal3]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal4]"/>
</SpecPar>
<SpecPar name="HGCalHEsil">
<PartSelector path="//HGCalHESiliconSensitive.*"/>
<Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
<Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon8" eval="false"/>
<Parameter name="LevelTop" value="5"/>
<Parameter name="LevelTop" value="7"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P1]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P2]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P3]"/>
<Parameter name="Radius100to200" value="[hgcal:rad100200P4]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P0]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P1]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P2]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P3]"/>
<Parameter name="Radius200to300" value="[hgcal:rad200300P4]"/>
<Parameter name="RadiusCuts" value="[hgcal:ChoiceType]"/>
<Parameter name="RadiusCuts" value="[hgcal:NCornerCut]"/>
<Parameter name="RadiusCuts" value="[hgcal:FracAreaMin]"/>
<Parameter name="RadiusCuts" value="[hgcal:zMinForRadPar]"/>
<Parameter name="SlopeBottom" value="[etaMax:slope]"/>
<Parameter name="SlopeTop" value="[hgcal:slope2]"/>
<Parameter name="SlopeTop" value="[hgcal:slope3]"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="ZFront" value="[hgcal:zHGCal1]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal2]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal3]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal4]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal1]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal2]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal3]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal4]"/>
</SpecPar>
<SpecPar name="HGCalHEsci">
<PartSelector path="//HGCalHEScintillatorSensitive.*"/>
Expand All @@ -61,6 +97,19 @@
<Parameter name="LevelTop" value="7"/>
<Parameter name="FirstLayer" value="9"/>
<Parameter name="WaferThickness" value="[hgcal:ScintillatorThickness]"/>
<Parameter name="SlopeBottom" value="[etaMax:slope]"/>
<Parameter name="SlopeTop" value="[hgcal:slope2]"/>
<Parameter name="SlopeTop" value="[hgcal:slope3]"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="SlopeTop" value="0"/>
<Parameter name="ZFront" value="[hgcal:zHGCal1]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal2]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal3]"/>
<Parameter name="ZFront" value="[hgcal:zHGCal4]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal1]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal2]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal3]"/>
<Parameter name="RMaxFront" value="[hgcal:rMaxHGCal4]"/>
</SpecPar>
<SpecPar name="HGCalWafer">
<PartSelector path="//HGCalEECell.*"/>
Expand Down
4 changes: 3 additions & 1 deletion Geometry/HGCalCommonData/data/hgcalEE/v9/hgcal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
<Constant name="rad200300P3" value="1.59796E+02"/>
<Constant name="rad200300P4" value="-1.64217E+04"/>
<Constant name="zMinForRadPar" value="330.0*cm"/>
<Constant name="NCornerCut" value="2"/>
<Constant name="ChoiceType" value="0"/>
<Constant name="NCornerCut" value="2"/>
<Constant name="FracAreaMin" value="0.2"/>
<Constant name="slope2" value="tan(19.3*deg)"/>
<Constant name="slope3" value="tan(53.0*deg)"/>
<Constant name="zHGCal1" value="3170.0*mm"/>
Expand Down
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
[hgcal:rad200300P0], [hgcal:rad200300P1], [hgcal:rad200300P2],
[hgcal:rad200300P3], [hgcal:rad200300P4]</Vector>
<Numeric name="zMinForRadPar" value="[hgcal:zMinForRadPar]"/>
<Numeric name="choiceType" value="[hgcal:ChoiceType]"/>
<Numeric name="nCornerCut" value="[hgcal:NCornerCut]"/>
<Numeric name="fracAreaMin" value="[hgcal:FracAreaMin]"/>
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
<Numeric name="Sectors" value="36"/>
Expand Down
Loading

0 comments on commit 6f6d9cb

Please sign in to comment.