Changeset 4991 for trunk/MagicSoft/Mars/mhbase/MH.cc

Timestamp:

09/14/04 12:13:07 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhbase/MH.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1271 +1271 @@
                        const char* name, const char* title)
 {
-    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;
-
-    // first loop over array to find the min and max
-    for (Int_t i=1; i<size;i++)
-    {
-        max = TMath::Max((Double_t)array[i], max);
-        min = TMath::Min((Double_t)array[i], min);
-    }
-
-    Int_t newbins = 0;
-    FindGoodLimits(nbins, newbins, min, max, kFALSE);
-
-    if (!h1)
-    {
-        h1 = new TH1I(name, title, nbins, min, max);
-        h1->SetXTitle("");
-        h1->SetYTitle("Counts");
-        h1->SetDirectory(gROOT);
-    }
-
-    // Second loop to fill the histogram
-    for (Int_t i=0;i<size;i++)
-        h1->Fill(array[i]);
-
-    return h1;
+    const TArrayF arr(array.GetSize(), array.GetArray());
+    return ProjectArray(array, nbins, name, title);
 }
 
@@ -1317 +1281 @@
 TH1I* MH::ProjectArray(const MArrayD &array, Int_t nbins, const char* name, const char* title)
 {
-    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;
-
-    // first loop over array to find the min and max
-    for (Int_t i=1; i<size;i++)
-    {
-        max = TMath::Max(array[i], max);
-        min = TMath::Min(array[i], min);
-    }
-
-    Int_t newbins = 0;
-    FindGoodLimits(nbins, newbins, min, max, kFALSE);
-
-    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++)
-        h1->Fill(array[i]);
-
-    return h1;
-}
-
+    const TArrayD arr(array.GetSize(), array.GetArray());
+    return ProjectArray(array, nbins, name, title);
+}
+
+// --------------------------------------------------------------------------
+//
+// See MTask::PrintSkipped
+//
+void MH::PrintSkipped(UInt_t n, const char *str)
+{
+    *fLog << " " << setw(7) << n << " (";
+    *fLog << setw(3) << (int)(100.*n/GetNumExecutions());
+    *fLog << "%) Evts skipped: " << str << endl;
+}