Changeset 9303 for trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

Timestamp:

02/07/09 20:48:57 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhflux/MHAlpha.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -46 +46 @@
 #include "MHAlpha.h"
 
-#include <TF1.h>
-#include <TGraph.h>
 #include <TStyle.h>
 #include <TLatex.h>
 #include <TCanvas.h>
 #include <TPaveStats.h>
-#include <TStopwatch.h>
 
 #include "MSrcPosCam.h"
@@ -82 +79 @@
 MHAlpha::MHAlpha(const char *name, const char *title)
     : fNameParameter("MHillasSrc"), fParameter(0),
-    fOffData(0), fResult(0), fEnergy(0), fBin(0),
+    fOffData(0), fResult(0), fSigma(0), fEnergy(0), fBin(0),
     fPointPos(0), fTimeEffOn(0), fTime(0), fNumTimeBins(10),
     fHillas(0), fMatrix(0), fSkipHistTime(kFALSE), fSkipHistTheta(kFALSE),
@@ -100 +97 @@
     fHist.SetDirectory(NULL);
     fHist.UseCurrentStyle();
+    fHist.Sumw2();
 
     // Main histogram
@@ -107 +105 @@
     fHistTime.UseCurrentStyle();
     fHistTime.SetDirectory(NULL);
-
+    fHistTime.Sumw2();
 
     fHEnergy.SetName("Excess");
@@ -115 +113 @@
     fHEnergy.SetDirectory(NULL);
     fHEnergy.UseCurrentStyle();
+    fHEnergy.Sumw2();
 
     fHTheta.SetName("ExcessTheta");
@@ -123 +122 @@
     fHTheta.UseCurrentStyle();
     fHTheta.SetMinimum(0);
+    fHTheta.Sumw2();
 
     // effective on time versus time
@@ -1024 +1024 @@
     pave->SetLabel(title);
 
-    char txt[1000];
-    TText *ptxt;
-    sprintf(txt, " ");
-    ptxt = pave->AddText(txt);
+    TText *ptxt = pave->AddText(" ");
     ptxt->SetTextAlign(23);
 
-    //sprintf(txt, "Significance %.1f\\sigma,  off-scale %.2f  (\\omega=%.2f\\circ)",
-    //        fFit.GetSignificance(), fFit.GetScaleFactor(), fFit.GetGausSigma());
-    sprintf(txt, "Significance %.1f\\sigma,  off-scale %.2f",
-            fit.GetSignificance(), fit.GetScaleFactor());
-    ptxt = pave->AddText(txt);
+    ptxt = pave->AddText(MString::Format("Significance %.1f\\sigma,  off-scale %.2f",
+                                         fit.GetSignificance(), fit.GetScaleFactor()));
     ptxt->SetTextAlign(23);
 
-    sprintf(txt, "%.1f excess events,  %.1f background events",
-            fit.GetEventsExcess(), fit.GetEventsBackground());
-    ptxt = pave->AddText(txt);
+    ptxt = pave->AddText(MString::Format("%.1f excess events,  %.1f background events",
+                                         fit.GetEventsExcess(), fit.GetEventsBackground()));
     ptxt->SetTextAlign(23);
     pave->SetBit(kCanDelete);
@@ -1062 +1055 @@
     if (!fSkipHistEnergy)
     {
-        *fLog << inf << "Processing energy bins..." << endl;
+        *fLog << inf3 << "Processing energy bins..." << endl;
         FitEnergyBins();
     }
     if (!fSkipHistTheta)
     {
-        *fLog << inf << "Processing theta bins..." << endl;
+        *fLog << inf3 << "Processing theta bins..." << endl;
         FitThetaBins();
     }
     if (!fSkipHistTime)
     {
-        *fLog << inf << "Processing time bins..." << endl;
+        *fLog << inf3 << "Processing time bins..." << endl;
         UpdateAlphaTime(kTRUE);
         MH::RemoveFirstBin(fHTime);
@@ -1164 +1157 @@
     return gPad->GetPad(1)->DistancetoPrimitive(px,py)==0 ? 0 : 9999;
 }
+
+void MHAlpha::RecursiveRemove(TObject *obj)
+{
+    if (obj==fOffData)
+        fOffData = 0;
+}