Renamed base profile files for all eras

cms-sw · May 17, 2022 · d60dfb9 · d60dfb9
1 parent a4a9f9d
commit d60dfb9
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 43 deletions.
diff --git a/SimPPS/DirectSimProducer/python/profile_2016_postTS2_cff.py b/SimPPS/DirectSimProducer/python/profile_2016_postTS2_cff.py
@@ -1,7 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2016_cff import profile_base_2016
-
+from SimPPS.DirectSimProducer.profile_base_2016_cff import profile_base_2016
 from CalibPPS.ESProducers.ctppsOpticalFunctions_non_DB_cff import optics_2016_postTS2 as selected_optics
 
 alignmentFile = "Validation/CTPPS/alignment/2016_postTS2.xml"

diff --git a/SimPPS/DirectSimProducer/python/profile_2016_preTS2_cff.py b/SimPPS/DirectSimProducer/python/profile_2016_preTS2_cff.py
@@ -1,7 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2016_cff import profile_base_2016
-
+from SimPPS.DirectSimProducer.profile_base_2016_cff import profile_base_2016
 from CalibPPS.ESProducers.ctppsOpticalFunctions_non_DB_cff import optics_2016_preTS2 as selected_optics
 
 alignmentFile = "Validation/CTPPS/alignment/2016_preTS2.xml"

diff --git a/SimPPS/DirectSimProducer/python/profile_2017_postTS2_cff.py b/SimPPS/DirectSimProducer/python/profile_2017_postTS2_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2017_cff import profile_base_2017
+from SimPPS.DirectSimProducer.profile_base_2017_cff import profile_base_2017
 
 alignmentFile = "Validation/CTPPS/alignment/2017_postTS2.xml"
 

diff --git a/SimPPS/DirectSimProducer/python/profile_2017_preTS2_cff.py b/SimPPS/DirectSimProducer/python/profile_2017_preTS2_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2017_cff import profile_base_2017
+from SimPPS.DirectSimProducer.profile_base_2017_cff import profile_base_2017
 
 alignmentFile = "Validation/CTPPS/alignment/2017_preTS2.xml"
 

diff --git a/SimPPS/DirectSimProducer/python/profile_2018_TS1_TS2_cff.py b/SimPPS/DirectSimProducer/python/profile_2018_TS1_TS2_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2018_cff import profile_base_2018
+from SimPPS.DirectSimProducer.profile_base_2018_cff import profile_base_2018
 
 alignmentFile = "Validation/CTPPS/alignment/2018_TS1_TS2.xml"
 

diff --git a/SimPPS/DirectSimProducer/python/profile_2018_postTS2_cff.py b/SimPPS/DirectSimProducer/python/profile_2018_postTS2_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2018_cff import profile_base_2018
+from SimPPS.DirectSimProducer.profile_base_2018_cff import profile_base_2018
 
 alignmentFile = "Validation/CTPPS/alignment/2018_postTS2.xml"
 

diff --git a/SimPPS/DirectSimProducer/python/profile_2018_preTS1_cff.py b/SimPPS/DirectSimProducer/python/profile_2018_preTS1_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2018_cff import profile_base_2018
+from SimPPS.DirectSimProducer.profile_base_2018_cff import profile_base_2018
 
 alignmentFile = "Validation/CTPPS/alignment/2018_preTS1.xml"
 

diff --git a/SimPPS/DirectSimProducer/python/profile_2021_default_cff.py b/SimPPS/DirectSimProducer/python/profile_2021_default_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2021_cff import profile_base_2021
+from SimPPS.DirectSimProducer.profile_base_2021_cff import profile_base_2021
 
 alignmentFile = "Validation/CTPPS/alignment/2021.xml"
 

diff --git a/SimPPS/DirectSimProducer/python/profile_2022_default_cff.py b/SimPPS/DirectSimProducer/python/profile_2022_default_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from SimPPS.DirectSimProducer.year_2022_cff import profile_base_2022
+from SimPPS.DirectSimProducer.profile_base_2022_cff import profile_base_2022
 
 alignmentFile = "Validation/CTPPS/alignment/alignment_2022.xml"
 

diff --git a/...DirectSimProducer/python/year_2016_cff.py → ...mProducer/python/profile_base_2016_cff.py b/...DirectSimProducer/python/year_2016_cff.py → ...mProducer/python/profile_base_2016_cff.py
diff --git a/...DirectSimProducer/python/year_2017_cff.py → ...mProducer/python/profile_base_2017_cff.py b/...DirectSimProducer/python/year_2017_cff.py → ...mProducer/python/profile_base_2017_cff.py
diff --git a/...DirectSimProducer/python/year_2018_cff.py → ...mProducer/python/profile_base_2018_cff.py b/...DirectSimProducer/python/year_2018_cff.py → ...mProducer/python/profile_base_2018_cff.py
diff --git a/...DirectSimProducer/python/year_2021_cff.py → ...mProducer/python/profile_base_2021_cff.py b/...DirectSimProducer/python/year_2021_cff.py → ...mProducer/python/profile_base_2021_cff.py
diff --git a/...DirectSimProducer/python/year_2022_cff.py → ...mProducer/python/profile_base_2022_cff.py b/...DirectSimProducer/python/year_2022_cff.py → ...mProducer/python/profile_base_2022_cff.py
diff --git a/SimPPS/DirectSimProducer/python/simPPS2016_cfi.py b/SimPPS/DirectSimProducer/python/simPPS2016_cfi.py
@@ -9,12 +9,12 @@
 
 ppsAssociationCutsESSource = _esAssCuts.clone()
 use_single_infinite_iov_entry(ppsAssociationCutsESSource, p2016)
+# geometry (using 2017 here is OK)
 XMLIdealGeometryESSource_CTPPS, ctppsGeometryESModule = cloneGeometry('Geometry.VeryForwardGeometry.geometryRPFromDD_2017_cfi')
 
 ctppsCompositeESSource = _esComp.clone(
     generateEveryNEvents = 100,
     periods = [profile_2016_postTS2, profile_2016_preTS2],
-    # geometry (using 2017 here is OK)
     compactViewTag = ctppsGeometryESModule.compactViewTag,
     isRun2 = ctppsGeometryESModule.isRun2
 )

diff --git a/Validation/CTPPS/test/simu/template_cfg.py b/Validation/CTPPS/test/simu/template_cfg.py
@@ -5,11 +5,11 @@
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
-  statistics = cms.untracked.vstring(),
-  destinations = cms.untracked.vstring('cout'),
-  cout = cms.untracked.PSet(
-    threshold = cms.untracked.string('WARNING')
-  )
+    statistics = cms.untracked.vstring(),
+    destinations = cms.untracked.vstring('cout'),
+    cout = cms.untracked.PSet(
+        threshold = cms.untracked.string('WARNING')
+    )
 )
 
 # global tag
@@ -18,6 +18,11 @@
 #process.GlobalTag = GlobalTag(process.GlobalTag, '120X_mcRun3_2021_realistic_v6', '')
 #process.load('Geometry.VeryForwardGeometry.geometryRPFromDB_cfi')
 
+# load config
+process.load('SimPPS.Configuration.ppsDirectSim_cff')
+process.load('RecoPPS.Configuration.recoCTPPS_cff')
+process.load('RecoPPS.ProtonReconstruction.ctppsProtons_cff')
+
 # default source
 process.source = cms.Source("EmptySource",
     firstRun = cms.untracked.uint32(1),
@@ -44,15 +49,12 @@
     ppsDirectProtonSimulation = cms.PSet(initialSeed = cms.untracked.uint32(4981))
 )
 
-# load config
-process.load('SimPPS.Configuration.ppsDirectSim_cff')
-process.load('RecoPPS.Configuration.recoCTPPS_cff')
 from SimPPS.DirectSimProducer.profile_base_cff import matchDirectSimOutputs
 matchDirectSimOutputs(process)
 
 # number of events
 process.maxEvents = cms.untracked.PSet(
-  input = cms.untracked.int32(int($N_EVENTS))
+    input = cms.untracked.int32(int($N_EVENTS))
 )
 
 # LHCInfo plotter
@@ -61,40 +63,40 @@
 
 # track distribution plotter
 process.ctppsTrackDistributionPlotter = cms.EDAnalyzer("CTPPSTrackDistributionPlotter",
-  tagTracks = cms.InputTag("ctppsLocalTrackLiteProducer"),
+    tagTracks = cms.InputTag("ctppsLocalTrackLiteProducer"),
 
-  rpId_45_F = process.rpIds.rp_45_F,
-  rpId_45_N = process.rpIds.rp_45_N,
-  rpId_56_N = process.rpIds.rp_56_N,
-  rpId_56_F = process.rpIds.rp_56_F,
+    rpId_45_F = process.rpIds.rp_45_F,
+    rpId_45_N = process.rpIds.rp_45_N,
+    rpId_56_N = process.rpIds.rp_56_N,
+    rpId_56_F = process.rpIds.rp_56_F,
 
-  outputFile = cms.string("$OUT_TRACKS")
+    outputFile = cms.string("$OUT_TRACKS")
 )
 
 # reconstruction plotter
 process.ctppsProtonReconstructionPlotter = cms.EDAnalyzer("CTPPSProtonReconstructionPlotter",
-  tagTracks = cms.InputTag("ctppsLocalTrackLiteProducer"),
-  tagRecoProtonsSingleRP = cms.InputTag("ctppsProtons", "singleRP"),
-  tagRecoProtonsMultiRP = cms.InputTag("ctppsProtons", "multiRP"),
+    tagTracks = cms.InputTag("ctppsLocalTrackLiteProducer"),
+    tagRecoProtonsSingleRP = cms.InputTag("ctppsProtons", "singleRP"),
+    tagRecoProtonsMultiRP = cms.InputTag("ctppsProtons", "multiRP"),
 
-  rpId_45_F = process.rpIds.rp_45_F,
-  rpId_45_N = process.rpIds.rp_45_N,
-  rpId_56_N = process.rpIds.rp_56_N,
-  rpId_56_F = process.rpIds.rp_56_F,
+    rpId_45_F = process.rpIds.rp_45_F,
+    rpId_45_N = process.rpIds.rp_45_N,
+    rpId_56_N = process.rpIds.rp_56_N,
+    rpId_56_F = process.rpIds.rp_56_F,
 
-  outputFile = cms.string("$OUT_PROTONS")
+    outputFile = cms.string("$OUT_PROTONS")
 )
 
 # processing path
 process.p = cms.Path(
-  process.generator
-  * process.beamDivergenceVtxGenerator
-  * process.ppsDirectProtonSimulation
+    process.generator
+    * process.beamDivergenceVtxGenerator
+    * process.ppsDirectProtonSimulation
 
-  * process.recoCTPPS
-  * process.ctppsProtons
+    * process.recoCTPPS
+    * process.ctppsProtons
 
-  * process.ctppsLHCInfoPlotter
-  * process.ctppsTrackDistributionPlotter
-  * process.ctppsProtonReconstructionPlotter
+    * process.ctppsLHCInfoPlotter
+    * process.ctppsTrackDistributionPlotter
+    * process.ctppsProtonReconstructionPlotter
 )