Merge branch 'campaigns/21.0-mc16a' into '21.0-mc16a'

Campaign config: Fix missing LAr flag in MC16a

See merge request !44975

LArCalorimeter/LArConfiguration/share/LArConfigRun1Old.py

@@ -10,7 +10,8 @@ larRODFlags.NumberOfCollisions.set_Value_and_Lock(20) # Run-1,2 default
 larRODFlags.UseDelta.set_Value_and_Lock(3)     # it was used in Run-1
 larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(False) # default in Run-1
 
-jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
+# Not available in 21.0-mc16a but keeping here for consistency
+# jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
 jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
 
 # check if Beam flag is set properly

LArCalorimeter/LArConfiguration/share/LArConfigRun1Old_NoCheck.py

@@ -10,6 +10,7 @@ larRODFlags.NumberOfCollisions.set_Value_and_Lock(20) # Run-1,2 default
 larRODFlags.UseDelta.set_Value_and_Lock(3)     # it was used in Run-1
 larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(False) # default in Run-1
 
-jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
+# Not available in 21.0-mc16a but keeping here for consistency
+# jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
 jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
 

LArCalorimeter/LArConfiguration/share/LArConfigRun1Old_NoPileup.py

@@ -9,7 +9,8 @@ larRODFlags.nSamples.set_Value_and_Lock(5)     # default
 larRODFlags.NumberOfCollisions.set_Value_and_Lock(0) #  no pileup
 larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(False) # default in Run1
 
-jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)  # use high gain in EMEC IW in nopileup case
+# Not available in 21.0-mc16a but keeping here for consistency
+# jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)  # use high gain in EMEC IW in nopileup case
 jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)   # use high gain in Fcal in nopileup case
 
 # check if Beam flag is set properly

LArCalorimeter/LArConfiguration/share/LArConfigRun2Old.py

@@ -9,7 +9,8 @@ larRODFlags.firstSample.set_Value_and_Lock(0)  # default
 larRODFlags.nSamples.set_Value_and_Lock(4)     # default
 larRODFlags.NumberOfCollisions.set_Value_and_Lock(20) # Run-2 default
 
-jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
+# Not available in 21.0-mc16a but keeping here for consistency
+# jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
 jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
 
 # check if Beam flag is set properly

LArCalorimeter/LArConfiguration/share/LArConfigRun2Old_NoCheck.py

@@ -9,6 +9,7 @@ larRODFlags.firstSample.set_Value_and_Lock(0)  # default
 larRODFlags.nSamples.set_Value_and_Lock(4)     # default
 larRODFlags.NumberOfCollisions.set_Value_and_Lock(20) # Run-2 default
 
-jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
+# Not available in 21.0-mc16a but keeping here for consistency
+# jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)  # default
 jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
 

LArCalorimeter/LArConfiguration/share/LArConfigRun2Old_NoPileup.py

@@ -10,7 +10,8 @@ larRODFlags.nSamples.set_Value_and_Lock(4)     # default
 larRODFlags.NumberOfCollisions.set_Value_and_Lock(0) #  no pileup
 larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(False) #  no pileup
 
-jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)  # use high gain in EMEC IW in nopileup case
+# Not available in 21.0-mc16a but keeping here for consistency
+# jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)  # use high gain in EMEC IW in nopileup case
 jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(True)    # use high gain in Fcal in nopileup case
 
 # check if Beam flag is set properly

Tools/Campaigns/share/MC16a.py

@@ -3,8 +3,9 @@
 from AthenaCommon.BeamFlags import jobproperties as bf
 bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
 
-from LArDigitization.LArDigitizationFlags import jobproperties as lar
-lar.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)
+# Not available in 21.0-mc16a but keeping here for consistency
+# from LArDigitization.LArDigitizationFlags import jobproperties as lar
+# lar.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)
 
 from AthenaCommon.Resilience import protectedInclude
 protectedInclude('LArConfiguration/LArConfigRun2Old.py')

Tools/Campaigns/share/MC20a.py

@@ -3,8 +3,9 @@
 from AthenaCommon.BeamFlags import jobproperties as bf
 bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
 
-from LArDigitization.LArDigitizationFlags import jobproperties as lar
-lar.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)
+# Not available in 21.0-mc16a but keeping here for consistency
+# from LArDigitization.LArDigitizationFlags import jobproperties as lar
+# lar.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)
 
 from AthenaCommon.Resilience import protectedInclude
 protectedInclude('LArConfiguration/LArConfigRun2Old.py')