Changeset 9576 for trunk/MagicSoft/Mars/mhflux

Timestamp:

04/22/10 11:43:42 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MAlphaFitter.cc (modified) (1 diff)
• MHAlpha.cc (modified) (1 diff)
• MHPhi.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -208 +208 @@
     //           Q  quiet mode
     //           E  Perform better Errors estimation using Minos technique
-    h.Fit(fFunc, "NQI", "", fBgMin, fBgMax);
+    if (h.Fit(fFunc, "NQI", "", fBgMin, fBgMax))
+        return kFALSE;
+
     fChiSqBg = fFunc->GetChisquare()/fFunc->GetNDF();
 

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -1153 +1153 @@
     if (obj==fOffData)
         fOffData = 0;
-}
+
+    MH::RecursiveRemove(obj);
+}

trunk/MagicSoft/Mars/mhflux/MHPhi.cc

@@ -355 +355 @@
     TVirtualPad *pad4 = gPad->GetPad(4);
 
+    const Double_t i2 = fHInhom.Integral();
+/*
     Double_t sig2 = 0;
     Double_t bg2  = 0;
     Double_t f2   = 1;
+*/
     TH1D *htemp = pad1 ? dynamic_cast<TH1D*>(pad1->FindObject("Template")) : NULL;
     if (htemp)
@@ -373 +376 @@
             fHPhi.Copy(*res);
 
+            const Double_t i0 = res->Integral(fNumBinsSignal+1, 9999);
+            const Double_t i1 = fHInhom.Integral(fNumBinsSignal+1, 9999);
+            const Double_t i3 = htemp->Integral();
+            const Double_t i4 = htemp->Integral(fNumBinsSignal+1, 9999);
+
             // Scale inhomogeneity to match the phi-plot in the off-region
-            sc1 = res->Integral(fNumBinsSignal+1, 9999)/fHInhom.Integral(fNumBinsSignal+1, 9999);
+            sc1 = i1==0 ? 0 : i0/i1;
             // Scale inhomogeneity to match the phi-plot in the off-region
-            sc2 = fHInhom.Integral()/htemp->Integral();
+            sc2 = i3==0 ? 0 : i2/i3;
 
             res->Add(&fHInhom, -sc1);
@@ -383 +391 @@
             res->SetDirectory(0);
 
-            htemp->Scale(res->Integral(fNumBinsSignal+1, 9999)/htemp->Integral(fNumBinsSignal+1, 9999));
-
-            sig2 = res->Integral(1, fNumBinsSignal);
-            bg2  = fHPhi.Integral(fNumBinsSignal+1, 9999);
-            f2   = htemp->Integral(1, fNumBinsSignal)/htemp->Integral(fNumBinsSignal+1, 9999);
+            htemp->Scale(i4==0 ? 0 : i0/i4);
+
+            //sig2 = res->Integral(1, fNumBinsSignal);
+            //bg2  = fHPhi.Integral(fNumBinsSignal+1, 9999);
+            //f2   = htemp->Integral(1, fNumBinsSignal)/i4;
         }
 
@@ -403 +411 @@
     if (htemp)
     {
+        const Double_t integ = htemp->Integral();
+
         fHTemplate.Copy(*htemp);
-        htemp->Scale(fHInhom.Integral()/htemp->Integral());
+        htemp->Scale(integ==0 ? 0 : i2/integ);
         htemp->SetName("Template");
         htemp->SetDirectory(0);