Skip to content

Commit

Permalink
Merge pull request #21055 from bsunanda/Run2-sim19
Browse files Browse the repository at this point in the history 
Run2-sim19 Modify the test code and scripts for Run2 scenario
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 31, 2017
2 parents 50392d6 + ec84fd1 commit c8014b0
Show file tree
Hide file tree
Showing 16 changed files with 184 additions and 563 deletions.
14 changes: 0 additions & 14 deletions SimG4CMS/Calo/python/CaloSimHitStudy_cfi.py
View file

This file was deleted.

55 changes: 42 additions & 13 deletions SimG4CMS/Calo/test/CaloSimHitStudy.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "CommonTools/UtilAlgos/interface/TFileService.h"

#include "DataFormats/HcalDetId/interface/HcalDetId.h"
#include "DataFormats/HcalDetId/interface/HcalTestNumbering.h"

#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
Expand Down Expand Up @@ -61,7 +62,7 @@ class CaloSimHitStudy: public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::one:
edm::EDGetTokenT<edm::PSimHitContainer> toks_tkLow_[6];
std::string muonLab[3], tkHighLab[6], tkLowLab[6];
double tmax_, eMIP_;
bool storeRL_;
bool storeRL_, testNumber_;

TH1F *hit_[9], *time_[9], *edepEM_[9], *edepHad_[9], *edep_[9];
TH1F *etot_[9], *etotg_[9], *timeAll_[9], *hitMu, *hitHigh;
Expand All @@ -82,9 +83,10 @@ CaloSimHitStudy::CaloSimHitStudy(const edm::ParameterSet& ps) {


double maxEnergy_= ps.getUntrackedParameter<double>("MaxEnergy", 200.0);
tmax_ = ps.getUntrackedParameter<double>("TimeCut", 100.0);
eMIP_ = ps.getUntrackedParameter<double>("MIPCut", 0.70);
storeRL_ = ps.getUntrackedParameter<bool>("StoreRL", false);
tmax_ = ps.getUntrackedParameter<double>("TimeCut", 100.0);
eMIP_ = ps.getUntrackedParameter<double>("MIPCut", 0.70);
storeRL_ = ps.getUntrackedParameter<bool>("StoreRL", false);
testNumber_ = ps.getUntrackedParameter<bool>("TestNumbering",false);

muonLab[0] = "MuonRPCHits";
muonLab[1] = "MuonCSCHits";
Expand Down Expand Up @@ -240,8 +242,18 @@ CaloSimHitStudy::CaloSimHitStudy(const edm::ParameterSet& ps) {
void CaloSimHitStudy::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {

edm::ParameterSetDescription desc;
desc.setUnknown();
descriptions.addDefault(desc);
desc.addUntracked<std::string>("SourceLabel", "generatorSmeared");
desc.addUntracked<std::string>("ModuleLabel", "g4SimHits");
desc.addUntracked<std::string>("EBCollection","EcalHitsEB");
desc.addUntracked<std::string>("EECollection","EcalHitsEE");
desc.addUntracked<std::string>("ESCollection","EcalHitsES");
desc.addUntracked<std::string>("HCCollection","HcalHits");
desc.addUntracked<double>("MaxEnergy", 200.0);
desc.addUntracked<double>("TimeCut", 100.0);
desc.addUntracked<double>("MIPCut", 0.70);
desc.addUntracked<bool>("StoreRL", false);
desc.addUntracked<bool>("TestNumbering", false);
descriptions.add("CaloSimHitStudy",desc);
}

void CaloSimHitStudy::analyze(edm::Event const& e, edm::EventSetup const& ) {
Expand Down Expand Up @@ -362,8 +374,14 @@ void CaloSimHitStudy::analyzeHits (std::vector<PCaloHit>& hits, int indx) {
if (time < 100) etotG[idx] += edep;
}
} else {
HcalDetId id = HcalDetId(id_);
int subdet = id.subdet();
int subdet(0);
if (testNumber_) {
int ieta(0), phi(0), z(0), lay(0), depth(0);
HcalTestNumbering::unpackHcalIndex(id_,subdet,z,depth,ieta,phi,lay);
} else {
HcalDetId id = HcalDetId(id_);
subdet = id.subdet();
}
if (subdet == static_cast<int>(HcalBarrel)) {idx = indx+2; nHB++;}
else if (subdet == static_cast<int>(HcalEndcap)) {idx = indx+3; nHE++;}
else if (subdet == static_cast<int>(HcalOuter)) {idx = indx+4; nHO++;}
Expand Down Expand Up @@ -425,9 +443,14 @@ void CaloSimHitStudy::analyzeHits (std::vector<PCaloHit>& hits, int indx) {
}
if (idx >= 0 && idx < 5) timeAll_[idx]->Fill(time);
} else if (indx == 3) {
HcalDetId id = HcalDetId(id_);
int idx = -1;
int subdet = id.subdet();
int idx(-1), subdet(0);
if (testNumber_) {
int ieta(0), phi(0), z(0), lay(0), depth(0);
HcalTestNumbering::unpackHcalIndex(id_,subdet,z,depth,ieta,phi,lay);
} else {
HcalDetId id = HcalDetId(id_);
subdet = id.subdet();
}
if (subdet == static_cast<int>(HcalBarrel)) {idx = indx+2;}
else if (subdet == static_cast<int>(HcalEndcap)) {idx = indx+3;}
else if (subdet == static_cast<int>(HcalOuter)) {idx = indx+4;}
Expand Down Expand Up @@ -483,8 +506,14 @@ void CaloSimHitStudy::analyzeHits (std::vector<PCaloHit>& ebHits,
for (unsigned int i=0; i<hcHits.size(); i++) {
double edep = hcHits[i].energy();
double time = hcHits[i].time();
HcalDetId id = HcalDetId(hcHits[i].id());
int subdet = id.subdet();
int subdet(0);
if (testNumber_) {
int ieta(0), phi(0), z(0), lay(0), depth(0);
HcalTestNumbering::unpackHcalIndex(hcHits[i].id(),subdet,z,depth,ieta,phi,lay);
} else {
HcalDetId id = HcalDetId(hcHits[i].id());
subdet = id.subdet();
}
if (subdet == static_cast<int>(HcalBarrel) ||
subdet == static_cast<int>(HcalEndcap)) {
edepH += edep;
Expand Down
80 changes: 14 additions & 66 deletions SimG4CMS/Calo/test/python/minbias_cfg.py
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

process = cms.Process("Sim",eras.Run2_2018)

process = cms.Process("Sim")
process.load("SimG4CMS.Calo.PythiaMinBias_cfi")
process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
Expand All @@ -13,76 +16,20 @@
process.load('Configuration.StandardSequences.Generator_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load("SimG4CMS.Calo.CaloSimHitStudy_cfi")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['run1_mc']
process.GlobalTag.globaltag = autoCond['run2_mc']

if 'MessageLogger' in process.__dict__:
process.MessageLogger.categories.append('G4cerr')

process.source = cms.Source("EmptySource")

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(200)
)

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('SimG4CoreSensitiveDetector',
'SimG4CoreGeometry', 'SimG4CoreApplication', 'MagneticField',
'VolumeBasedMagneticFieldESProducer', 'TrackerSimInfo',
'TrackerSimInfoNumbering', 'TrackerMapDDDtoID',
'CaloSim', 'EcalGeom', 'EcalSim',
'HCalGeom', 'HcalSim', 'HFShower', 'BscSim'),
cout = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
SimG4CoreSensitiveDetector = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
SimG4CoreApplication = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
SimG4CoreGeometry = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
MagneticField = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
VolumeBasedMagneticFieldESProducer = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
TrackerSimInfo = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
TrackerSimInfoNumbering = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
TrackerMapDDDtoID = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
CaloSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
EcalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
EcalSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
HCalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
HcalSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
HFShower = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
BscSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
)
)

process.Timing = cms.Service("Timing")

process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck",
Expand All @@ -99,23 +46,24 @@
process.rndmStore = cms.EDProducer("RandomEngineStateProducer")

process.TFileService = cms.Service("TFileService",
fileName = cms.string('minbias_QGSP_FTFP_BERT_EML.root')
fileName = cms.string('minbias_FTFP_BERT_EMM.root')
)

# Event output
process.output = cms.OutputModule("PoolOutputModule",
process.FEVTSIMEventContent,
fileName = cms.untracked.string('simevent_minbias_QGSP_FTFP_BERT_EML.root')
fileName = cms.untracked.string('simevent_minbias_FTFP_BERT_EMM.root')
)

process.generation_step = cms.Path(process.pgen)
process.simulation_step = cms.Path(process.psim)
process.analysis_step = cms.Path(process.caloSimHitStudy)
process.analysis_step = cms.Path(process.CaloSimHitStudy)
process.out_step = cms.EndPath(process.output)

process.generator.pythiaHepMCVerbosity = False
process.generator.pythiaPylistVerbosity = 0
process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
process.CaloSimHitStudy.TestNumbering = True

# process.g4SimHits.ECalSD.IgnoreTrackID = True
# process.g4SimHits.HCalSD.IgnoreTrackID = True
Expand Down
64 changes: 4 additions & 60 deletions SimG4CMS/Calo/test/python/qcdpt3000_3500_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
process = cms.Process("Sim")
process.load("Configuration.Generator.QCD_Pt_3000_3500_cfi")
process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
Expand All @@ -24,65 +25,8 @@
input = cms.untracked.int32(20)
)

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('SimG4CoreSensitiveDetector',
'SimG4CoreGeometry', 'SimG4CoreApplication', 'MagneticField',
'VolumeBasedMagneticFieldESProducer', 'TrackerSimInfo',
'TrackerSimInfoNumbering', 'TrackerMapDDDtoID',
'CaloSim', 'EcalGeom', 'EcalSim',
'HCalGeom', 'HcalSim', 'HFShower', 'BscSim'),
cout = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
SimG4CoreSensitiveDetector = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
SimG4CoreApplication = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
SimG4CoreGeometry = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
MagneticField = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
VolumeBasedMagneticFieldESProducer = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
TrackerSimInfo = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
TrackerSimInfoNumbering = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
TrackerMapDDDtoID = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
CaloSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
EcalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
EcalSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
HCalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
HcalSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
HFShower = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
BscSim = cms.untracked.PSet(
limit = cms.untracked.int32(0)
)
)
)
if 'MessageLogger' in process.__dict__:
process.MessageLogger.categories.append('G4cerr')

process.Timing = cms.Service("Timing")

Expand Down Expand Up @@ -110,7 +54,7 @@
)
process.generation_step = cms.Path(process.pgen)
process.simulation_step = cms.Path(process.psim)
process.analysis_step = cms.Path(process.caloSimHitStudy)
process.analysis_step = cms.Path(process.CaloSimHitStudy)
process.out_step = cms.EndPath(process.output)

process.generator.pythiaHepMCVerbosity = False
Expand Down
48 changes: 7 additions & 41 deletions SimG4CMS/Calo/test/python/runAPD_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

process = cms.Process("PROD")
process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
process.load("Geometry.EcalTestBeam.APDXML_cfi")
process.load("Configuration.EventContent.EventContent_cff")
Expand All @@ -15,46 +16,11 @@
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['run1_mc']

process.MessageLogger = cms.Service("MessageLogger",
destinations = cms.untracked.vstring('cout'),
categories = cms.untracked.vstring('CaloSim', 'EcalGeom', 'EcalSim',
'SimG4CoreApplication', 'FlatThetaGun',
'G4cout', 'G4cerr', 'SimTrackManager'),
debugModules = cms.untracked.vstring('*'),
cout = cms.untracked.PSet(
threshold = cms.untracked.string('DEBUG'),
INFO = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
DEBUG = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
G4cerr = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
G4cout = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
SimTrackManager = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
SimG4CoreApplication = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FlatThetaGun = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
CaloSim = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
EcalGeom = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
EcalSim = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
)
)
)
if 'MessageLogger' in process.__dict__:
process.MessageLogger.categories.append('G4cerr')
process.MessageLogger.categories.append('FlatThetaGun')
process.MessageLogger.categories.append('EcalGeom')
process.MessageLogger.categories.append('EcalSim')

process.load("IOMC.RandomEngine.IOMC_cff")
process.RandomNumberGeneratorService.generator.initialSeed = 456789
Expand Down Expand Up @@ -95,7 +61,7 @@

process.generation_step = cms.Path(process.pgen)
process.simulation_step = cms.Path(process.psim)
process.analysis_step = cms.Path(process.caloSimHitStudy)
process.analysis_step = cms.Path(process.CaloSimHitStudy)
process.out_step = cms.EndPath(process.output)

process.VtxSmeared.MeanZ = -1.0
Expand Down

0 comments on commit c8014b0

Please sign in to comment.