Changeset 19706 for trunk/Mars

Timestamp:

10/01/19 15:28:17 (5 years ago)

Author:

tbretz

Message:

Improved naming convention.

File:

• trunk/Mars/mjobs/MJSimulation.cc (modified) (1 diff)

trunk/Mars/mjobs/MJSimulation.cc

@@ -817 +817 @@
             fFileOut = fFileOut.Remove(dot);
     }
+
+    const char *regex = fRunNumber<0 ?
+        "s/[cC][eE][rR]([0-9]+)(-[tT][eE][lL]([0-9]+))?/%s\\/00$1.%03d%%s_MonteCarlo$3.root/" :
+        "s/[cC][eE][rR][0-9]+([0-9][0-9][0-9])(-[tT][eE][lL]([0-9]+))?/%s\\/%08d.$1%%s_MonteCarlo$3.root/";
+
     const char *fmt = fFileOut.IsNull() ?
-        Form("s/[cC][eE][rR]([0-9]+)([0-9][0-9][0-9])(-[tT][eE][lL][0-9]+)?/%s\\/%08d.$2%%s_MonteCarlo$1.root/", Esc(fPathOut).Data(), header.GetRunNumber()) :
+        Form(regex, Esc(fPathOut).Data(), header.GetRunNumber()) :
         Form("%s/%s%%s.root", Esc(fPathOut).Data(), Esc(fFileOut).Data());