Changeset 9420 for trunk

Timestamp:

04/01/09 15:29:50 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• ceres.rc (modified) (3 diffs)
• mjobs/MJSimulation.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
- 2009/04/02 Thomas Bretz
+ 2009/04/01 Thomas Bretz
 
    * Makefile.conf.linux:
      - removed accidental '-g'
-
-
-
- 2009/04/01 Thomas Bretz
 
    * Makefile.conf.linux:
      - removed -Wconversion (produces too much output on newer
        compilers)
+
+   * ceres.rc, mjobs/MJSimulation.cc:
+     - added a cut "Cut" after image parameter calculation
+     - updated noise numbers
 
 

trunk/MagicSoft/Mars/NEWS

@@ -13 +13 @@
      canvases) found in the file are drawn. Note that this may result
      in empty tabs.
+
+ ;ceres:
+
+   * The night sky noise is now scaled with the sensitive area and
+     is given in units per square centimeter
+
+   * Added the possibility to add a cut after the image parameter
+     calculation (''Cut'')
 
  ;callisto:
@@ -36 +44 @@
  ;REMARK
 
-   * File produced with this release containing a gamera geometry (which 
-     are basically all files we produce per default) will not be readable
+   * File produced with this release containing a camera geometry (which 
+     are basically all files were produced as default) will not be readable
      by older releases.
 

trunk/MagicSoft/Mars/ceres.rc

@@ -130 +130 @@
 #MSimAPD.NameGeomCam:
 
+
 # -------------------------------------------------------------------------
 # Setup the absorption, conversion efficiency and angular acceptance
@@ -144 +145 @@
 #MSimReflector.DetectorMargin: 0
 
+
+# -------------------------------------------------------------------------
+# Setup the dark counts (FrequencyFixed) and the NSB noise per cm^2
+# -------------------------------------------------------------------------
+# Dark Counts per APD: ~4MHz
+MSimRandomPhotons.FrequencyFixed: 0.004
+# NSB photon rate per cm^2 ~40MHz (folded with the cones' angular
+# acceptance and the wavelength acceptance of the camera (window, apd, etc)
+MSimRandomPhotons.FrequencyNSB:   0.040
+
+# FIXME: With a class describing the cones we could give NSB as
+# per sr and cm^2
 
 # -------------------------------------------------------------------------
@@ -221 +234 @@
 #MImgCleanStd.CleanLevel1:   6.0
 #MImgCleanStd.CleanLevel2:   6.0
+
+# -------------------------------------------------------------------------
+# This is a cut executed after the calculation of the image parameters
+# -------------------------------------------------------------------------
+#Cut.Inverted: Yes
+#Cut.Condition: MNewImagePar.fNumUsedPixels>4 && MHillas.fSize>30

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -499 +499 @@
     // DWARF: 14MHz-25Mhz / APD
 
-
     // FIXME: Simulate photons before cones and QE!
 
     MSimRandomPhotons  simnsb;
-//    simnsb.SetFreq(0.005, 0.004);    // 5MHz/cm^2, 4MHz
-    simnsb.SetFreq(0, 0.04);           // 40MHz fixed for each APD
+    simnsb.SetFreq(0.0015, 0.04);  // 1.5MHz dark count rate, 40MHZ/cm^2 NSB
     simnsb.SetNameGeomCam("GeomCones");
 
@@ -511 +509 @@
 
     MSimAPD simapd;
-    simapd.SetFreq(0.04); // Must be identical to MSimRanodmPhotons!!
+    //simapd.SetFreq(0.04); // Must be identical to MSimRandomPhotons!!
     simapd.SetNameGeomCam("GeomCones");
 
@@ -550 +548 @@
     evt0a.SetErrorSpread(kFALSE);
     evt0c.SetCollectMax();
+
+    MContinue cut("", "Cut");
 
     MFillH fillx0a(&evt0a,             "MSignalCam",      "FillAvgSignal");
@@ -664 +664 @@
             tasks.AddToList(&clean);
         tasks.AddToList(&hcalc);
+        tasks.AddToList(&cut);
         tasks.AddToList(&fillx0d);
         tasks.AddToList(&fillx1);