Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8279)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8280)
@@ -35,4 +35,7 @@
      - added a new bit to allow the error to be switched between 
        mean and spread
+
+   * mjobs/MJStar.cc, mjobs/MJCalibrateSignal.cc:
+     - adapted to changes in error display
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 8279)
+++ trunk/MagicSoft/Mars/NEWS	(revision 8280)
@@ -12,4 +12,7 @@
      weekly, monthly and yearly averages. 
      For more details see the plotall function of the macro
+
+   - general: fixed the error display of the camera display. It showed
+     wrong results.
 
    - callisto: Redone the signal extraction this includes:
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8279)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8280)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.96 2007-01-30 14:16:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.97 2007-01-30 14:20:47 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1352,5 +1352,5 @@
     const Double_t val = fArray[bin]        / n;
 
-    const Double_t spread = sqr>val*val ? TMath::Sqrt(sqr - val*val);
+    const Double_t spread = sqr>val*val ? TMath::Sqrt(sqr - val*val) : 0;
 
     return TestBit(kErrorMean) ? spread/TMath::Sqrt(n) : spread;
Index: trunk/MagicSoft/Mars/mhist/MHCamera.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.h	(revision 8279)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.h	(revision 8280)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.60 2006-10-17 17:16:00 tbretz Exp $
+!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.61 2007-01-30 14:16:45 tbretz Exp $
 \* ======================================================================== */
 #ifndef MARS_MHCamera
@@ -44,5 +44,6 @@
         kNoLegend           = BIT(20),
         kNoScale            = BIT(21),
-        kNoUnused           = BIT(22)/*,
+        kNoUnused           = BIT(22),
+        kErrorMean          = BIT(23)/*,
         kSqrtVariance       = BIT(21),
         kSinglePixelProfile = BIT(22)*/
@@ -231,4 +232,7 @@
     Bool_t   IsFreezed() const { return TestBit(kFreezed); }
     //void  SetOptStat(Int_t os=-1) { fOptStat = os; } // *MENU*
+
+    void     SetErrorSpread(Bool_t f=kTRUE) { f ? ResetBit(kErrorMean) : SetBit(kErrorMean); } // *TOGGLE* *GETTER=IsErrorSpread
+    Bool_t   IsErrorSpread() const { return !TestBit(kErrorMean); }
 
     void     SetAbberation(Float_t f=0.0713) { fAbberation=f; } // *MENU*
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 8279)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 8280)
@@ -591,4 +591,7 @@
     MHCamEvent evtR(  4, "HiLoCal",    "Hi-/Lo-Gain ratio;;Ratio");
     MHCamEvent evtO(  7, "HiLoOff",    "Lo-/Hi-Gain Offset;;Offset");
+    evt2.SetErrorSpread(kFALSE);
+    evt5.SetErrorSpread(kFALSE);
+    evt6.SetErrorSpread(kFALSE);
     evt6.SetThreshold();
 
Index: trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 8279)
+++ trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 8280)
@@ -210,4 +210,6 @@
     MHCamEvent evt0a(0, "Cleaned", "Signal after Cleaning;;S [\\gamma]");
     MHCamEvent evt0b(0, "UsedPix", "Fraction of Events in which Pixels are used;;Fraction");
+    evt0a.SetErrorSpread(kFALSE);
+    evt0b.SetErrorSpread(kFALSE);
     evt0b.SetThreshold(0);