Changeset 4704 for trunk/MagicSoft/Mars/mhist

Timestamp:

08/23/04 13:11:40 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHFalseSource.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mhist/MHFalseSource.cc

@@ -344 +344 @@
 
             // Source dependant hillas parameters
-            if (!hsrc.Calc(hil))
+            if (!hsrc.Calc(*hil))
             {
                 *fLog << warn << "Calculation of MHillasSrc failed for x=" << cx[ix] << " y=" << cy[iy] << endl;
@@ -566 +566 @@
 
     // Create catalog...
-    MAstroCatalog stars;
-    stars.SetLimMag(9);
-    stars.SetGuiActive(kFALSE);
-    stars.SetRadiusFOV(maxr);
-    stars.SetRaDec(fRa*TMath::DegToRad()*15, fDec*TMath::DegToRad());
-    stars.ReadBSC("bsc5.dat");
-
-    TObject *o = (MAstroCatalog*)stars.Clone();
-    o->SetBit(kCanDelete);
-
-    return o;
+    MAstroCatalog *stars = new MAstroCatalog;
+    stars->SetLimMag(9);
+    stars->SetGuiActive(kFALSE);
+    stars->SetRadiusFOV(maxr);
+    stars->SetRaDec(fRa*TMath::DegToRad()*15, fDec*TMath::DegToRad());
+    stars->ReadBSC("bsc5.dat");
+
+    *fLog << err << "FIXME - The catalog will never be deleted, because this crashes!" << endl;
+
+    stars->SetBit(kCanDelete);
+
+    return stars;
 }
 
@@ -591 +592 @@
 
     pad->Divide(1, 2, 0, 0.03);
+
+    *fLog << err << "FIXME - Plotting the catalog is broken!" << endl;
 
     TObject *catalog = GetCatalog();
@@ -610 +613 @@
     h3->Draw("colz");
     h3->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
 
     // PAD #2
@@ -624 +627 @@
     h4->Draw("colz");
     h4->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
 
     // PAD #3
@@ -636 +639 @@
     h2->Draw("colz");
     h2->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
 
     // Initialize lower part
@@ -663 +666 @@
     h5->Draw("colz");
     h5->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
 
     // PAD #6
@@ -674 +677 @@
     h0->Draw("colz");
     h0->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
 }
 
@@ -961 +964 @@
     hists->Draw("colz");
     hists->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
     c->cd(2);
     gPad->SetBorderMode(0);
     hist->Draw("colz");
     hist->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
     c->cd(3);
     gPad->SetBorderMode(0);
     histb->Draw("colz");
     histb->SetBit(kCanDelete);
-    catalog->Draw("mirror same");
+    catalog->Draw("mirror same *");
     c->cd(4);
     gPad->Divide(1,3, 0, 0);