Merge pull request #48608 from nancymarinelli/NM_TP_Ph2_FixToRelease_in_15_1_X

Phase 2 EB trig primitive: needed fix to PR 42633

Author: cmsbuild

DataFormats/EcalDigi/src/EcalEBPhase2TriggerPrimitiveDigi.cc

@@ -51,7 +51,7 @@ int EcalEBPhase2TriggerPrimitiveDigi::time() const {
 
 bool EcalEBPhase2TriggerPrimitiveDigi::isDebug() const { return (size_ > 1); }
 
-void EcalEBPhase2TriggerPrimitiveDigi::setSize(int size) { size_ = std::clamp(size_, 0, MAXSAMPLES); }
+void EcalEBPhase2TriggerPrimitiveDigi::setSize(int size) { size_ = std::clamp(size, 0, MAXSAMPLES); }
 
 std::ostream& operator<<(std::ostream& s, const EcalEBPhase2TriggerPrimitiveDigi& digi) {
   s << digi.id() << " " << digi.size() << " samples " << std::endl;

…Producers/test/testPhase2_13_1_0_pre3.py …gPrimProducers/test/testPhase2_15_0_0.pySimCalorimetry/EcalEBTrigPrimProducers/test/testPhase2_13_1_0_pre3.py renamed to SimCalorimetry/EcalEBTrigPrimProducers/test/testPhase2_15_0_0.py SimCalorimetry/EcalEBTrigPrimProducers/test/testPhase2_13_1_0_pre3.py renamed to SimCalorimetry/EcalEBTrigPrimProducers/test/testPhase2_15_0_0.py

@@ -19,8 +19,8 @@
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.EventContent.EventContent_cff')
 process.load('SimGeneral.MixingModule.mixNoPU_cfi')
-process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff')
-process.load('Configuration.Geometry.GeometryExtended2026D110_cff')
+process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
+process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff')
 process.load('Configuration.StandardSequences.MagneticField_cff')
 process.load('Configuration.StandardSequences.Generator_cff')
 process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi')
@@ -31,7 +31,7 @@
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 
 process.maxEvents = cms.untracked.PSet(
-        input = cms.untracked.int32(1),
+        input = cms.untracked.int32(100),
         output = cms.optional.untracked.allowed(cms.int32,cms.PSet)
 )
 
@@ -40,8 +40,6 @@
     destinations = cms.untracked.vstring('messages'),
     messages          = cms.untracked.PSet(threshold =  cms.untracked.string('DEBUG')),
     debugModules   = cms.untracked.vstring('*')
-
-
 )
 
 
@@ -50,10 +48,8 @@
 process.source = cms.Source("EmptySource")
 
 process.options = cms.untracked.PSet(
-    FailPath = cms.untracked.vstring(),
     IgnoreCompletely = cms.untracked.vstring(),
     Rethrow = cms.untracked.vstring(),
-    SkipEvent = cms.untracked.vstring(),
     allowUnscheduled = cms.obsolete.untracked.bool,
     canDeleteEarly = cms.untracked.vstring(),
     emptyRunLumiMode = cms.obsolete.untracked.string,
@@ -95,7 +91,7 @@
         dataTier = cms.untracked.string('GEN-SIM-DIGI'),
         filterName = cms.untracked.string('')
     ),
-    fileName = cms.untracked.string('file:/tmp/nancy/testGamma_Nancy.root'),
+    fileName = cms.untracked.string('file:TEST.root'),
     outputCommands = process.FEVTDEBUGEventContent.outputCommands,
     splitLevel = cms.untracked.int32(0)
 )