Index: trunk/Mars/hawc/star.C
===================================================================
--- trunk/Mars/hawc/star.C	(revision 19746)
+++ trunk/Mars/hawc/star.C	(revision 19747)
@@ -176,5 +176,5 @@
     //MWriteRootFile write5(2, fname, "RECREATE", "Image parameters");
 
-    const TString rule(Form("s/(([0-9]+_)?[0-9.]+)_Y_(.*)([.]root)$/%s\\/$1_I_$3.root/",
+    const TString rule(Form("s/([0-9]+)([._])([0-9]+)(_Y)?([_].*)?[.]root$/%s\\/$1$2$3_I$5.root/",
                             MJob:: Esc(outpath).Data()));