Set ApproxEventsPerBasket to 1 for FSRs (backport !3871)

GaudiConf/python/GaudiConf/IOHelper.py

@@ -410,9 +410,9 @@ class IOHelper(object):
             ApplicationMgr().ExtSvc += [rootSvc]
 
             fileSvc = Gaudi__RootCnvSvc("FileRecordCnvSvc")
-            #optimization, see Core Soft meeting, indico.cern.ch/conferenceDisplay?confId=207776
-            if hasattr(fileSvc, "BufferSize"):
-                fileSvc.BufferSize = 512
+            # The FSRs are trees with only one entry per branch
+            fileSvc.MinBufferSize = 512
+            fileSvc.ApproxEventsPerBasket = 1
 
             self._doConfFileRecords(fileSvc)
 

Kernel/FSRAlgs/tests/qmtest/fsralgs.qms/mergesmallfiles-genFSR.qmt

@@ -102,10 +102,10 @@ except IndexError:
 if memory == -1:
     causes.append('XMLsummary Memory Maximum missing')
     retstr += '\nXMLsummary Memory Maximum missing\n' + sum.xml()
-if (memory/1024/1024) > 1.3:
+if (memory/1024/1024) > 1.5:
     causes.append('VMem usage too high')
     retstr += ('\n\nVMem usage too high, ' + str(memory/1024/1024) +
-               " GB. Note that anything over 1.3 GB represents a serious problem. Don't just ignore it!")
+               " GB. Note that anything over 1.5 GB represents a serious problem. Don't just ignore it!")
 
 if retstr:
   result[myname] = result.Quote(retstr)

Kernel/FSRAlgs/tests/qmtest/fsralgs.qms/mergesmallfiles.qmt

@@ -101,10 +101,10 @@ except IndexError:
 if memory == -1:
     causes.append('XMLsummary Memory Maximum missing')
     retstr += '\nXMLsummary Memory Maximum missing\n' + sum.xml()
-if (memory/1024/1024) > 1.5:
+if (memory/1024/1024) > 1.7:
     causes.append('VMem usage too high')
     retstr += ('\n\nVMem usage too high, ' + str(memory/1024/1024) +
-               " GB. Note that anything over 1.5 GB represents a serious problem. Don't just ignore it!")
+               " GB. Note that anything over 1.7 GB represents a serious problem. Don't just ignore it!")
 
 if retstr:
   result[myname] = result.Quote(retstr)