Changeset 7841 for trunk

Timestamp:

08/03/06 18:48:57 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• NEWS (modified) (1 diff)
• mhist/MHRate.cc (modified) (2 diffs)
• mhist/MHWeather.cc (modified) (2 diffs)
• mhvstime/MHSectorVsTime.cc (modified) (2 diffs)
• mimage/MHHillas.cc (modified) (4 diffs)
• mimage/MHHillas.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
- 2006/08/03 Markus Meyer
-
-   * datacenter/macros/fillstar.C
-     - update of reference values for muon analysis
-
-
-
  2006/08/03 Thomas Bretz
 
@@ -39 +32 @@
      - fixed a typo in a comment
 
+   * mhist/MHRate.cc, mhist/MHWeather.cc, mhvstime/MHSectorVsTime.cc,
+     mhvstime/MHVsTime.cc:
+     - changed position of SetMinimum and SetMaximum
+
+   * mimage/MHHillas.[h,cc]
+     - made the Center-Histogram in the case only one is displayed 
+       one with palette
+
 
 
@@ -45 +46 @@
    * resources/calibration.rc, calibration_spline.rc
      - update of correction factors
+
+   * datacenter/macros/fillstar.C
+     - update of reference values for muon analysis
 
 

trunk/MagicSoft/Mars/NEWS

@@ -61 +61 @@
      Use FirstBin=1 and NumEvents=120 to fit the effective on time
      from the resulting gamma candidates
+
+   - star: The Center histogram in MHHillas is now by default displayed
+     with the colz draw-option
 
    - ganymed: now pruduces valid error codes if failed

trunk/MagicSoft/Mars/mhist/MHRate.cc

@@ -96 +96 @@
     fRate.SetYTitle("Counts");
 
-    fRateTime.SetMinimum(0);
-
     fRate.SetDirectory(0);
     fRateZd.SetDirectory(0);
@@ -289 +287 @@
 void MHRate::Paint(Option_t *o)
 {
+    // If this is set to early the plot remains empty in root 5.12/00
+    if (fRateTime.GetN()>0)
+        fRateTime.SetMinimum(0);
+
     DrawGraph(fRateTime, "f [Hz]");
     /*

trunk/MagicSoft/Mars/mhist/MHWeather.cc

@@ -96 +96 @@
     InitGraph(fEventRate);
 
-    fHumidity.SetMinimum(0);
-    fHumidity.SetMaximum(100);
-    fTemperature.SetMinimum(-25);
-    fTemperature.SetMaximum(45);
-    fWindSpeed.SetMinimum(0);
-    fSolarRadiation.SetMinimum(0);
-    fEventRate.SetMinimum(0);
-
     fHumidity.SetMarkerColor(kBlue);
     fTemperature.SetMarkerColor(kRed);
@@ -262 +254 @@
 void MHWeather::Paint(Option_t *o)
 {
+    // If this is set to early the plot remains empty in root 5.12/00
+    if (fHumidity.GetN()>0)
+    {
+        fHumidity.SetMinimum(0);
+        fHumidity.SetMaximum(100);
+    }
+    if (fTemperature.GetN()>0)
+    {
+        fTemperature.SetMinimum(-25);
+        fTemperature.SetMaximum(45);
+    }
+    if (fWindSpeed.GetN()>0)
+        fWindSpeed.SetMinimum(0);
+    if (fSolarRadiation.GetN()>0)
+        fSolarRadiation.SetMinimum(0);
+    if (fEventRate.GetN()>0)
+        fEventRate.SetMinimum(0);
+
     DrawGraph(fHumidity,       "H [%]");
     DrawGraph(fSolarRadiation, "R [W/m^{2}]");

trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc

@@ -198 +198 @@
     fGraph->SetMarkerStyle(kFullDotMedium);
 
-    if (fMinimum!=-1111)
-        fGraph->SetMinimum(fMinimum);
-    if (fMaximum!=-1111)
-        fGraph->SetMaximum(fMaximum);
-
     fMin =  FLT_MAX;
     fMax = -FLT_MAX;
@@ -309 +304 @@
     }
 
+    // If this is set to early the plot remains empty in root 5.12/00
+    if (fMinimum!=-1111)
+        fGraph->SetMinimum(fMinimum);
+    if (fMaximum!=-1111)
+        fGraph->SetMaximum(fMaximum);
+
     // This is a workaround if the TGraph has only one point.
     // Otherwise MStatusDisplay::Update hangs.

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -271 +271 @@
 // --------------------------------------------------------------------------
 //
-// Setup a inversed deep blue sea palette for the fCenter histogram.
-//
-void MHHillas::SetColors() const
-{
-    gStyle->SetPalette(51, NULL);
-    Int_t c[50];
-    for (int i=0; i<50; i++)
-        c[49-i] = gStyle->GetColorPalette(i);
-    gStyle->SetPalette(50, c);
-}
-
-// --------------------------------------------------------------------------
-//
 // Creates a new canvas and draws the four histograms into it.
 // Be careful: The histograms belongs to this object and won't get deleted
@@ -344 +331 @@
     fSize->Draw(same?"same":"");
 
-    //if (!same)
-    {
-        pad->cd(4);
-        gPad->SetBorderMode(0);
-        gPad->SetPad(0.51, 0.01, 0.99, 0.65);
-        if (same)
+    pad->cd(4);
+    gPad->SetBorderMode(0);
+    gPad->SetPad(0.51, 0.01, 0.99, 0.65);
+    if (same)
+    {
+        TH2 *h=dynamic_cast<TH2*>(gPad->FindObject("Center"));
+        if (h)
         {
-            /*
-            TH1 *h = dynamic_cast<TH1*>(gPad->FindObject("Center"));
-            if (h)
-            {
-                h->SetDrawOption("");
-                h->SetMarkerColor(kBlack);
-            }*/
-            RemoveFromPad("CenterSame");
-            fCenter->SetMarkerColor(kGreen);
-            fCenter->Draw("same");
+            h->SetDrawOption("");
+            h->SetMarkerColor(kBlack);
         }
-        else
-        {
-            //SetColors();
-            fCenter->Draw(/*"colz"*/);
-        }
-        if (fGeomCam)
-        {
-            MHCamera *cam = new MHCamera(*fGeomCam);
-            cam->Draw("same");
-            cam->SetBit(kCanDelete);
-        }
+
+        RemoveFromPad("CenterSame");
+        fCenter->SetMarkerColor(kGreen);
+        fCenter->Draw("same");
+    }
+    else
+        fCenter->Draw("colz");
+
+    if (fGeomCam)
+    {
+        MHCamera *cam = new MHCamera(*fGeomCam);
+        cam->Draw("same");
+        cam->SetBit(kCanDelete);
     }
 
@@ -383 +365 @@
     if (gPad && !same)
         delete gPad;
-
-    //pad->Modified();
-    //pad->Update();
 }
 
@@ -408 +387 @@
 void MHHillas::Paint(Option_t *opt)
 {
-    SetColors();
+    MH::SetPalette("pretty");
     MH::Paint();
 }

trunk/MagicSoft/Mars/mimage/MHHillas.h

@@ -23 +23 @@
     TH1F *fSize;    //-> Sum of used pixels
     TH2F *fCenter;  //-> Center
-
-    void SetColors() const;
 
     MGeomCam *fGeomCam; //! Camera geometry for plots (for the moment this is a feature for a loop only!)