Changeset 6905

Timestamp:

04/01/05 14:55:54 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbadpixels/MBadPixelsCalc.cc (modified) (1 diff)
• mfbase/MF.cc (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/04/01 Thomas Bretz
+
+   * mbadpixels/MBadPixelsCalc.cc:
+     - switched on bad pixel detection for a pedestal level
+       which is more than 5 times the variance
+
+   * mfbase/MF.cc:
+     - when fixing the "Inverted" bit in ReadEnv don't print a 
+       message on the screen
+
+   * mhflux/MHAlpha.cc:
+     - plot correct errors
+     - do not plot the point if its significance is not greater 1
+
+
 
  2005/03/29 Markus Gaug

trunk/MagicSoft/Mars/NEWS

@@ -25 +25 @@
    - wobble mode can now be switched on from the data-set
 
+   - switched on bad pixel detection for a pedestal level
+     which is more than 5 times the variance
 
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

@@ -88 +88 @@
 //
 MBadPixelsCalc::MBadPixelsCalc(const char *name, const char *title)
-    : fPedestalLevel(3), fPedestalLevelVariance(-1), fNamePedPhotCam("MPedPhotCam")
+    : fPedestalLevel(3), fPedestalLevelVariance(5), fNamePedPhotCam("MPedPhotCam")
 {
     fName  = name  ? name  : gsDefName.Data();

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -547 +547 @@
     // and double-inversion is no inversion
     if (IsEnvDefined(env, prefix, "Inverted", print))
-        if (GetEnvValue(env, prefix, "Inverted", print)==kTRUE)
-            fF->SetInverted(kFALSE);
+        if (GetEnvValue(env, prefix, "Inverted", kFALSE)==kTRUE)
+            SetInverted(kFALSE);
 
     return kTRUE;

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -197 +197 @@
         if (fit.FitEnergy(fHAlpha, fOffData, i))
         {
-            fHEnergy.SetBinContent(i, fit.GetEventsExcess());
-            fHEnergy.SetBinError(i, fit.GetEventsExcess()*0.2);
+            if (fit.GetSignificance()>1)
+            {
+                fHEnergy.SetBinContent(i, fit.GetEventsExcess());
+                fHEnergy.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificance());
+            }
         }
     }
@@ -216 +219 @@
         if (fit.FitTheta(fHAlpha, fOffData, i))
         {
-            fHTheta.SetBinContent(i, fit.GetEventsExcess());
-            fHTheta.SetBinError(i, fit.GetEventsExcess()*0.2);
+            if (fit.GetSignificance()>1)
+            {
+                fHTheta.SetBinContent(i, fit.GetEventsExcess());
+                fHTheta.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificance());
+            }
         }
     }
@@ -425 +431 @@
     //
     fHTime.SetBinContent(n+1, fit.GetEventsExcess());
-    fHTime.SetBinError(n+1, fit.GetEventsExcess()*0.1);
+    fHTime.SetBinError(n+1, fit.GetEventsExcess()/fit.GetSignificance());
 
     *fLog << all << *fTimeEffOn << ": " << fit.GetEventsExcess() << endl;