Skip to content

Commit

Permalink
Merge pull request #34592 from bsunanda/Run3-TB62
Browse files Browse the repository at this point in the history
Run3-TB62 Modify HGCal TB related scenarios and scripts in view of changed initialization of SDs
  • Loading branch information
cmsbuild committed Jul 27, 2021
2 parents 8deaee1 + 45babf3 commit 4f66386
Show file tree
Hide file tree
Showing 40 changed files with 82 additions and 209 deletions.
30 changes: 17 additions & 13 deletions SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
Expand Up @@ -95,10 +95,10 @@ class HGCalTBAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::on
edm::EDGetTokenT<edm::HepMCProduct> tok_hepMC_;
edm::EDGetTokenT<edm::PassiveHitContainer> tok_hgcPHEE_, tok_hgcPHFH_;
edm::EDGetTokenT<edm::PassiveHitContainer> tok_hgcPHBH_, tok_hgcPHCMSE_, tok_hgcPHBeam_;
const edm::ESGetToken<HGCalDDDConstants, IdealGeometryRecord> tokDDDEE_;
const edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> tokGeomEE_;
const edm::ESGetToken<HGCalDDDConstants, IdealGeometryRecord> tokDDDFH_;
const edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> tokGeomFH_;
edm::ESGetToken<HGCalDDDConstants, IdealGeometryRecord> tokDDDEE_;
edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> tokGeomEE_;
edm::ESGetToken<HGCalDDDConstants, IdealGeometryRecord> tokDDDFH_;
edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> tokGeomFH_;

TTree* tree_;
TH1D *hSimHitE_[4], *hSimHitT_[4];
Expand Down Expand Up @@ -167,15 +167,7 @@ HGCalTBAnalyzer::HGCalTBAnalyzer(const edm::ParameterSet& iConfig)
gev2mip200_(iConfig.getUntrackedParameter<double>("gev2mip200", 57.0e-6)),
gev2mip300_(iConfig.getUntrackedParameter<double>("gev2mip300", 85.5e-6)),
stoc_smear_time_200_(iConfig.getUntrackedParameter<double>("stoc_smear_time_200", 10.24)),
stoc_smear_time_300_(iConfig.getUntrackedParameter<double>("stoc_smear_time_300", 15.5)),
tokDDDEE_(esConsumes<HGCalDDDConstants, IdealGeometryRecord, edm::Transition::BeginRun>(
edm::ESInputTag("", detectorEE_))),
tokGeomEE_(
esConsumes<HGCalGeometry, IdealGeometryRecord, edm::Transition::BeginRun>(edm::ESInputTag("", detectorEE_))),
tokDDDFH_(esConsumes<HGCalDDDConstants, IdealGeometryRecord, edm::Transition::BeginRun>(
edm::ESInputTag("", detectorFH_))),
tokGeomFH_(
esConsumes<HGCalGeometry, IdealGeometryRecord, edm::Transition::BeginRun>(edm::ESInputTag("", detectorFH_))) {
stoc_smear_time_300_(iConfig.getUntrackedParameter<double>("stoc_smear_time_300", 15.5)) {
usesResource("TFileService");
ahcalGeom_ = std::make_unique<AHCalGeometry>(iConfig);

Expand Down Expand Up @@ -267,6 +259,18 @@ HGCalTBAnalyzer::HGCalTBAnalyzer(const edm::ParameterSet& iConfig)
if (ifBeam_)
edm::LogVerbatim("HGCSim") << "HGCalTBAnalyzer:: Detector " << detectorBeam_ << " with tags " << tmp1;
#endif
if (ifEE_) {
tokDDDEE_ =
esConsumes<HGCalDDDConstants, IdealGeometryRecord, edm::Transition::BeginRun>(edm::ESInputTag("", detectorEE_));
tokGeomEE_ =
esConsumes<HGCalGeometry, IdealGeometryRecord, edm::Transition::BeginRun>(edm::ESInputTag("", detectorEE_));
}
if (ifFH_) {
tokDDDFH_ =
esConsumes<HGCalDDDConstants, IdealGeometryRecord, edm::Transition::BeginRun>(edm::ESInputTag("", detectorFH_));
tokGeomFH_ =
esConsumes<HGCalGeometry, IdealGeometryRecord, edm::Transition::BeginRun>(edm::ESInputTag("", detectorFH_));
}
}

HGCalTBAnalyzer::~HGCalTBAnalyzer() {}
Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB160Module16XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB160/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB160/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB160/16Module/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB160/16Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB160Module4XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB160/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB160/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB160/4Module/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB160/4Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB160XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB160/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB160/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB160/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB160/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB161Module1XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8V2XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6SqueezeXML_cfi.py
Expand Up @@ -12,8 +12,7 @@
'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6XML_cfi.py
Expand Up @@ -12,8 +12,7 @@
'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB170JulyXML_cfi.py
Expand Up @@ -12,8 +12,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB170SepXML_cfi.py
Expand Up @@ -12,8 +12,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB170ShiftedXML_cfi.py
Expand Up @@ -12,8 +12,7 @@
'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB170XML_cfi.py
Expand Up @@ -12,8 +12,7 @@
'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB180A12XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB180A16XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB180A20XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB180A22XML_cfi.py
Expand Up @@ -10,8 +10,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'),
'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)

Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB181JuneXML_cfi.py
Expand Up @@ -12,8 +12,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB181/June18/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB181/June18/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
Expand Down
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct0XML_cfi.py
Expand Up @@ -13,8 +13,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
Expand Down
5 changes: 1 addition & 4 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1PC1mmXML_cfi.py
Expand Up @@ -13,10 +13,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)


3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1XML_cfi.py
Expand Up @@ -13,8 +13,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
3 changes: 1 addition & 2 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py
Expand Up @@ -13,8 +13,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
Expand Down
5 changes: 1 addition & 4 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py
Expand Up @@ -13,10 +13,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)


5 changes: 1 addition & 4 deletions SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct4XML_cfi.py
Expand Up @@ -13,10 +13,7 @@
'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml',
'SimG4CMS/HGCalTestBeam/data/CaloUtil.xml'
'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)


10 changes: 2 additions & 8 deletions SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py
Expand Up @@ -95,16 +95,10 @@
process.VtxSmeared.MaxY = 7.5
process.g4SimHits.HGCSD.RejectMouseBite = True
process.g4SimHits.HGCSD.RotatedWafer = True
process.g4SimHits.OnlySDs = ['HGCalSensitiveDetector',
'AHcalSensitiveDetector',
'CaloTrkProcessing',
process.g4SimHits.OnlySDs = ['AHcalSensitiveDetector',
'HGCSensitiveDetector',
'EcalTBH4BeamDetector',
'HGCalTB1601SensitiveDetector',
'HcalTB02SensitiveDetector',
'HcalTB06BeamDetector',
'EcalSensitiveDetector',
'HcalSensitiveDetector']
'HcalTB06BeamDetector']
process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
HGCPassive = cms.PSet(
LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'),
Expand Down
12 changes: 3 additions & 9 deletions SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py
Expand Up @@ -12,7 +12,7 @@
process.load('Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi')
process.load('Geometry.HGCalCommonData.hgcalParametersInitialization_cfi')
process.load('Geometry.HcalTestBeamData.hcalTB06Parameters_cff')
process.load('Geometry.HcalCommonData.caloSimulationParameters_cff')
#process.load('Geometry.HcalCommonData.caloSimulationParameters_cff')
process.load('Configuration.StandardSequences.MagneticField_0T_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedFlat_cfi')
Expand Down Expand Up @@ -95,16 +95,10 @@
process.VtxSmeared.MaxY = 7.5
process.g4SimHits.HGCSD.RejectMouseBite = True
process.g4SimHits.HGCSD.RotatedWafer = True
process.g4SimHits.OnlySDs = ['HGCalSensitiveDetector',
'AHcalSensitiveDetector',
'CaloTrkProcessing',
process.g4SimHits.OnlySDs = ['AHcalSensitiveDetector',
'HGCSensitiveDetector',
'EcalTBH4BeamDetector',
'HGCalTB1601SensitiveDetector',
'HcalTB02SensitiveDetector',
'HcalTB06BeamDetector',
'EcalSensitiveDetector',
'HcalSensitiveDetector']
'HcalTB06BeamDetector']
process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
HGCPassive = cms.PSet(
LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'),
Expand Down
13 changes: 3 additions & 10 deletions SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py
Expand Up @@ -12,7 +12,6 @@
process.load('Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi')
process.load('Geometry.HGCalCommonData.hgcalParametersInitialization_cfi')
process.load('Geometry.HcalTestBeamData.hcalTB06Parameters_cff')
process.load('Geometry.HcalCommonData.caloSimulationParameters_cff')
process.load('Configuration.StandardSequences.MagneticField_0T_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedFlat_cfi')
Expand All @@ -29,10 +28,10 @@

if 'MessageLogger' in process.__dict__:
process.MessageLogger.HGCalGeom=dict()
process.MessageLogger.SimG4CoreGeometry=dict()
process.MessageLogger.HGCSim=dict()
process.MessageLogger.HcalSim=dict()
process.MessageLogger.HcalTB06BeamSD=dict()
# process.MessageLogger.SimG4CoreGeometry=dict()

# Input source
process.source = cms.Source("EmptySource")
Expand Down Expand Up @@ -95,16 +94,10 @@
process.VtxSmeared.MaxY = 7.5
process.g4SimHits.HGCSD.RejectMouseBite = True
process.g4SimHits.HGCSD.RotatedWafer = True
process.g4SimHits.OnlySDs = ['HGCalSensitiveDetector',
'AHcalSensitiveDetector',
'CaloTrkProcessing',
process.g4SimHits.OnlySDs = ['AHcalSensitiveDetector',
'HGCSensitiveDetector',
'EcalTBH4BeamDetector',
'HGCalTB1601SensitiveDetector',
'HcalTB02SensitiveDetector',
'HcalTB06BeamDetector',
'EcalSensitiveDetector',
'HcalSensitiveDetector']
'HcalTB06BeamDetector']
process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
HGCPassive = cms.PSet(
LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'),
Expand Down

0 comments on commit 4f66386

Please sign in to comment.