Merge pull request #20572 from perrozzi/MCTunes2017_rename_master

rename 2017MCTunes folder to MCTunes2017 to avoid import * problems
cms-sw · Sep 19, 2017 · 52c7cbe · 52c7cbe
2 parents 775ec83 + f83cd65
commit 52c7cbe
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...thon/2017MCTunes/PythiaCP1Settings_cfi.py → ...thon/MCTunes2017/PythiaCP1Settings_cfi.py b/...thon/2017MCTunes/PythiaCP1Settings_cfi.py → ...thon/MCTunes2017/PythiaCP1Settings_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pythia8CP1 = cms.PSet(
+pythia8CP1SettingsBlock = cms.PSet(
     pythia8CP1Settings = cms.vstring(
         'Tune:pp 14',
 	'Tune:ee 7',

diff --git a/...thon/2017MCTunes/PythiaCP2Settings_cfi.py → ...thon/MCTunes2017/PythiaCP2Settings_cfi.py b/...thon/2017MCTunes/PythiaCP2Settings_cfi.py → ...thon/MCTunes2017/PythiaCP2Settings_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-pythia8CP1star = cms.PSet(
-    pythia8CP1starSettings = cms.vstring(
+pythia8CP2SettingsBlock = cms.PSet(
+    pythia8CP2Settings = cms.vstring(
 	'Tune:pp 14',
 	'Tune:ee 7',
 	'MultipartonInteractions:ecmPow=0.1391',

diff --git a/...thon/2017MCTunes/PythiaCP3Settings_cfi.py → ...thon/MCTunes2017/PythiaCP3Settings_cfi.py b/...thon/2017MCTunes/PythiaCP3Settings_cfi.py → ...thon/MCTunes2017/PythiaCP3Settings_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pythia8CP3 = cms.PSet(
+pythia8CP3SettingsBlock = cms.PSet(
     pythia8CP3Settings = cms.vstring(
     'Tune:pp 14',
     'Tune:ee 7',	

diff --git a/...thon/2017MCTunes/PythiaCP4Settings_cfi.py → ...thon/MCTunes2017/PythiaCP4Settings_cfi.py b/...thon/2017MCTunes/PythiaCP4Settings_cfi.py → ...thon/MCTunes2017/PythiaCP4Settings_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pythia8CP4 = cms.PSet(
+pythia8CP4SettingsBlock = cms.PSet(
     pythia8CP4Settings = cms.vstring(
     'Tune:pp 14',
     'Tune:ee 7',

diff --git a/...thon/2017MCTunes/PythiaCP5Settings_cfi.py → ...thon/MCTunes2017/PythiaCP5Settings_cfi.py b/...thon/2017MCTunes/PythiaCP5Settings_cfi.py → ...thon/MCTunes2017/PythiaCP5Settings_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pythia8CP5 = cms.PSet(
+pythia8CP5SettingsBlock = cms.PSet(
     pythia8CP5Settings = cms.vstring(
     'Tune:pp 14',
         'Tune:ee 7',