Fix merged name building

Script/MergedMigratedNew.py

 #!/bin/env python
 
-__version__='$Revision:$'
+__version__='$Revision$'
 # $Source$
 
 from SFOFileNameParser import SFOFileNameParser
@@ -69,13 +69,14 @@ Merged file name is:
     if not success: return False
 
     ### Create the two type of name we expect (neglecting attempt number)
-    notmerged = os.path.basename(castorfile).splitext()[0]
+    notmerged = os.path.splitext(os.path.basename(castorfile))[0]
+    notmerged = notmerged.replace('.daq.','.merge.')
     merged = '.'.join(notmerged.split('.',6)[:-1]+['_SFO-ALL._0001'])
-    
+        
     ### Find all the files with the correct name
     files = [f for f in all_files.split('\n') 
              if f and (notmerged in f or merged in f)]
-        
+
     if not files: return False
 
     ### Take the file with the highest attempt number