Changeset 9461 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/20/09 10:04:26 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJSimulation.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -360 +360 @@
         read.AddFiles(iter);
 
+    MContinue precut("", "PreCut");
+    precut.IsInverted();
+    precut.SetAllowEmpty();
+
     MSimMMCS simmmcs;
 
@@ -495 +499 @@
     // -------------------------------------------------------------------
 
+    const char *fmt = Form("s/cer([0-9]+)/%%s\\/00$1_%c_MonteCarlo.root/", header.GetRunTypeChar());
+
     // FIXME: Pedestal and Calibration runs should get P and C
     const TString rule1(Form("s/cer([0-9]+)/%s\\/00$1_R_MonteCarlo.root/", Esc(fPathOut).Data()));
     const TString rule2(Form("s/cer([0-9]+)/%s\\/00$1_Y_MonteCarlo.root/", Esc(fPathOut).Data()));
-    const TString rule3(Form("s/cer([0-9]+)/%s\\/00$1_D_MonteCarlo.root/", Esc(fPathOut).Data()));
+    const TString rule3(Form(fmt, Esc(fPathOut).Data()));
 
     MWriteRootFile write3a( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
@@ -614 +620 @@
     {
         tasks.AddToList(&read);
+        tasks.AddToList(&precut);
         tasks.AddToList(&pointing);
         tasks.AddToList(&simmmcs);