Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make new HF Shower Library the default for Run3 #34626

Merged
merged 1 commit into from Jul 28, 2021
Merged

Make new HF Shower Library the default for Run3 #34626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Run3_cff.py
View file
Open in desktop
Expand Up @@ -4,10 +4,11 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
from Configuration.Eras.Modifier_run3_HFSL_cff import run3_HFSL
from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
from Configuration.Eras.Modifier_stage2L1Trigger_2021_cff import stage2L1Trigger_2021
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
from Configuration.Eras.Modifier_ctpps_2021_cff import ctpps_2021

Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018]), run3_common, run3_GEM, run3_HB, stage2L1Trigger_2021, ctpps_2021)
Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018]), run3_common, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2021)

2 changes: 1 addition & 1 deletion Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@ def __init__(self):
'peripheralPbPb', 'pA_2016',
'run2_HE_2017', 'stage2L1Trigger', 'stage2L1Trigger_2017', 'stage2L1Trigger_2018', 'stage2L1Trigger_2021',
'run2_HF_2017', 'run2_HCAL_2017', 'run2_HEPlan1_2017', 'run2_HB_2018','run2_HE_2018',
'run3_HB', 'run3_common', 'run3_RPC',
'run3_HB', 'run3_HFSL', 'run3_common', 'run3_RPC',
'phase1Pixel', 'run3_GEM', 'run2_GEM_2017',
'run2_CSC_2018',
'phase2_common', 'phase2_tracker',
Expand Down
8 changes: 7 additions & 1 deletion SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py
View file
Open in desktop
Expand Up @@ -179,7 +179,13 @@
he = dict(
readoutFrameSize = cms.int32(10),
binOfMaximum = cms.int32(6)
)
),
hf1 = dict( samplingFactor = 0.35,
timePhase = -6.0
),
hf2 = dict( samplingFactor = 0.35,
timePhase = -7.0
)
)


Expand Down
2 changes: 2 additions & 0 deletions SimG4CMS/ShowerLibraryProducer/interface/HcalForwardLibWriter.h
View file
Open in desktop
Expand Up @@ -43,6 +43,8 @@ class HcalForwardLibWriter : public edm::one::EDAnalyzer<> {
int nshowers;
int bsize;
int splitlevel;
int compressionAlgo;
int compressionLevel;

TFile* theFile;
TTree* theTree;
Expand Down
5 changes: 5 additions & 0 deletions SimG4CMS/ShowerLibraryProducer/plugins/HcalForwardLibWriter.cc
View file
Open in desktop
Expand Up @@ -10,6 +10,8 @@ HcalForwardLibWriter::HcalForwardLibWriter(const edm::ParameterSet& iConfig) {
nshowers = theParms.getParameter<int>("Nshowers");
bsize = theParms.getParameter<int>("BufSize");
splitlevel = theParms.getParameter<int>("SplitLevel");
compressionAlgo = theParms.getParameter<int>("CompressionAlgo");
compressionLevel = theParms.getParameter<int>("CompressionLevel");

std::string pName = fp.fullPath();
if (pName.find('.') == 0)
Expand All @@ -18,6 +20,9 @@ HcalForwardLibWriter::HcalForwardLibWriter(const edm::ParameterSet& iConfig) {
readUserData();

fs->file().cd();
fs->file().SetCompressionAlgorithm(compressionAlgo);
fs->file().SetCompressionLevel(compressionLevel);

LibTree = new TTree("HFSimHits", "HFSimHits");

//https://root.cern/root/html534/TTree.html
Expand Down
4 changes: 3 additions & 1 deletion SimG4CMS/ShowerLibraryProducer/python/writelibraryfile_cfg.py
View file
Open in desktop
Expand Up @@ -15,7 +15,9 @@
Nbins = cms.int32(16),
Nshowers = cms.int32(10000),
BufSize = cms.int32(1),
SplitLevel = cms.int32(2)
SplitLevel = cms.int32(2),
CompressionAlgo = cms.int32(4),
CompressionLevel = cms.int32(4)
)
)

Expand Down