Changeset 1353 for trunk/MagicSoft/Mars/mhist

Timestamp:

06/10/02 09:01:08 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MH.h (modified) (1 diff)
• MHHadroness.cc (modified) (3 diffs)
• MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MH.h

@@ -26 +26 @@
 
     static TCanvas *MakeDefCanvas(TString name="", const char *title="",
-                                  const UInt_t w=700, const UInt_t h=500);
+                                  const UInt_t w=580, const UInt_t h=435);
     static TCanvas *MakeDefCanvas(const TObject *obj,
-                                  const UInt_t w=700, const UInt_t h=500);
+                                  const UInt_t w=580, const UInt_t h=435);
 
     static void SetBinning(TH1 *h, const MBinning *binsx);

trunk/MagicSoft/Mars/mhist/MHHadroness.cc

@@ -197 +197 @@
 Bool_t MHHadroness::Finalize()
 {
-    *fLog << inf << "Finished filling hadroness histograms." << endl;
-
     Int_t n = fGhness->GetNbinsX();
 
@@ -268 +266 @@
     *fLog << "Hadroness histograms:" << endl;
     *fLog << "---------------------" << endl;
+    *fLog << "Acc Gammas at  1% Hadron-acc: " << Form("%3.0f", GetGammaAcceptance(0.01)*100) << "%" << endl;
+    *fLog << "Acc Gammas at  2% Hadron-acc: " << Form("%3.0f", GetGammaAcceptance(0.02)*100) << "%" << endl;
+    *fLog << "Acc Gammas at  5% Hadron-acc: " << Form("%3.0f", GetGammaAcceptance(0.05)*100) << "%" << endl;
     *fLog << "Acc Gammas at 10% Hadron-acc: " << Form("%3.0f", GetGammaAcceptance(0.1)*100) << "%" << endl;
     *fLog << "Acc Gammas at 20% Hadron-acc: " << Form("%3.0f", GetGammaAcceptance(0.2)*100) << "%" << endl;
@@ -274 +275 @@
     *fLog << "Acc Gammas at 50% Hadron-acc: " << Form("%3.0f", GetGammaAcceptance(0.5)*100) << "%" << endl;
     const Int_t h = fMinDist->GetMaximumBin();
-    *fLog << "Minimum Distance to (0, 1): " << Form("%.2f", 1-fMinDist->GetMaximum()) << " at H=" << fMinDist->GetBinCenter(h) << endl;
-    *fLog << " Acc Gammas = " << Form("%3.0f", fIntGhness->GetBinContent(h)*100) << "%, ";
+    *fLog << "Minimum Distance to (0, 1): " << Form("%.2f", 1-fMinDist->GetMaximum()) << " @ H=" << fMinDist->GetBinCenter(h) << endl;
+    *fLog << "  Acc Gammas = " << Form("%3.0f", fIntGhness->GetBinContent(h)*100) << "%, ";
     *fLog << "Acc Hadrons = " << Form("%3.0f", fIntPhness->GetBinContent(h)*100) << "%" << endl;
-    *fLog << "Maximum Q-Factor: " << GetQfac()->GetMaximum() << endl;
-
+    const Int_t q = GetQfac()->GetMaximumBin();
+    *fLog << "Maximum Q-Factor: " << GetQfac()->GetMaximum() << " @ H=";
+    *fLog << GetQfac()->GetBinCenter(q) << endl;;
+    *fLog << "  Acc Gammas = " << Form("%3.0f", fIntGhness->GetBinContent(q)*100) << "%, ";
+    *fLog << "Acc Hadrons = " << Form("%3.0f", fIntPhness->GetBinContent(q)*100) << "%" << endl;
     *fLog << endl;
 }

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -39 +39 @@
     const TList *GetRules() const { return fRules; }
 
+    void SetEnergy(MHMatrix *m) { fEnergy = m; }
+
     //void Draw(Option_t *opt=NULL);
     //TObject *DrawClone(Option_t *opt=NULL) const;