Changeset 5143 for trunk/MagicSoft/Mars/mhflux

Timestamp:

09/28/04 12:25:50 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHEffectiveOnTime.cc (modified) (11 diffs)
• MHFalseSource.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc

@@ -304 +304 @@
     // within the range (yq[0], yq[1]) there must be no empty bin;
     // choose pedestrian approach as long as GetQuantiles is not available
-    Double_t xq[2] = { 0.05, 0.95 };
+    Double_t xq[2] = { 0.6, 0.99 };
     Double_t yq[2];
     h->GetQuantiles(2, yq, xq);
@@ -321 +321 @@
     //func.SetParNames("lambda", "N0", "del");
 
-    func.SetParameter(0, 100);       // Hz
+    func.SetParameter(0, 200);       // Hz
     func.SetParameter(1, Nm);
     func.FixParameter(2, Nmdel/Nm);
@@ -335 +335 @@
 
     // was fit successful ?
-    const Bool_t ok = NDF>0 && chi2<2.5*NDF;
+    const Bool_t ok = NDF>0 && chi2<3*NDF;
 
     if (paint)
@@ -343 +343 @@
         func.Paint("same");
     }
-
-    if (!ok)
-        return kFALSE;
 
     const Double_t lambda = func.GetParameter(0);
@@ -385 +382 @@
     res[5] = NDF;
 
+    // Chi2
+    res[6] = chi2;
+
     // Rdead (from fit) is the fraction from real time lost by the dead time
     //fHRdead.SetBinContent(i, Rdead);
     //fHRdead.SetBinError  (i,dRdead);
 
-    return kTRUE;
+    return ok;
 }
 
@@ -415 +415 @@
         h = fH2DeltaT.ProjectionX(name, i, i, "E");
 
-        Double_t res[6];
+        Double_t res[7];
         if (!FitH(h, res))
             continue;
@@ -457 +457 @@
     // Fit histogram
     //
-    Double_t res[6];
+    Double_t res[7];
     if (!FitH(&fH1DeltaT, res))
         return;
@@ -551 +551 @@
 
     //
-    // If we reached the event number limit for the time-bins fit the histogram
-    //
-    if (fH1DeltaT.GetEntries()>=fNumEvents)
+    // If we reached the event number limit for the time-bins fit the
+    // histogram - if it fails try again when 1.6% more events available
+    //
+    const Int_t n = (Int_t)fH1DeltaT.GetEntries();
+    if (n>=fNumEvents && n%(fNumEvents/60)==0)
         FitTimeBin();
 
@@ -592 +594 @@
 void MHEffectiveOnTime::PaintText(Double_t *res) const
 {
-    TLatex text(0.25, 0.94, Form("T_{eff}=%.1fs\\pm%.1fs  \\labda=%.1f\\pm%.1f  p=%.1f%%  NDF=%d",
-                                 res[0], res[1], res[3], res[4], res[2], res[5]));
+    TLatex text(0.27, 0.94, Form("T_{eff}=%.1fs\\pm%.1fs  \\lambda=%.1f\\pm%.1fHz  p=%.1f%%  \\chi^{2}/%d=%.1f",
+                                 res[0], res[1], res[3], res[4], res[2], (int)res[5], res[6]/res[5]));
     text.SetBit(TLatex::kTextNDC);
     text.SetTextSize(0.04);
@@ -613 +615 @@
         return;
 
-    TLatex text(0.45, 0.94, Form("\\bar{p} = %.1f%%  (n=%d)", sum/n, n));
+    TLatex text(0.47, 0.94, Form("\\bar{p} = %.1f%%", sum/n));
     text.SetBit(TLatex::kTextNDC);
     text.SetTextSize(0.04);
@@ -692 +694 @@
         if ((h = (TH1D*)gPad->FindObject(fNameProjDeltaT)))
         {
-            Double_t res[6];
+            Double_t res[7];
             FitH(h, res, kTRUE);
             PaintText(res);

trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc

@@ -290 +290 @@
     // for the current pointing position and add a offset in the
     // Fill function!
-    fRa  = fPointPos->GetRa();
-    fDec = fPointPos->GetDec();
+    fRa  = fPointPos ? fPointPos->GetRa()  :  0;
+    fDec = fPointPos ? fPointPos->GetDec() : 90;
 
     return kTRUE;
@@ -592 +592 @@
     stars->ReadBSC("bsc5.dat");
 
-    *fLog << err << "FIXME - The catalog will never be deleted, because this crashes!" << endl;
-
-//    stars->SetBit(kCanDelete);
-
+    stars->SetBit(kCanDelete);
     return stars;
 }
@@ -612 +609 @@
     pad->Divide(1, 2, 0, 0.03);
 
-    *fLog << err << "FIXME - Plotting the catalog is broken!" << endl;
-
     TObject *catalog = GetCatalog();
 
     // Initialize upper part
     pad->cd(1);
+    // Make sure that the catalog is deleted only once
+    gROOT->GetListOfCleanups()->Add(gPad);
     gPad->SetBorderMode(0);
     gPad->Divide(3, 1);
@@ -662 +659 @@
     // Initialize lower part
     pad->cd(2);
+    // Make sure that the catalog is deleted only once
+    gROOT->GetListOfCleanups()->Add(gPad);
     gPad->SetBorderMode(0);
     gPad->Divide(3, 1);
@@ -673 +672 @@
     h1->SetXTitle(fHist.GetZaxis()->GetTitle());
     h1->SetYTitle("Counts");
-    h1->Draw(opt);
+    h1->Draw();
     h1->SetBit(kCanDelete);
 
@@ -942 +941 @@
 
 
-    TF2 f2d("Gaus-2D", FcnGauss2d, -1.5, 1.5, -1.5, 1.5, 6);
+    const Double_t maxr = 0.9*TMath::Abs(fHist.GetBinCenter(1));
+    TF2 f2d("Gaus-2D", FcnGauss2d, -maxr, maxr, -maxr, maxr, 6);
     f2d.SetLineWidth(1);
     f2d.SetParName(0, "Max   sigma");
@@ -950 +950 @@
     f2d.SetParName(4, "Sigma_2 deg");
     f2d.SetParName(5, "Phi     deg");
-    f2d.SetParLimits(1, -1, 1);    // mu_1
-    f2d.SetParLimits(3, -1, 1);    // mu_2
-    f2d.SetParLimits(2, 0, 1);     // sigma_1
-    f2d.SetParLimits(4, 0, 1);     // sigma_2
-    f2d.SetParLimits(5, 0, 90);    // phi
-    f2d.SetParameter(0, maxs);     // A
-    f2d.SetParameter(1, 0);        // mu_1
-    f2d.SetParameter(2, 0.5);      // sigma_1
-    f2d.SetParameter(3, 0);        // mu_2
-    f2d.SetParameter(4, 0.5);      // sigma_2
-    f2d.SetParameter(5, 0);        // phi
-    hist->Fit(&f2d, "NI0");
+    f2d.SetParLimits(1, -maxr/2, maxr/2); // mu_1
+    f2d.SetParLimits(3, -maxr/2, maxr/2); // mu_2
+    f2d.SetParLimits(2, 0, maxr);         // sigma_1
+    f2d.SetParLimits(4, 0, maxr);         // sigma_2
+    f2d.SetParLimits(5, 0, 45);           // phi
+    f2d.SetParameter(0, maxs);            // A
+    f2d.SetParameter(1, hist->GetXaxis()->GetBinCenter(maxx)); // mu_1
+    f2d.SetParameter(2, 0.1);             // sigma_1
+    f2d.SetParameter(3, hist->GetYaxis()->GetBinCenter(maxy)); // mu_2
+    f2d.SetParameter(4, 0.1);             // sigma_2
+    f2d.FixParameter(5, 0);               // phi
+    hist->Fit(&f2d, "NI0R");
     f2d.DrawCopy("cont2same");