Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5156)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5157)
@@ -20,6 +20,39 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/10/01: Thomas Bretz
+
+   * mcalib/MCalibrationChargeCalc.cc, 
+     mcalib/MCalibrationRelTimeCalc.cc,
+     mhcalib/MHCalibrationChargeCam.cc.
+     mhcalib/MHCalibrationRelTimeCam.cc:
+     - changed some output to fit into a standard 80-col
+       console
+
+   * mhist/MHCamEvent.[h,cc]:
+     - added the option to count 'above threshold'
+       (former MHTrigger)
+
+   * mhist/MHCamEventRot.[h,cc]:
+     - added the option to count 'above threshold'
+
+   * mhist/MHCamera.[h,cc]:
+     - fixed filling of thresholded events (CntCamContent)
+       such that it takes the 'used'flag into account
+
+   * mjobs/MJStar.cc:
+     - added plots showing how often a pixel survived image 
+       cleaning and the corresponding derotated 2D plot
+
+   * mjobs/MJCalibrateSignal.cc:
+     - display in all plots in which we expect a stable value
+       the variance instead of the rms
+
+   * mjobs/MJob.cc:
+     - fixed a typo in an output
+
+
+
  2004/09/30: Hendrik Bartko, Markus Gaug
-  
+
    * msignal/MExtractFixedWindowSpline.cc
      - corrected a small bug for the case that the high-gain extraction 
@@ -29,8 +62,11 @@
      - use MPedCalcFromLoGain if IsUseData() is set
 
+
+
  2004/09/29: Hendrik Bartko, Diego Tescaro, Markus Gaug
 
    * msignal/MExtractTimeAndChargeDigitalFilter.[h,cc]
      - Hendriks digital filter finally implemented
+
    * msignal/cosmics_weights.root msignal/calibration_weights_UV.root
      - needed weights for the digital filter
@@ -38,5 +74,6 @@
    * msignal/Makefile
    * msignal/SignalLinkDef.h
-     - added MExtractTimeAndChargeDigitalFilter and  MExtractTimeAndCharge
+     - added MExtractTimeAndChargeDigitalFilter and 
+       MExtractTimeAndCharge
 
    * msignal/MExtractTime.h
@@ -46,4 +83,5 @@
      - added variable abflag in function FindTimeAndChargeHiGain and 
        FindTimeAndChargeLoGain
+
 
 
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 5156)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 5157)
@@ -293,9 +293,7 @@
     MPedCalcFromLoGain     pedlo;
     MMcPedestalCopy        pcopy;
-    //MExtractSlidingWindow  extsignal;
     MTaskEnv taskenv1("ExtractSignal");
+    MTaskEnv taskenv2("ExtractTime");
     taskenv1.SetDefault(extractor1);
-    //MExtractTimeFastSpline exttime;
-    MTaskEnv taskenv2("ExtractTime");
     taskenv2.SetDefault(extractor2);
     MCalibrateData         calib;
@@ -313,4 +311,8 @@
     MHCamEvent evt5(2, "Unsuitable",  "Unsuitable event ratio;;%");
     MHCamEvent evt6(0, "Times",       "Arrival Time;;T [slice]");
+    evt0.EnableVariance();
+    evt2.EnableVariance();
+    evt3.EnableVariance();
+    evt6.EnableVariance();
 
     MFillH fill0(&evt0, "MPedestalCam",        "FillPedestalFLG");
Index: /trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 5156)
+++ /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 5157)
@@ -46,4 +46,5 @@
 #include "MHVsTime.h"
 #include "MHCamEvent.h"
+#include "MHCamEventRot.h"
 #include "MBinning.h"
 
@@ -59,6 +60,6 @@
 #include "MWriteRootFile.h"
 
+#include "MObservatory.h"
 #include "MPointingPosCalc.h"
-//#include "MSrcPosFromModel.h"
 
 ClassImp(MJStar);
@@ -143,4 +144,7 @@
     MParList plist;
     plist.AddToList(this); // take care of fDisplay!
+
+    MObservatory obs;
+    plist.AddToList(&obs);
 
     // Setup Tasklist
@@ -184,6 +188,10 @@
 
     // ------------------ Setup histograms and fill tasks ----------------
-    MHCamEvent evt0("Cleaned", "Signal after Cleaning;;S [\\gamma]");
-    evt0.SetType(0);
+    MHCamEvent evt0a(0, "Cleaned", "Signal after Cleaning;;S [\\gamma]");
+    MHCamEvent evt0b(0, "UsedPix", "Pixels marked Used;;Marked Used [%]");
+    evt0b.SetThreshold(0);
+
+    //MHCamEventRot evt0r("UsedRot", "Pixels marked Used (derotated)");
+    //evt0r.SetThreshold(0);
 
     MH3 h1("MEventRate.fRate");
@@ -209,5 +217,7 @@
     MFillH fillvs(&hvs,           "MTime",        "FillEventRate10s");
 
-    MFillH fill0(&evt0,           "MCerPhotEvt",  "FillCerPhotEvt");
+    MFillH fill0a(&evt0a,         "MCerPhotEvt",  "FillCerPhotEvt");
+    MFillH fill0b(&evt0b,         "MCerPhotEvt",  "FillCntUsedPixels");
+    //MFillH fill0r(&evt0r,         "MCerPhotEvt",  "FillCntUsedRotated");
     MFillH fill1("MHHillas",      "MHillas",      "FillHillas");
     MFillH fill2("MHHillasExt",   "",             "FillHillasExt");
@@ -222,4 +232,5 @@
     //MFillH fill9("MHCerPhot");
 
+    //fill0r.SetDrawOption("colz");
     fill8.SetNameTab("EvtRate");
     fill9.SetNameTab("EffOnTime");
@@ -281,5 +292,7 @@
     //tlist2.AddToList(&fillb);
     tlist2.AddToList(&clean);
-    tlist2.AddToList(&fill0);
+    tlist2.AddToList(&fill0a);
+    tlist2.AddToList(&fill0b);
+    tlist2.AddToList(&fill0r);
     tlist2.AddToList(&hcalc);
     tlist2.AddToList(&fill1);