Commits

Anonymous committed d58b956

Switch to hybrid merger for Hits files by default; Put some protection into get_mp_root for systems with no LOGNAME

  • Participants
  • Parent commits cd17c99
  • Tags AthenaMP-00-03-32

Comments (0)

Files changed (3)

+2012-02-21  Vakho Tsulaia  <tsulaia@mail.cern.ch>
+
+	* Switch to hybrid merger for Hits files by default
+	* Put some protection into get_mp_root for systems with no LOGNAME
+
 2012-02-16  Vakho Tsulaia  <tsulaia@mail.cern.ch>
 
 	* Stop the job if some merger fails

python/MpMergeUtils.py

     if os.path.exists(output_file):
         os.remove(output_file)
 
-    merger_type="Merging_trf"
+    merger_type="merge_pool"
     
     # check if fast merging required
     #from AthenaMPFlags import jobproperties as jp    
             tmp_root = tempfile.tempdir
     else:
         msg.debug("Using ATHENA_MP_TMPDIR environment variable to set athena-mp dir")
-    return  os.sep.join([tmp_root,"athena-mp-tmp-%s" % os.environ['LOGNAME']])
+    username = "MP"    
+    if os.getenv("LOGNAME") != None :
+        username = os.getenv("LOGNAME")
+    elif os.getenv("USER") != None :
+        username = os.getenv("USER")
+    return  os.sep.join([tmp_root,"athena-mp-tmp-%s" % username])
 
 def hack_copy(srcDir, destDir):
     """ explicitly copy files not captured by IoRegistry"""