Changeset 9573 for trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

Timestamp:

04/19/10 13:40:16 (14 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.19 2009-03-01 21:48:14 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.20 2010-04-19 12:40:16 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -84 +84 @@
 
 #include <TF1.h>
-#include <TMinuit.h>
 #include <TPad.h>
 #include <TCanvas.h>
@@ -231 +230 @@
 
         // use only the inner pixles. FIXME: This is geometry dependent
-        if(gpix.GetAidx()>0)
+        if (gpix.GetAidx()>0)
             continue;
 
         fHistWidth.Fill(dist*fGeomCam->GetConvMm2Deg(), pix.GetNumPhotons());
     }
+
     // Setup the function and perform the fit
     TF1 g1("g1", "gaus");//, -fHistTime.GetXmin(), fHistTime.GetXmax());
@@ -253 +253 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
-    fHistTime.Fit(&g1, "QNB");
-
-    Double_t dummy;
-    gMinuit->GetParameter(1, fRelTimeMean,   dummy);  // get the mean  value
-    gMinuit->GetParameter(2, fRelTimeSigma,  dummy);  // get the sigma value
+    if (fHistTime.Fit(&g1, "QNB"))
+        return kTRUE;
+
+    fRelTimeMean  = g1.GetParameter(1);
+    fRelTimeSigma = g1.GetParameter(2);
 
     // The mean arrival time which was subtracted before will
@@ -435 +435 @@
     fHistWidth.Fit(&f1, "QRN");
 
-    chi = f1.GetChisquare()/f1.GetNDF();
-
-    Double_t ferr;
-    gMinuit->GetParameter(2, width, ferr); // get the sigma value
+    if (!gMinuit)
+        return kFALSE;
+
+    chi   = f1.GetChisquare()/f1.GetNDF();
+    width = f1.GetParameter(2);
 
     return kTRUE;