Changeset 7740 for trunk

Timestamp:

05/24/06 17:55:16 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mhflux/MAlphaFitter.cc (modified) (3 diffs)
• mpointing/MPointingDevCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -108 +108 @@
         return kTRUE;
 
+    if (fSignalFunc==kThetaSq)
+    {
+        const Double_t sum = h.Integral(1, 3)/3;
+        const Double_t a   = sum<=1 ? 0 : TMath::Log(sum);
+        const Double_t b   = -1.7;
+
+        // Do a best-guess
+        fFunc->SetParameter(3, a);
+        fFunc->SetParameter(4, b);
+    }
+
     // options : N  do not store the function, do not draw
     //           I  use integral of function in bin rather than value at bin center
@@ -249 +260 @@
     // ------------------------------------
 
-     //const Double_t s = fFunc->Integral(0, fSigInt)/alphaw;
-     fFunc->SetParameter(0, 0);
-     fFunc->SetParameter(2, 1);
-     //const Double_t b = fFunc->Integral(0, fSigInt)/alphaw;
-     //fSignificance = MMath::SignificanceLiMaSigned(s, b);
-
-     // Calculate the fit result and set the corresponding data members
-     FitResult(h);
-
-     return kTRUE;
+    //const Double_t s = fFunc->Integral(0, fSigInt)/alphaw;
+    fFunc->SetParameter(0, 0);
+    fFunc->SetParameter(2, 1);
+    //const Double_t b = fFunc->Integral(0, fSigInt)/alphaw;
+    //fSignificance = MMath::SignificanceLiMaSigned(s, b);
+
+    // Calculate the fit result and set the corresponding data members
+    FitResult(h);
+
+    return kTRUE;
 }
 
@@ -319 +330 @@
     // Assuming that bg and fit2.GetEventsBackground() are rather identical:
     const Double_t sc = er*er / fit.GetEventsBackground();
-
-    return sc;
     /*
      cout << MMath::SignificanceLiMaSigned(hon.Integral(1, bin), fit.GetEventsBackground()/sc, sc) << " ";
      cout << sc << " ";
      cout << fit.fChiSqBg << endl;
-    */
-
-    return kTRUE;
+     */
+    return sc;
 }
 

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -217 +217 @@
         fSkip[0]++;
         fDeviation->SetDevZdAz(0, 0);
+        fDeviation->SetDevXY(0, 0);
         return kTRUE;
     }