Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 9425)
+++ trunk/MagicSoft/Mars/Changelog	(revision 9426)
@@ -51,4 +51,42 @@
      - extrpolated to 900nm
 
+   * msimcamera/MSimReadout.cc:
+     - small improvement to sanity check to allow having less channels
+       than pixels
+
+   * mreport/MReport.cc:
+     - added once more a fix for a wrong Arehucas version
+
+   * mbase/MSpline3.[h,cc]:
+     - added functions to return the analytical integral
+       of the spline
+
+   * mjobs/MJSimulation.[h,cc]:
+     - replaced the 2D histogram with the impact on ground with
+       a 1D histogram with the impact perpendicular to Alt/Az
+     - Use a MParSline instead of MPulseShape
+     - Use MParSplines as input for MSimAbsorption
+     - increased the number of bins for the threshold histogram
+     - adapted BinningImpact
+     - added another histogram for the event distribution after cleaning
+     - changed the default number of the NSB to fit the new input
+       definition
+     - added histogram for MNewImagePar
+     - added tab "Info2"
+
+   * msim/MSimAbsorption.[h,cc]:
+     - moved the spline code to MParSpline
+     - use MParSpline as new input
+
+   * msimcamera/MSimCalibrationSignal.[h,cc], msimcamera/MSimCamera.[h,cc],
+     msimcamera/MSimGeomCam.[h,cc]:
+     - replaces MPulseShape by MParSpline
+
+   * msimcamera/MSimRandomPhotons.[h,cc]:
+     - scale NSB rates like it is done in Eckart's paper
+     - write rates to an output container
+
+  * ceres.rc:
+    - adapted
 
 
Index: trunk/MagicSoft/Mars/ceres.rc
===================================================================
--- trunk/MagicSoft/Mars/ceres.rc	(revision 9425)
+++ trunk/MagicSoft/Mars/ceres.rc	(revision 9426)
@@ -150,8 +150,7 @@
 # -------------------------------------------------------------------------
 # 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
+#MSimRandomPhotons.FrequencyFixed: 0.004
+# NSB photon rate [ph/m^2/nm/sr/ns]
+#MSimRandomPhotons.FrequencyNSB:   5.8
 
 # FIXME: With a class describing the cones we could give NSB as
@@ -197,4 +196,5 @@
 IntendedPulsePos.Val: 40
 
+PulseShape.Function.Name: exp(-(x/2)^2/2)
 
 # -------------------------------------------------------------------------
@@ -239,3 +239,5 @@
 # -------------------------------------------------------------------------
 #Cut.Inverted: Yes
-#Cut.Condition: MNewImagePar.fNumUsedPixels>4 && MHillas.fSize>30
+#Cut.Condition: MHillas.fSize>10
+
+#MSimTrigger.SimulateElectronics: Off