Changeset 5143 for trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc (modified) (7 diffs)

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");