Merge branch 'master-AODFix-harmonization' into 'master'

add some missing updates to AODFix from 21.2; should have no effect

See merge request atlas/athena!10009

Former-commit-id: 01d968cd

Reconstruction/AODFix/python/AODFix.py

@@ -113,6 +113,8 @@ def AODFix_Init():
         logAODFix.info(" Input file is DATA")
     logAODFix.info(" Input file produced with Athena version <%s>." % prevRelease)
     logAODFix.info(" AODFix version <%s> was previously applied." % prevAODFix)
+    if rec.doApplyAODFix.is_locked():
+        logAODFix.info(" AODFix is forced to run!")
 
     ##################
     # determine which AODFix to run (if actually running--to be determined later)

Reconstruction/AODFix/python/AODFix_base.py

@@ -49,7 +49,7 @@ class AODFix_base(object):
             # the AODFix is empty: do nothing
             self.doAODFix = False
         elif not force:
-            if prevVersion == self.latestAODFixVersion():
+            if prevVersion == self.newAODFix:
                 self.doAODFix = False
             else:
                 self.doAODFix = True
@@ -73,7 +73,15 @@ class AODFix_base(object):
             elif rec.readAOD():
                 suffix="_AOD"
 
-            str = "AODFix_" + self.newAODFix + suffix
+            # remove any metadata we don't want to write out (in order to rerun again)
+            metadataList = self.newAODFix.split("-")
+            excludeFromMetadata = self.excludeFromMetadata()
+
+            for excl in excludeFromMetadata:
+                if excl in metadataList:
+                    metadataList.remove(excl)
+
+            str = "AODFix_" + "-".join(metadataList) + suffix
 
             logAODFix.info("executing addMetaData, will add as AODFixVersion %s" % str)
             from AthenaCommon.AppMgr import ServiceMgr as svcMgr