Rebasing to the last IB; adapting test config to the new pps ERAS; re…

…moving mixNoPU_PPS_cff
cms-sw · May 19, 2020 · 152e640 · 152e640
1 parent 296b09d
commit 152e640
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 59 deletions.
diff --git a/SimGeneral/MixingModule/python/mixNoPU_PPS_cfi.py b/SimGeneral/MixingModule/python/mixNoPU_PPS_cfi.py
diff --git a/SimPPS/Configuration/test/gluglu_step1_GEN_SIM_2017.py b/SimPPS/Configuration/test/gluglu_step1_GEN_SIM_2017.py
@@ -22,6 +22,7 @@
 process.load('Configuration.StandardSequences.SimIdeal_cff')
 process.load('Configuration.StandardSequences.EndOfProcess_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+process.load('Geometry.HcalCommonData.hcalDDDSimConstants_cff')
 
 process.load('SimG4Core.Application.g4SimHits_cfi')
 process.g4SimHits.Physics.DefaultCutValue = 100.

diff --git a/SimPPS/Configuration/test/gluglu_step2_DIGI_DIGI2RAW_2017.py b/SimPPS/Configuration/test/gluglu_step2_DIGI_DIGI2RAW_2017.py
@@ -6,7 +6,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.StandardSequences.Eras import eras
-process = cms.Process('DIGI2RAW',eras.Run2_2017, eras.pps_2017)
+process = cms.Process('DIGI2RAW',eras.Run2_2017, eras.ctpps_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')

diff --git a/SimPPS/Configuration/test/gluglu_step3_RAW2DIGI_L1Reco_RECO_2017.py b/SimPPS/Configuration/test/gluglu_step3_RAW2DIGI_L1Reco_RECO_2017.py
@@ -7,7 +7,7 @@
 
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECO',eras.Run2_2017,eras.pps_2017)
+process = cms.Process('RECO',eras.Run2_2017,eras.ctpps_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')

diff --git a/SimPPS/Configuration/test/pg_step2_DIGI_DIGI2RAW_2017.py b/SimPPS/Configuration/test/pg_step2_DIGI_DIGI2RAW_2017.py
@@ -13,7 +13,7 @@
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.EventContent.EventContent_cff')
 process.load('Configuration.StandardSequences.MagneticField_cff')
-process.load('SimGeneral.MixingModule.mixNoPU_PPS_cfi')
+process.load('SimGeneral.MixingModule.mixNoPU_cfi')
 process.load('Configuration.StandardSequences.Digi_cff')
 process.load('Configuration.StandardSequences.EndOfProcess_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')