Changeset 9351 for trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

Timestamp:

02/19/09 17:53:59 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -80 +80 @@
 #include "MSimMMCS.h"
 #include "MSimAbsorption.h"
+#include "MSimAtmosphere.h"
 #include "MSimReflector.h"
 #include "MSimPointingPos.h"
@@ -326 +327 @@
     MSimMMCS simmmcs;
 
+    MSimAtmosphere simatm;
     MSimAbsorption absapd("PhotonDetectionEfficiency");
     MSimAbsorption absmir("MirrorReflectivity");
@@ -511 +513 @@
     // -------------------------------------------------------------------
 
-    // FIXME: Remove isolated pixels
-    MImgCleanStd clean(7, 4.5);
+    // Remove isolated pixels
+    MImgCleanStd clean(0, 0);
+    clean.SetCleanLvl0(0); // The level above which isolated pixels are kept
+    clean.SetCleanRings(0);
     clean.SetMethod(MImgCleanStd::kAbsolute);
 
@@ -551 +555 @@
         //    if (header.IsPointRun())
         //        tasks.AddToList(&stars);
-        //tasks.AddToList(&print);
+        if (1)
+            tasks.AddToList(&simatm); // Here because before fillh1
         tasks.AddToList(&fillh1);
         tasks.AddToList(&fillG);
@@ -558 +563 @@
             tasks.AddToList(&absapd);
             tasks.AddToList(&absmir);
+            if (0)
+                tasks.AddToList(&simatm); // FASTER?
         }
         tasks.AddToList(&reflect);
@@ -628 +635 @@
         tasks.AddToList(&fillx0a);
         tasks.AddToList(&fillx0c);
-        //tasks.AddToList(&clean);
+        if (!header.IsCalibrationRun())
+            tasks.AddToList(&clean);
         tasks.AddToList(&hcalc);
         tasks.AddToList(&fillx0d);