Changeset 9571 for trunk

Timestamp:

04/19/10 13:11:19 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MStatusArray.cc (modified) (7 diffs)
• mcorsika/MCorsikaEvtHeader.cc (modified) (2 diffs)
• mgeom/MGeom.cc (modified) (1 diff)
• mgeom/MGeom.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/04/19 Thomas Bretz
+
+   * mase/MStatusArray.cc:
+     - added a workaround to prevent crashes in case of double
+       deleteion of the fHistogram in TGraphs
+
+   * mcorsika/MCorsikaEvtHeader.cc:
+     - replaced special characters by UTF8 characters
+
+   * mgeom/MGeom.[h,cc]:
+     - implemented function to return the distance squared
+
+
 
  2010/04/13 Daniela Dorner

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -49 +49 @@
 #include <TCanvas.h>
 
+#include <TGraph.h>           // For the TGraph workaround
+#include <TPaveText.h>        // For the TPaveText workaround
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -56 +59 @@
 
 ClassImp(MStatusArray);
-
-#include <TGraph.h>
 
 using namespace std;
@@ -77 +78 @@
 // name) recuresively
 //
-#include<TPaveText.h>
 void MStatusArray::RecursiveDelete(TVirtualPad *p, const char id) const
 {
@@ -98 +98 @@
                 continue;
 
+            /*
+            // This is necessary because the histogram can get deleted
+            // but is not treated in TGraph recursive remove. Unfortunately,
+            // we have no possibility to find out whether it was already
+            // deleted. Fortunately these histograms don't contain data
+            // and threfore don't consume memory.
+            TGraph *g = dynamic_cast<TGraph*>(o);
+            if (g)
+                g->SetHistogram(0);
+             */
+
             delete o;
 
@@ -153 +164 @@
         if (dynamic_cast<TGraph*>(o))
         {
+            // FIXME: This should not be called for the TGraph
+            // which is currently getting deleted.
             TGraph *g = static_cast<TGraph*>(o);
             if (g->GetHistogram()==obj)
                 g->SetHistogram(0);
+            else
+                g->GetHistogram()->SetBit(kMustCleanup);
 
             continue;
@@ -175 +190 @@
     TObjArray::RecursiveRemove(obj);
 
+    // FIXME: Maybe we still have to call SetBit(kMustCleanup) ???
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,26,00)
     TObject *o = 0;
 
@@ -180 +197 @@
     while ((o=Next()))
         RecursiveRemove(dynamic_cast<TVirtualPad*>(o), obj);
+#endif
 }
 

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz 11/2008 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: Software Development, 2000-2009
+!   Copyright: Software Development, 2000-2010
 !
 !
@@ -106 +106 @@
 //    *fLog << "Particle ID:               " << MMcEvt::GetParticleName(fParticleID) << endl;
     *fLog << "Energy:                    " << fTotalEnergy << "GeV" << endl;
-    *fLog << "Starting Altitude:         " << fStartAltitude << "g/cm²" << endl;
+    *fLog << "Starting Altitude:         " << fStartAltitude << "g/cm" << UTF8::kSquare << endl;
     *fLog << "Number of 1st Target:      " << fFirstTargetNum << endl,
     *fLog << "Height of 1st Interaction: " << fFirstInteractionHeight/100. << "m" << endl;
     *fLog << "Momentum X/Y/Z (GeV/c):    " << fMomentumX << "/" << fMomentumY << "/" << fMomentumZ << endl;
-    *fLog << "Zenith/Azimuth Angle:      " << fZd*TMath::RadToDeg() << "°/" << fAz*TMath::RadToDeg() << "°" << endl;
+    *fLog << "Zenith/Azimuth Angle:      " << fZd*TMath::RadToDeg() << UTF8::kDeg << "/" << fAz*TMath::RadToDeg() << UTF8::kDeg << endl;
     *fLog << "Impact X/Y:                " << fX/100. << "m/" << fY/100. << "m  (r=" << TMath::Hypot(fX, fY)/100. << "m)" << endl;
     *fLog << "Weighted Num Photons:      " << fWeightedNumPhotons << endl;

trunk/MagicSoft/Mars/mgeom/MGeom.cc

@@ -158 +158 @@
 // ------------------------------------------------------------------------
 //
+// Return distance squared of center to center of pix:
+//  (fX-pix.fX)^2+(fY-pix.fY)^2
+//
+Float_t MGeom::GetDist2(const MGeom &pix) const
+{
+    const Double_t dx = fX-pix.fX;
+    const Double_t dy = fY-pix.fY;
+    return dx*dx + dy*dy;
+}
+
+// ------------------------------------------------------------------------
+//
 // Return angle defined by the center and the center of pix:
 //  atan2(fX-pix.fX,fY-pix.fY)

trunk/MagicSoft/Mars/mgeom/MGeom.h

@@ -87 +87 @@
     Float_t GetDist() const;
     Float_t GetDist(const MGeom &pix) const;
+    Float_t GetDist2(const MGeom &pix) const;
     Float_t GetAngle(const MGeom &pix) const;