Changeset 9572 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/19/10 13:20:08 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -219 +219 @@
     hist.AddHist("(MCorsikaEvtHeader.fAz+MCorsikaRunHeader.fMagneticFieldAz)*TMath::RadToDeg()", "MCorsikaEvtHeader.fZd*TMath::RadToDeg()");
     hist.InitName("SkyOrigin;Az;Zd");
-    hist.InitTitle("Sky Origin;Az [\\deg];Zd [\\deg]");
+    hist.InitTitle("Sky Origin;Az [\\circ];Zd [\\circ]");
     hist.SetDrawOption("colz");
     hist.SetAutoRange();
@@ -225 +225 @@
     hist.AddHist("IncidentAngle.fVal");
     hist.InitName("ViewCone");
-    hist.InitTitle("Incident Angle;\\alpha [\\deg]");
+    hist.InitTitle("Incident Angle;\\alpha [\\circ]");
 }
 
@@ -517 +517 @@
     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 rule4(Form("s/cer([0-9]+)/%s\\/00$1_I_MonteCarlo.root/", Esc(fPathOut).Data()));
     const TString rule3(Form(fmt, Esc(fPathOut).Data()));
 
+    MWriteRootFile write4a( 2, rule4, fOverwrite?"RECREATE":"NEW", "Star file");
+    MWriteRootFile write4b( 2, rule4, fOverwrite?"RECREATE":"NEW", "Star file");
     MWriteRootFile write3a( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
     MWriteRootFile write3b( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
@@ -532 +535 @@
     write3a.SetName("WriteCamData");
     write3b.SetName("WriteCamMC");
+    write4a.SetName("WriteImgData");
+    write4b.SetName("WriteImgMC");
 
     SetupCommonFileStructure(write1a);
     SetupCommonFileStructure(write2a);
     SetupCommonFileStructure(write3a);
-
-    // R: Dedicated file structureedicated events
+    SetupCommonFileStructure(write4a);
+
+    // R: Dedicated file structure
     write1a.AddContainer("MPhotonEvent", "Events");
 
-    // I: Dedicated file structureedicated events
+    // Y: Dedicated file structure
     write2a.AddContainer("MPedPhotFromExtractorRndm", "RunHeaders"); // FIXME: Needed for the signal files to be display in MARS
     write2a.AddContainer("MSignalCam", "Events");
 
-    // D: Dedicated file structureedicated events
+    // D: Dedicated file structure
     write3a.AddContainer("ElectronicNoise", "RunHeaders");
     write3a.AddContainer("MRawEvtData", "Events");
+
+    // I: Dedicated file structure
+    write4a.AddContainer("MHillas",       "Events");
+    write4a.AddContainer("MHillasSrc",    "Events");
+    write4a.AddContainer("MImagePar",     "Events");
+    write4a.AddContainer("MNewImagePar",  "Events");
 
     // Basic MC data
@@ -552 +564 @@
     write2b.AddContainer("MMcEvtBasic", "OriginalMC");
     write3b.AddContainer("MMcEvtBasic", "OriginalMC");
+    write4b.AddContainer("MMcEvtBasic", "OriginalMC");
 
     // -------------------------------------------------------------------
@@ -602 +615 @@
     // Remove isolated pixels
     MImgCleanStd clean(0, 0);
-    clean.SetCleanLvl0(0); // The level above which isolated pixels are kept
+    //clean.SetCleanLvl0(0); // The level above which isolated pixels are kept
     clean.SetCleanRings(0);
     clean.SetMethod(MImgCleanStd::kAbsolute);
@@ -641 +654 @@
         if (!fPathOut.IsNull() && !HasNullOut())
         {
-            tasks.AddToList(&write1b);
+            //tasks.AddToList(&write1b);
             tasks.AddToList(&write2b);
             if (fCamera)
                 tasks.AddToList(&write3b);
+            if (header.IsDataRun())
+                tasks.AddToList(&write4b);
         }
         //    if (header.IsPointRun())
@@ -710 +725 @@
     if (!fPathOut.IsNull() && !HasNullOut())
     {
-        tasks.AddToList(&write1a);
+        //tasks.AddToList(&write1a);
         if (!header.IsPedestalRun())
             tasks.AddToList(&write2a);
@@ -733 +748 @@
         tasks.AddToList(&fillx0a);
         tasks.AddToList(&fillx0c);
-        if (!header.IsCalibrationRun())
-            tasks.AddToList(&clean);
+    }
+    if (header.IsDataRun())
+    {
+        tasks.AddToList(&clean);
         tasks.AddToList(&hcalc);
         tasks.AddToList(&cut);
@@ -742 +759 @@
         tasks.AddToList(&fillx3);
         tasks.AddToList(&fillx4);
+        tasks.AddToList(&write4a);
         //tasks.AddToList(&fillx5);
-    }
-    if (header.IsDataRun())
-    {
+
         tasks.AddToList(&fillh4);
         tasks.AddToList(&fillth);