Index: trunk/MagicSoft/Mars/mjobs/MJSimulation.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJSimulation.cc	(revision 9328)
+++ trunk/MagicSoft/Mars/mjobs/MJSimulation.cc	(revision 9332)
@@ -184,5 +184,5 @@
     hist.SetLog(kTRUE, kTRUE, kFALSE);
 
-    hist.AddHist("MCorsikaEvtHeader.fX/100","MCorsikaEvtHeader.fY/100");
+    hist.AddHist("-MCorsikaEvtHeader.fX/100","-MCorsikaEvtHeader.fY/100");
     hist.SetDrawOption("colz");
     hist.InitName("Impact;Impact;Impact");
@@ -361,14 +361,14 @@
     mhew.SetTitle("Time between first and last photon hitting a detector");
 
-    MFillH fillh1(&mhn1, "", "FillH1");
+    MFillH fillh1(&mhn1, "", "FillCorsika");
     MFillH fillh2(&mhn2, "", "FillH2");
     MFillH fillh3(&mhn3, "", "FillH3");
     MFillH filltp(&mhtp, "", "FillTriggerPos");
     MFillH fillew(&mhew, "", "FillEvtWidth");
-    fillh1.SetNameTab("H1", "Distribution of Muons as simulated");
-    fillh2.SetNameTab("H2", "Distribution of Muons as available after all");
-    fillh3.SetNameTab("H3", "Distribution after trigger");
-    filltp.SetNameTab("TrigPos", "TriggerPosition w.r.t the first photon");
-    fillew.SetNameTab("EvtWidth", "Time between first and last photon hitting a detector");
+    fillh1.SetNameTab("Corsika",    "Distribution as simulated by Corsika");
+    fillh2.SetNameTab("Detectable", "Distribution of events hit the detector");
+    fillh3.SetNameTab("Triggered",  "Distribution of triggered events");
+    filltp.SetNameTab("TrigPos",    "TriggerPosition w.r.t the first photon");
+    fillew.SetNameTab("EvtWidth",   "Time between first and last photon hitting a detector");
 
     MHPhotonEvent planeG(1);     // Get from MaxImpact
@@ -457,4 +457,5 @@
     write3a.AddContainer("MMcRunHeader",        "RunHeaders");
     write3a.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
+    write3a.AddContainer("ElectronicNoise",     "RunHeaders", kFALSE);
     write3a.AddContainer("MMcEvt",              "Events",     kFALSE);
 
@@ -511,4 +512,5 @@
     // -------------------------------------------------------------------
 
+    // FIXME: Remove isolated pixels
     MImgCleanStd clean(7, 4.5);
     clean.SetMethod(MImgCleanStd::kAbsolute);
@@ -613,4 +615,5 @@
     if (fCamera)
     {
+        // FIXME: MHCollectionArea Trigger Area!
         if (header.IsDataRun())
             tasks.AddToList(&fillh3);
Index: trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 9328)
+++ trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 9332)
@@ -300,5 +300,5 @@
     // Effective on-time need its own not to be skipped by (eg) image cleaning
     // Muons needs its own to have a unique SetReadyToSave
-    const TString rule(Form("s/([0-9]+(_M[12])?_[0-9.]+)_Y_(.*[.]root)$/%s\\/$1_I_$3/", Esc(fPathOut).Data()));
+    const TString rule(Form("s/(([0-9]+_)?(M[12]_)?[0-9.]+)_Y_(.*[.]root)$/%s\\/$1_I_$4/", Esc(fPathOut).Data()));
     MWriteRootFile write( 2, rule, fOverwrite?"RECREATE":"NEW", "Image parameters");
     MWriteRootFile writet(2, rule, fOverwrite?"RECREATE":"NEW", "Image parameters"); // EffectiveOnTime
@@ -333,10 +333,10 @@
         // Monte Carlo Data
         write.AddContainer("MMcEvt",                "Events");
-        write.AddContainer("MMcTrig",               "Events");
+        write.AddContainer("MMcTrig",               "Events", kFALSE);
         // Monte Carlo Run Headers
         write.AddContainer("MMcRunHeader",          "RunHeaders");
-        write.AddContainer("MMcTrigHeader",         "RunHeaders");
-        write.AddContainer("MMcFadcHeader",         "RunHeaders");
-        write.AddContainer("MMcConfigRunHeader",    "RunHeaders");
+        write.AddContainer("MMcTrigHeader",         "RunHeaders", kFALSE);
+        write.AddContainer("MMcFadcHeader",         "RunHeaders", kFALSE);
+        write.AddContainer("MMcConfigRunHeader",    "RunHeaders", kFALSE);
         write.AddContainer("MMcCorsikaRunHeader",   "RunHeaders");
     }
@@ -368,5 +368,5 @@
         // Monte Carlo Data
         writem.AddContainer("MMcEvt",               "Muons");
-        writem.AddContainer("MMcTrig",              "Muons");
+        writem.AddContainer("MMcTrig",              "Muons", kFALSE);
     }