Merge branch '21.2_ProposedConfigPatch' into '21.2'

Updating default treatment of geometry and conditions

See merge request !5475

Former-commit-id: 7dd1b7d8834216142a18c3c970e478eac4094615

Control/AthenaCommon/python/GlobalFlags.py

@@ -58,14 +58,14 @@ class DetDescrVersion(JobProperty):
 #                  'Rome-Initial-v00','Rome-Final','DC1-Initial',\
 #                  'DC1-Final','CTB','Commissioning-Calo','Commissioning-Muon'\
 #                  'ATLAS-DC3-01','ATLAS-DC3-02','Default']   
-    StoredValue='ATLAS-R2-2015-03-01-00'
+    StoredValue='ATLAS-R2-2016-01-00-01'
 
 class ConditionsTag(JobProperty):
      """ See https://twiki.cern.ch/twiki/bin/view/Atlas/CoolProdTags
      """
      statusOn=True
      allowedTypes=['str']
-     StoredValue='OFLCOND-RUN12-SDR-25'
+     StoredValue='OFLCOND-RUN12-SDR-31'
 
 #
 class DatabaseInstance(JobProperty):

Reconstruction/RecExample/RecExCond/share/RecExCommon_GlobalFlags.py

@@ -97,17 +97,7 @@ from AthenaCommon.GlobalFlags import globalflags
 from RecExConfig.RecFlags import rec
 if 'DetDescrVersion' in dir() and rec.oldFlagTopSteering:
    globalflags.DetDescrVersion=DetDescrVersion
-else:
-   if globalflags.DetDescrVersion.isDefault():
-      import os
-      import os.path as osp
-      newfile = '/afs/cern.ch/atlas/project/rig/referencefiles/RTTinputFiles/MC15_13TeV/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6699_10evt.pool.root'
-      if osp.isfile(newfile):
-         # new file exists
-         globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00"
-      else:
-         globalflags.DetDescrVersion="ATLAS-GEO-20-00-01"
-      globalflags.ConditionsTag="OFLCOND-RUN12-SDR-31"
+# Other case is that we have left it the default.  The default is sensible, or should be.  Don't touch it.
 
 # delee DetDescrVersion if required
 if 'DetDescrVersion' in dir():