Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6275)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6276)
@@ -20,4 +20,21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/07 Thomas Bretz
+
+   * mbase/MFilter.cc:
+     - use paranthesis around ClassName in GetRule
+
+   * mdata/MDataFormula.h:
+     - fixed a wrong comment in variable description
+
+   * mhist/MHCamEvent.[h,cc], mhist/MHCamera.[h,cc],
+     mjobs/MJCalibrateSignal.cc, 
+     mjobs/MJCalibrateSignalFromOutside.cc:
+     - to make sure there are no missunderstandings we have to
+       replace all occurances of 'Variance' by 'SqrtVariance'
+       (it was not my decision)
+
+
 
  2005/02/04 Markus Gaug
Index: trunk/MagicSoft/Mars/mbase/MFilter.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MFilter.cc	(revision 6275)
+++ trunk/MagicSoft/Mars/mbase/MFilter.cc	(revision 6276)
@@ -95,5 +95,5 @@
 TString MFilter::GetRule() const
 {
-    return ClassName(); //"<GetRule n/a for " + fName + ">";
+    return Form("(%s)", ClassName()); //"<GetRule n/a for " + fName + ">";
 }
 
Index: trunk/MagicSoft/Mars/mdata/MDataFormula.h
===================================================================
--- trunk/MagicSoft/Mars/mdata/MDataFormula.h	(revision 6275)
+++ trunk/MagicSoft/Mars/mdata/MDataFormula.h	(revision 6276)
@@ -17,5 +17,5 @@
 private:
     TFormula      *fFormula;    // TFormula
-    TOrdCollection fMembers;	// Container for the filters
+    TOrdCollection fMembers;	// List of arguments
 
     TString Parse(const char *rule);
Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 6275)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 6276)
@@ -33,8 +33,8 @@
 // =====
 //
-// To plot the variance instead of the rms use:
-//    MHCamEvent::SetBit(MHCamera::kVariance);
+// To plot sqrt(variance) instead of the rms use:
+//    MHCamEvent::SetBit(MHCamera::kSqrtVariance);
 //  or
-//    MHCamEvent::EnableVariance()
+//    MHCamEvent::EnableSqrtVariance()
 //
 // To count how often a certain pixel is above or below a threshold do:
@@ -127,7 +127,7 @@
 // use this to display the variance instead of the rms.
 //
-void MHCamEvent::EnableVariance(Bool_t b)
-{
-    b ? SetBit(MHCamera::kVariance) : ResetBit(MHCamera::kVariance);
+void MHCamEvent::EnableSqrtVariance(Bool_t b)
+{
+    b ? SetBit(MHCamera::kSqrtVariance) : ResetBit(MHCamera::kSqrtVariance);
 }
 
@@ -173,6 +173,6 @@
         fSum->SetYTitle("a.u.");
     fSum->SetBit(MHCamera::kProfile);
-    if (TestBit(MHCamera::kVariance))
-        fSum->SetBit(MHCamera::kVariance);
+    if (TestBit(MHCamera::kSqrtVariance))
+        fSum->SetBit(MHCamera::kSqrtVariance);
 
     fSum->SetXTitle("Pixel Idx");
@@ -301,5 +301,5 @@
     MHCamera *cam = new MHCamera(*fSum->GetGeometry());
     cam->SetName(Form("%s;err", fName.Data()));
-    cam->SetTitle(fSum->TestBit(MHCamera::kVariance)?"Variance":"Root Mean Squared (rms)");
+    cam->SetTitle(fSum->TestBit(MHCamera::kSqrtVariance)?"Sqrt(Variance)":"Root Mean Squared (rms)");
     cam->SetYTitle(fSum->GetYaxis()->GetTitle());
     cam->SetCamContent(*fSum, 1);
Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.h	(revision 6275)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.h	(revision 6276)
@@ -50,5 +50,5 @@
 
     void SetThreshold(Float_t f, Char_t direction=kIsLowerBound) { fThreshold = f; fUseThreshold=direction; }
-    void EnableVariance(Bool_t b=kTRUE);
+    void EnableSqrtVariance(Bool_t b=kTRUE);
 
     ClassDef(MHCamEvent, 1) // Histogram to sum camera events
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 6275)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 6276)
@@ -329,5 +329,5 @@
 // ------------------------------------------------------------------------
 //
-// Return the variance of all entries which are used if all=kFALSE and
+// Return the sqrt variance of all entries which are used if all=kFALSE and
 // of all entries if all=kTRUE if sector<0. If sector>=0 only
 // entries with match the given sector are taken into account.
@@ -1155,5 +1155,5 @@
 {
     Double_t rc = 0;
-    if (TestBit(kVariance) && GetEntries()>0) // error on the mean
+    if (TestBit(kSqrtVariance) && GetEntries()>0) // error on the mean
     {
         const Double_t error = fSumw2.fArray[bin]/GetEntries();
Index: trunk/MagicSoft/Mars/mhist/MHCamera.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.h	(revision 6275)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.h	(revision 6276)
@@ -40,8 +40,8 @@
 public:
     enum {
-        kProfile  = BIT(18), // FIXME: When changing change max/min!
-        kFreezed  = BIT(19),
-        kNoLegend = BIT(20),
-        kVariance = BIT(21)
+        kProfile      = BIT(18), // FIXME: When changing change max/min!
+        kFreezed      = BIT(19),
+        kNoLegend     = BIT(20),
+        kSqrtVariance = BIT(21)
     };
 private:
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6275)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6276)
@@ -553,12 +553,12 @@
     MHCamEvent evt8(0, "Conv",        "Calibration Conv. Factors;;[phe/fadc cnts]");
 
-    evt0.EnableVariance();
-    evt1.EnableVariance();
-    evt2.EnableVariance();
+    evt0.EnableSqrtVariance();
+    evt1.EnableSqrtVariance();
+    evt2.EnableSqrtVariance();
     // evt3.EnableVariance();
-    evt4.EnableVariance();
-    evt5.EnableVariance();
-    evt7.EnableVariance();
-    evt8.EnableVariance();
+    evt4.EnableSqrtVariance();
+    evt5.EnableSqrtVariance();
+    evt7.EnableSqrtVariance();
+    evt8.EnableSqrtVariance();
 
     MFillH fill0(&evt0, "MPedestalFundamental",   "FillPedFLG");
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignalFromOutside.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignalFromOutside.cc	(revision 6275)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignalFromOutside.cc	(revision 6276)
@@ -346,12 +346,12 @@
     MHCamEvent evt8(0, "HiLoConv",    "Ratio Hi-Lo Gain Signal;;Ratio [1]");
 
-    evt0.EnableVariance();
-    evt1.EnableVariance();
-    evt2.EnableVariance();
-    evt3.EnableVariance();
-    evt4.EnableVariance();
-    evt5.EnableVariance();
-    evt7.EnableVariance();
-    evt8.EnableVariance();
+    evt0.EnableSqrtVariance();
+    evt1.EnableSqrtVariance();
+    evt2.EnableSqrtVariance();
+    evt3.EnableSqrtVariance();
+    evt4.EnableSqrtVariance();
+    evt5.EnableSqrtVariance();
+    evt7.EnableSqrtVariance();
+    evt8.EnableSqrtVariance();
 
     MFillH fill0(&evt0, "MPedestalFundamental",   "FillPedFLG");