Changeset 5007 for trunk

Timestamp:

09/14/04 17:00:14 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MH.cc (modified) (6 diffs)
• mhcalib/MHGausEvents.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
 
  2004/09/14: Markus Gaug
+
+   * mhcalib/MHGausEvents.cc
+     - some changes in Draw for the case that there is no histogram
 
    * manalysis/MHPedestalPix.[h,cc]

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1181 +1181 @@
     const Int_t size = array.GetSize();
 
+    TH1I *h1=0;
+
+    //check if histogram with identical name exist
+    TObject *h1obj = gROOT->FindObject(name);
+    if (h1obj && h1obj->InheritsFrom("TH1I"))
+    {
+        h1 = (TH1I*)h1obj;
+        h1->Reset();
+    }
+
     Double_t min = size>0 ? array[0] : 0;
     Double_t max = size>0 ? array[0] : 1;
@@ -1193 +1203 @@
     Int_t newbins = 0;
     FindGoodLimits(nbins, newbins, min, max, kFALSE);
-    
-    TH1I *h1 = new TH1I(name, title, nbins, min, max);
-    h1->SetXTitle("");
-    h1->SetYTitle("Counts");
-    h1->SetDirectory(NULL);
+
+    if (!h1)
+    {
+        h1 = new TH1I(name, title, nbins, min, max);
+        h1->SetXTitle("");
+        h1->SetYTitle("Counts");
+        h1->SetDirectory(gROOT);
+    }
 
     // Second loop to fill the histogram
@@ -1217 +1230 @@
     Double_t max = size>0 ? array[0] : 1;
 
+    TH1I *h1=0;
+
+    //check if histogram with identical name exist
+    TObject *h1obj = gROOT->FindObject(name);
+    if (h1obj && h1obj->InheritsFrom("TH1I"))
+    {
+        h1 = (TH1I*)h1obj;
+        h1->Reset();
+    }
+
     // first loop over array to find the min and max
     for (Int_t i=1; i<size;i++)
@@ -1227 +1250 @@
     FindGoodLimits(nbins, newbins, min, max, kFALSE);
 
-    TH1I *h1 = new TH1I(name, title, newbins, min, max);
-    h1->SetXTitle("");
-    h1->SetYTitle("Counts");
-    h1->SetDirectory(NULL);
-
+    if (!h1)
+    {
+      h1 = new TH1I(name, title, newbins, min, max);
+      h1->SetXTitle("");
+      h1->SetYTitle("Counts");
+      h1->SetDirectory(gROOT);
+    }
+    
     // Second loop to fill the histogram
     for (Int_t i=0;i<size;i++)
@@ -1246 +1272 @@
                        const char* name, const char* title)
 {
-    const TArrayF arr(array.GetSize(), array.GetArray());
-    return ProjectArray(arr, nbins, name, title);
+    return ProjectArray(TArrayF(array.GetSize(),array.GetArray()), nbins, name, title);
 }
 
@@ -1256 +1281 @@
 TH1I* MH::ProjectArray(const MArrayD &array, Int_t nbins, const char* name, const char* title)
 {
-    const TArrayD arr(array.GetSize(), array.GetArray());
-    return ProjectArray(arr, nbins, name, title);
+    return ProjectArray(TArrayD(array.GetSize(),array.GetArray()), nbins, name, title);
 }
 

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

@@ -386 +386 @@
   fPowerSpectrum     = fourier.PowerSpectrumDensity(&fEvents);
   fHPowerProbability = ProjectArray(*fPowerSpectrum, fPowerProbabilityBins,
-                                    Form("%s%s","PowerProbability",GetName()),
+                                    Form("%s%s","PowerProb",GetName()),
                                     "Probability of Power occurrance");
   fHPowerProbability->SetXTitle("P(f)");
@@ -521 +521 @@
 
   if (option.Contains("events"))
-    {
-      option.ReplaceAll("events","");
-      win += 1;
-    }
+    win += 1;
   if (option.Contains("fourier"))
-    {
-      option.ReplaceAll("fourier","");
-      win += 2;
-    }
-  
+    win += 2;
+  if (IsEmpty())
+    win--;
+
   pad->SetBorderMode(0);
   pad->Divide(1,win);
-  pad->cd(1);
-
-  if (!IsEmpty() && !IsOnlyOverflow() && !IsOnlyUnderflow())
-    gPad->SetLogy();
+
+  Int_t cwin = 1;
 
   gPad->SetTicks();
 
-  fHGausHist.Draw(option);
-
-  if (fFGausFit)
-    {
-      fFGausFit->SetLineColor(IsGausFitOK() ? kGreen : kRed);
-      fFGausFit->Draw("same");
-    }
-  switch (win)
-    {
-    case 2:
-      pad->cd(2);
+  if (!IsEmpty())
+    {
+      pad->cd(cwin++);
+
+      if (!IsOnlyOverflow() && !IsOnlyUnderflow())
+        gPad->SetLogy();
+
+      fHGausHist.Draw(option);
+      
+      if (fFGausFit)
+        {
+          fFGausFit->SetLineColor(IsGausFitOK() ? kGreen : kRed);
+          fFGausFit->Draw("same");
+        }
+    }
+  
+  if (option.Contains("events"))
+    {
+      pad->cd(cwin++);
       DrawEvents();
-      break;
-    case 3:
-      pad->cd(2);
-      DrawPowerSpectrum(*pad,3);
-      break;
-    case 4:
-      pad->cd(2);
-      DrawEvents();
-      pad->cd(3);
-      DrawPowerSpectrum(*pad,4);
-      break;
+    }
+  if (option.Contains("fourier"))      
+    {
+      pad->cd(cwin++);
+      DrawPowerSpectrum(*pad,cwin);
     }
 }