Projects/AthDataQuality/version.txt

-21.0.124.1
+21.0.125.1

Projects/AthSimulation/version.txt

-21.0.125
+21.0.126

Projects/Athena/version.txt

-21.0.125
+21.0.126

Tools/PyJobTransforms/python/trfExe.py

@@ -160,7 +160,8 @@ class transformExecutor(object):
         self._eventCount = None
         self._athenaMP = None
         self._dbMonitor = None
-        
+        self._resimevents = None
+
         # Holder for execution information about any merges done by this executor in MP mode
         self._myMerger = []
 
@@ -399,6 +400,10 @@ class transformExecutor(object):
     def eventCount(self):
         return self._eventCount
 
+    @property
+    def reSimEvent(self):
+        return self._resimevents
+
     @property
     def athenaMP(self):
         return self._athenaMP
@@ -1056,7 +1061,7 @@ class athenaExecutor(scriptExecutor):
         # and use it to extract required info and do the summation during log scan.
         if self._logFileName=='log.ReSim' and self.name=='ReSim':
             msg.info('scanning {0} for reporting events passed the filter ISF_SimEventFilter'.format(self._logFileName))
-            reportEventsPassedSimFilter(self._logFileName)
+            self._resimevents = reportEventsPassedSimFilter(self._logFileName)
 
 
     def validate(self):

Tools/PyJobTransforms/python/trfReports.py

@@ -114,7 +114,7 @@ class trfReport(object):
 class trfJobReport(trfReport):
     ## @brief This is the version counter for transform job reports
     #  any changes to the format @b must be reflected by incrementing this
-    _reportVersion = '2.0.9'
+    _reportVersion = '2.1.0'
     _metadataKeyMap = {'AMIConfig': 'AMI', }
     _maxMsgLen = 256
     _truncationMsg = " (truncated)"
@@ -646,6 +646,8 @@ def exeResourceReport(exe, report):
         exeResource['memory'] = exe.memStats
     if exe.eventCount:
         exeResource['nevents'] = exe.eventCount
+    if exe.reSimEvent:
+        exeResource['resimevents'] = exe.reSimEvent
     if exe.athenaMP:
         exeResource['mpworkers'] = exe.athenaMP
         exeResource['cpuTimePerWorker'] = report.roundoff(exe.cpuTime/exe.athenaMP)

Tools/PyJobTransforms/python/trfUtils.py

@@ -1291,17 +1291,19 @@ def reportEventsPassedSimFilter(log):
     except IOError, e:
         msg.warning('Failed to open transform logfile {0}: {1:s}'.format(log, e))
 
+    resimevents = None
     passed_events = 0
     total_events = 0
-    line_matched_counter = 0
     for line, lineCounter in myGen:
         m = regExp.match(line) 
         if m:
-            line_matched_counter += 1
             passed_events += int(m.group('events'))
             total_events += int(m.group('total'))
+            resimevents = passed_events
 
-    if line_matched_counter == 0 :
-        msg.warning("No line matched with the regExp for extracting events passed the ISF_SimEventFilter")
-    else:
+    if resimevents:
         msg.info("Summary of events passed the ISF_SimEventFilter: {0} events of total {1}".format(passed_events, total_events) )
+    else:
+        msg.warning("No line matched with the regExp for extracting events passed the ISF_SimEventFilter")
+
+    return resimevents