Skip to content

Commit 1cd2861

Browse files
Bug fixing in EcalEBPhase2TriggerPrimitiveDigi.cc in setSize method + updated testPhase2_15_0_0.py in SimCalorimetry/EcalEBTrigPrimProducers
1 parent e981b15 commit 1cd2861

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

DataFormats/EcalDigi/src/EcalEBPhase2TriggerPrimitiveDigi.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int EcalEBPhase2TriggerPrimitiveDigi::time() const {
5151

5252
bool EcalEBPhase2TriggerPrimitiveDigi::isDebug() const { return (size_ > 1); }
5353

54-
void EcalEBPhase2TriggerPrimitiveDigi::setSize(int size) { size_ = std::clamp(size_, 0, MAXSAMPLES); }
54+
void EcalEBPhase2TriggerPrimitiveDigi::setSize(int size) { size_ = std::clamp(size, 0, MAXSAMPLES); }
5555

5656
std::ostream& operator<<(std::ostream& s, const EcalEBPhase2TriggerPrimitiveDigi& digi) {
5757
s << digi.id() << " " << digi.size() << " samples " << std::endl;

SimCalorimetry/EcalEBTrigPrimProducers/test/testPhase2_13_1_0_pre3.py renamed to SimCalorimetry/EcalEBTrigPrimProducers/test/testPhase2_15_0_0.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
process.load('FWCore.MessageService.MessageLogger_cfi')
2020
process.load('Configuration.EventContent.EventContent_cff')
2121
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
22-
process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff')
23-
process.load('Configuration.Geometry.GeometryExtended2026D110_cff')
22+
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
23+
process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff')
2424
process.load('Configuration.StandardSequences.MagneticField_cff')
2525
process.load('Configuration.StandardSequences.Generator_cff')
2626
process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi')
@@ -31,29 +31,25 @@
3131
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
3232

3333
process.maxEvents = cms.untracked.PSet(
34-
input = cms.untracked.int32(1),
34+
input = cms.untracked.int32(100),
3535
output = cms.optional.untracked.allowed(cms.int32,cms.PSet)
3636
)
3737

3838

39-
process.MessageLogger = cms.Service("MessageLogger",
40-
destinations = cms.untracked.vstring('messages'),
41-
messages = cms.untracked.PSet(threshold = cms.untracked.string('DEBUG')),
42-
debugModules = cms.untracked.vstring('*')
43-
44-
45-
)
39+
#process.MessageLogger = cms.Service("MessageLogger",
40+
# destinations = cms.untracked.vstring('messages'),
41+
# messages = cms.untracked.PSet(threshold = cms.untracked.string('DEBUG')),
42+
# debugModules = cms.untracked.vstring('*')
43+
#)
4644

4745

4846

4947
# Input source
5048
process.source = cms.Source("EmptySource")
5149

5250
process.options = cms.untracked.PSet(
53-
FailPath = cms.untracked.vstring(),
5451
IgnoreCompletely = cms.untracked.vstring(),
5552
Rethrow = cms.untracked.vstring(),
56-
SkipEvent = cms.untracked.vstring(),
5753
allowUnscheduled = cms.obsolete.untracked.bool,
5854
canDeleteEarly = cms.untracked.vstring(),
5955
emptyRunLumiMode = cms.obsolete.untracked.string,
@@ -95,7 +91,7 @@
9591
dataTier = cms.untracked.string('GEN-SIM-DIGI'),
9692
filterName = cms.untracked.string('')
9793
),
98-
fileName = cms.untracked.string('file:/tmp/nancy/testGamma_Nancy.root'),
94+
fileName = cms.untracked.string('file:TEST.root'),
9995
outputCommands = process.FEVTDEBUGEventContent.outputCommands,
10096
splitLevel = cms.untracked.int32(0)
10197
)

0 commit comments

Comments
 (0)