Changeset 2010

Timestamp:

04/25/03 09:55:58 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mdatacheck/MGDisplayAdc.cc (modified) (4 diffs)
• mfilter/MFEnergySlope.cc (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (3 diffs)
• mhist/MH.cc (modified) (1 diff)
• mhistmc/MHMcEnergyMigration.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2003/04/25: Thomas Bretz
+
+   * mfilter/MFEnergySlope.cc:
+     - removed obsolete PostProcess
+
+   * mdatacheck/MGDisplayAdc.cc:
+     - fixed a bug which caused nothing to beeing displayed if only
+       the Hi gains where existing (Exists->HasHi)
+
+   * mhist/MH.cc:
+     - small change to GetNewPad
+
+   * mhistmc/MHMcEnergyMigration.h:
+     - fixed the includes
+
+
+
  2003/04/24: Abelardo Moralejo
 
    * macros/rootlogon.C
-     - added  gInterpreter->AddIncludePath(dir+"mhistmc");
+     - added gInterpreter->AddIncludePath(dir+"mhistmc");
+
+
 
  2003/04/24: Thomas Bretz
-    
+
+   * macros/rootlogon.C:
+     - added mimage
+
+   * macros/dohtml.C:
+     - added mhistmc
+     - added mimage
+     - added status.C
+
    * mfilter/MFCT1Supercuts.[h,cc]:
      - removed
-   
+
    * manalysis/MPadSchweizer.[h,cc]:
      - renamed arguments of SetHistograms to Mars style
@@ -22 +49 @@
    * manalysis/MSigmabarParam.h:
      - added const qualifiers to getters
-     
+
    * mfileio/MWriteRootFile.[h,cc]:
      - fixed support for UPDATE
-     
+
    * mfilter/MFEnergySlope.cc:
      - cleaned
@@ -38 +65 @@
    * mimage/MHillasSrc.[h,cc], mimage/MHHillasSrc.[h,cc]:
      - like suggested by Wolfgang: removed Head-Tail
+
+   * mbase/MEvtLoop.cc:
+     - fixed a bug in the progress bar update at the end of the loop
 
 

trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc

@@ -304 +304 @@
 
     for (Int_t i=0; i<nhi; i++)
-        if (fHists->Exists(i))
+        if (fHists->HasHi(i))
             fHistoList->AddEntry(fHists->GetHistHi(i)->GetName(), i+1);
 
@@ -327 +327 @@
     fCanvas->Clear();
 
-    if (!fHists->Exists(selected-1))
+    const Int_t idx = selected-1;
+
+    if (!fHists->HasHi(idx))
         return;
 
-    const Int_t type = fHists->HasLo(selected-1) ? fHistoType : M_RADIO_HI;
+    const Int_t type = fHists->HasLo(idx) ? fHistoType : M_RADIO_HI;
 
     switch (type)
@@ -340 +342 @@
         fCanvas->cd();
         if (type==M_RADIO_HI)
-            fHists->DrawHi(selected-1);
+            fHists->DrawHi(idx);
         else
-            fHists->DrawLo(selected-1);
+            fHists->DrawLo(idx);
         break;
 
@@ -349 +351 @@
 
         fCanvas->cd(1);
-        fHists->DrawHi(selected-1);
+        fHists->DrawHi(idx);
 
         fCanvas->cd(2);
-        fHists->DrawLo(selected-1);
+        fHists->DrawLo(idx);
         break;
     }

trunk/MagicSoft/Mars/mfilter/MFEnergySlope.cc

@@ -178 +178 @@
 }
 
-// --------------------------------------------------------------------------
-//
-//  Postprocess all filters.
-//
-Bool_t MFEnergySlope::PostProcess()
-{
-    return kTRUE;
-}

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -486 +486 @@
         max = event.GetNumPhotonsMax(fGeomCam);
 
-        if (max < 1.)
-            max = 1.;
+        if (max==min)
+            max = min +1;
 
         UpdateLegend(min, max);
@@ -531 +531 @@
         max = event.GetMeanMax(fGeomCam);
 
-        if (max < 20.)
-            max = 20.;
+        if (max==min)
+            max = min +1;
 
         UpdateLegend(min, max);
@@ -569 +569 @@
         max = event.GetErrorPhotMax(fGeomCam);
 
-        if (max < 20.)
-            max = 20.;
+        if (max==min)
+            max = min +1;
 
         UpdateLegend(min, max);

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -725 +725 @@
     TString str(opt);
 
-    if (!str.Contains("nonew", TString::kIgnoreCase) || !gPad)
+    if (!str.Contains("nonew", TString::kIgnoreCase))
         return NULL;
 

trunk/MagicSoft/Mars/mhistmc/MHMcEnergyMigration.h

@@ -7 +7 @@
 
 #ifndef ROOT_TH3
-#include "TH3.h"
-#endif
-
-#ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH3.h>
 #endif