Merge branch 'campaings-mc23-to-MC23-for-PhaseII' into 'master'

Campaings mc23 to mc23 for phase ii

See merge request !63978

Tools/Campaigns/python/PhaseII.py

@@ -154,8 +154,8 @@ def PhaseIISimulation(flags):
     PhaseIISimulationSingleIoV(flags)
 
 
-def mc23PhaseIIPileUp1(flags):
-    """Phase-II Upgrade / Run 4 flags for mc23 and above with pile-up, mu=1, conditions like mu=60"""
+def MC23PhaseIIPileUp1(flags):
+    """Phase-II Upgrade / Run 4 flags for MC23 and above with pile-up, mu=1, conditions like mu=60"""
     PhaseIIPileUpBase(flags, collisions=60)
 
     flags.Digitization.PU.NumberOfLowPtMinBias = 1.996
@@ -171,8 +171,8 @@ def mc23PhaseIIPileUp1(flags):
     }
 
 
-def mc23PhaseIIPileUp60(flags):
-    """Phase-II Upgrade / Run 4 flags for mc23 and above and above with pile-up, mu=60"""
+def MC23PhaseIIPileUp60(flags):
+    """Phase-II Upgrade / Run 4 flags for MC23 and above and above with pile-up, mu=60"""
     PhaseIIPileUpBase(flags, collisions=60)
 
     ## pile-up
@@ -194,8 +194,8 @@ def mc23PhaseIIPileUp60(flags):
     }
 
 
-def mc23PhaseIIPileUp140(flags):
-    """Phase-II Upgrade / Run 4 flags for mc23 and above with pile-up, mu=140"""
+def MC23PhaseIIPileUp140(flags):
+    """Phase-II Upgrade / Run 4 flags for MC23 and above with pile-up, mu=140"""
     PhaseIIPileUpBase(flags, collisions=140)
 
     ## pile-up
@@ -217,8 +217,8 @@ def mc23PhaseIIPileUp140(flags):
     }
 
 
-def mc23PhaseIIPileUp200(flags):
-    """Phase-II Upgrade / Run 4 flags for mc23 and above with pile-up, mu=200"""
+def MC23PhaseIIPileUp200(flags):
+    """Phase-II Upgrade / Run 4 flags for MC23 and above with pile-up, mu=200"""
     PhaseIIPileUpBase(flags, collisions=200)
 
     ## pile-up
@@ -239,8 +239,8 @@ def mc23PhaseIIPileUp200(flags):
         'timestamp': 1625130000
     }
 
-def mc23PhaseIIPileUpMC21a(flags):
-    """Phase-II Upgrade / Run 4 flags for mc23 and above with pile-up, MC21a pile-up profile"""
+def MC23PhaseIIPileUpMC21a(flags):
+    """Phase-II Upgrade / Run 4 flags for MC23 and above with pile-up, MC21a pile-up profile"""
     PhaseIIPileUpBase(flags, collisions=60)
 
     flags.Digitization.PU.NumberOfLowPtMinBias = 84.335
@@ -249,8 +249,8 @@ def mc23PhaseIIPileUpMC21a(flags):
     flags.Digitization.PU.ProfileConfig = 'RunDependentSimData.PileUpProfile_run242006_MC21a_SingleBeamspot'
 
 
-def mc23PhaseIINoPileUp(flags):
-    """Phase-II Upgrade / Run 4 flags for mc23 and above without pile-up"""
+def MC23PhaseIINoPileUp(flags):
+    """Phase-II Upgrade / Run 4 flags for MC23 and above without pile-up"""
     flags.Beam.NumberOfCollisions = 0.
 
     flags.GeoModel.Align.Dynamic = False  # no dynamic alignment for now
@@ -261,7 +261,7 @@ def mc23PhaseIINoPileUp(flags):
     flags.Digitization.DoInnerDetectorNoise = False  # disable noise for now
 
 
-def mc23PhaseIISimulationNoIoV(flags):
+def MC23PhaseIISimulationNoIoV(flags):
     """Phase-II Upgrade / Run 4 flags for simulation"""
     from SimulationConfig.SimEnums import TruthStrategy
     flags.Sim.PhysicsList = 'FTFP_BERT_ATL'
@@ -276,15 +276,15 @@ def mc23PhaseIISimulationNoIoV(flags):
     enableG4Optimizations(flags)
 
 
-def mc23PhaseIISimulationSingleIoV(flags):
+def MC23PhaseIISimulationSingleIoV(flags):
     """Phase-II Upgrade / Run 4 flags for simulation"""
-    mc23PhaseIISimulationNoIoV(flags)
+    MC23PhaseIISimulationNoIoV(flags)
 
     flags.Input.RunNumber = [350000]
     flags.Input.OverrideRunNumber = True
     flags.Input.LumiBlockNumber = [1] # dummy value
 
 
-def mc23PhaseIISimulation(flags):
+def MC23PhaseIISimulation(flags):
     """Phase-II Upgrade / Run 4 flags for simulation (alias)"""
-    mc23PhaseIISimulationSingleIoV(flags)
+    MC23PhaseIISimulationSingleIoV(flags)

Tools/Campaigns/python/__init__.py

@@ -16,9 +16,9 @@ from .MC23 import (MC23a, MC23aSingleBeamspot, MC23LowMu, MC23NoPileUp, MC23NoPi
 from .PhaseII import (PhaseIIPileUp1, PhaseIIPileUp60, PhaseIIPileUp140, PhaseIIPileUp200,
   PhaseIIPileUpMC21a, PhaseIINoPileUp,
   PhaseIISimulationNoIoV, PhaseIISimulationSingleIoV, PhaseIISimulation)
-from .PhaseII import (mc23PhaseIIPileUp1, mc23PhaseIIPileUp60, mc23PhaseIIPileUp140, mc23PhaseIIPileUp200,
-  mc23PhaseIIPileUpMC21a, mc23PhaseIINoPileUp,
-  mc23PhaseIISimulationNoIoV, mc23PhaseIISimulationSingleIoV, mc23PhaseIISimulation)
+from .PhaseII import (MC23PhaseIIPileUp1, MC23PhaseIIPileUp60, MC23PhaseIIPileUp140, MC23PhaseIIPileUp200,
+  MC23PhaseIIPileUpMC21a, MC23PhaseIINoPileUp,
+  MC23PhaseIISimulationNoIoV, MC23PhaseIISimulationSingleIoV, MC23PhaseIISimulation)
 
 from .DataOverlayRun2 import DataOverlayPPTest
 
@@ -39,8 +39,8 @@ __all__ = [
   'PhaseIIPileUp1', 'PhaseIIPileUp60', 'PhaseIIPileUp140', 'PhaseIIPileUp200',
   'PhaseIIPileUpMC21a', 'PhaseIINoPileUp',
   'PhaseIISimulationNoIoV', 'PhaseIISimulationSingleIoV', 'PhaseIISimulation',
-  'mc23PhaseIIPileUp1', 'mc23PhaseIIPileUp60', 'mc23PhaseIIPileUp140', 'mc23PhaseIIPileUp200',
-  'mc23PhaseIIPileUpMC21a', 'mc23PhaseIINoPileUp',
-  'mc23PhaseIISimulationNoIoV', 'mc23PhaseIISimulationSingleIoV', 'mc23PhaseIISimulation',
+  'MC23PhaseIIPileUp1', 'MC23PhaseIIPileUp60', 'MC23PhaseIIPileUp140', 'MC23PhaseIIPileUp200',
+  'MC23PhaseIIPileUpMC21a', 'MC23PhaseIINoPileUp',
+  'MC23PhaseIISimulationNoIoV', 'MC23PhaseIISimulationSingleIoV', 'MC23PhaseIISimulation',
   'DataOverlayPPTest',
 ]