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

Backport campaigns configuration to 21.0-mc16a for reprocessing

See merge request !44926

LArCalorimeter/LArConfiguration/CMakeLists.txt

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name:
+atlas_subdir( LArConfiguration )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )

LArCalorimeter/LArConfiguration/share/LArConfigRun1Old.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from LArROD.LArRODFlags import larRODFlags
+from LArDigitization.LArDigitizationFlags import jobproperties
+
+larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True) # default
+larRODFlags.firstSample.set_Value_and_Lock(0)  # default
+larRODFlags.nSamples.set_Value_and_Lock(5)     # default
+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
+jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
+
+# check if Beam flag is set properly
+if jobproperties.Beam.numberOfCollisions() != 20:
+   from AthenaCommon.Logging import logging
+   mlog = logging.getLogger ('SetLArConfigRun1')
+   mlog.error("Beam.numberOfCollisions %f different from what is expected for Run1 digi/reco ", jobproperties.Beam.numberOfCollisions) 
+

LArCalorimeter/LArConfiguration/share/LArConfigRun1Old_NoCheck.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from LArROD.LArRODFlags import larRODFlags
+from LArDigitization.LArDigitizationFlags import jobproperties
+
+larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True) # default
+larRODFlags.firstSample.set_Value_and_Lock(0)  # default
+larRODFlags.nSamples.set_Value_and_Lock(5)     # default
+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
+jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
+

LArCalorimeter/LArConfiguration/share/LArConfigRun1Old_NoPileup.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from LArROD.LArRODFlags import larRODFlags
+from LArDigitization.LArDigitizationFlags import jobproperties
+
+larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(False) # no pileup optimisation for OFC
+larRODFlags.firstSample.set_Value_and_Lock(0)  # default
+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
+jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)   # use high gain in Fcal in nopileup case
+
+# check if Beam flag is set properly
+if jobproperties.Beam.numberOfCollisions() != 0:
+   from AthenaCommon.Logging import logging
+   mlog = logging.getLogger ('SetLArConfigRun1')
+   mlog.error("Beam.numberOfCollisions %f different from what is expected for Run1 no pileup digi/reco ", jobproperties.Beam.numberOfCollisions) 
+

LArCalorimeter/LArConfiguration/share/LArConfigRun2Old.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from LArROD.LArRODFlags import larRODFlags
+from LArDigitization.LArDigitizationFlags import jobproperties
+
+larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True) # default
+larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True) # default
+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
+jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
+
+# check if Beam flag is set properly
+if jobproperties.Beam.numberOfCollisions() != 20:
+   from AthenaCommon.Logging import logging
+   mlog = logging.getLogger ('SetLArConfigRun2')
+   mlog.error("Beam.numberOfCollisions %f different from what is expected for Run2 digi/reco ", jobproperties.Beam.numberOfCollisions) 

LArCalorimeter/LArConfiguration/share/LArConfigRun2Old_NoCheck.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from LArROD.LArRODFlags import larRODFlags
+from LArDigitization.LArDigitizationFlags import jobproperties
+
+larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True) # default
+larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True) # default
+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
+jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(False)    # default
+

LArCalorimeter/LArConfiguration/share/LArConfigRun2Old_NoPileup.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from LArROD.LArRODFlags import larRODFlags
+from LArDigitization.LArDigitizationFlags import jobproperties
+
+larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(False) # no pileup optimisation for OFC
+larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(False) 
+larRODFlags.firstSample.set_Value_and_Lock(0)  # default
+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
+jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(True)    # use high gain in Fcal in nopileup case
+
+# check if Beam flag is set properly
+if jobproperties.Beam.numberOfCollisions() != 0:
+   from AthenaCommon.Logging import logging
+   mlog = logging.getLogger ('SetLArConfigRun2')
+   mlog.error("Beam.numberOfCollisions %f different from what is expected for Run2 no pileup digi/reco ", jobproperties.Beam.numberOfCollisions) 

Tools/Campaigns/CMakeLists.txt

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name:
+atlas_subdir( Campaigns )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )

Tools/Campaigns/share/MC16NoPileUp.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.BeamFlags import jobproperties as bf
+bf.Beam.numberOfCollisions.set_Value_and_Lock(0)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old_NoPileup.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/Campaigns/share/MC16a.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+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)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/Campaigns/share/MC16d.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.BeamFlags import jobproperties as bf
+bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/Campaigns/share/MC16e.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.BeamFlags import jobproperties as bf
+bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/Campaigns/share/MC20NoPileUp.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.BeamFlags import jobproperties as bf
+bf.Beam.numberOfCollisions.set_Value_and_Lock(0)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old_NoPileup.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/Campaigns/share/MC20a.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+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)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/Campaigns/share/MC20d.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.BeamFlags import jobproperties as bf
+bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/Campaigns/share/MC20e.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.BeamFlags import jobproperties as bf
+bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
+
+from AthenaCommon.Resilience import protectedInclude
+protectedInclude('LArConfiguration/LArConfigRun2Old.py')
+
+protectedInclude('PyJobTransforms/HepMcParticleLinkVerbosity.py')

Tools/PyJobTransforms/share/HepMcParticleLinkVerbosity.py

+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon import CfgMgr
+CfgMgr.MessageSvc().setError += ["HepMcParticleLink"]