Changeset 9351 for trunk

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (6 diffs)
• mraw/MRawRunHeader.cc (modified) (2 diffs)
• msim/MSimAtmosphere.cc (added)
• msim/MSimAtmosphere.h (added)
• msim/Makefile (modified) (1 diff)
• msim/SimLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -53 +53 @@
    * mimage/MHHillas.cc, mimage/MMHillas.Ext.cc, mimage/MHHillasSrc.cc:
      - converted default binning from mm to deg
+
+   * mraw/MRawRunHeader.cc:
+     - print less when values doen't have any meaning
+
+   * msim/MSimAtmosphere.[h,cc]:
+     - added
+
+   * msim/SimLinkDef.h, msim/Makefile:
+     - added MSimAtmosphere
+
+   * mjobs/MJSimulation.cc:
+     - added simulation of atmosphere
+     - clean isolated pixels away before calculating image parameters
+     - don't clean calibration runs
 
 

trunk/MagicSoft/Mars/NEWS

@@ -75 +75 @@
      memory and it was never freed, so the program took this memory
      until the end)
- 
+
+   * Converted the code from MMCS' reflector program to MSimAtmosphere
+     (instead of the tables build in for MAGIC Winter and Summer 
+     atmosphere we use the values written by Corsika fitted to the
+     tabulated atmosphere given as input)
+
+   * For caluclating the displayed image parameters in ceres a basic
+     image cleaning removing isolated pixels is now done.
+
  ;star
 

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);

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -957 +957 @@
     if (fFormatVersion>5)
         *fLog << "Observation: '" << fObservationMode << "'" << endl;
-    *fLog << "Source:      '" << fSourceName << "' " << "  ";
-    *fLog << fSourceEpochChar << dec << fSourceEpochDate << endl;
+    if (fSourceName[0]!=0 || fSourceEpochChar[0]!=0 || fSourceEpochDate!=0)
+    {
+        *fLog << "Source:      '" << fSourceName << "' " << "  ";
+        *fLog << fSourceEpochChar << dec << fSourceEpochDate << endl;
+    }
     if (fRunStart)
         *fLog << "Run Start:    " << fRunStart << endl;
@@ -974 +977 @@
     else
         *fLog << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumBytesPerSample << "B/pix" << endl;
-    *fLog << "Evt Counter:  " << fNumEvents;
-    if (fFormatVersion>8)
-        *fLog << " (read=" << fNumEventsRead << ")";
-    *fLog << endl;
+    if (fNumEvents>0 || fNumEventsRead>0)
+    {
+        *fLog << "Evt Counter:  " << fNumEvents;
+        if (fFormatVersion>8)
+            *fLog << " (read=" << fNumEventsRead << ")";
+        *fLog << endl;
+    }
 
     if (TString(t).Contains("header", TString::kIgnoreCase))

trunk/MagicSoft/Mars/msim/Makefile

@@ -26 +26 @@
            MHPhotonEvent.cc \
            MSimMMCS.cc \
+           MSimAtmosphere.cc \
            MSimAbsorption.cc \
            MSimPointingPos.cc

trunk/MagicSoft/Mars/msim/SimLinkDef.h

@@ -14 +14 @@
 #pragma link C++ class MSimPointingPos+;
 #pragma link C++ class MSimAbsorption+;
+#pragma link C++ class MSimAtmosphere+;
 
 #pragma link C++ class MSimMMCS+;