Changeset 4700 for trunk/MagicSoft

Timestamp:

08/23/04 09:45:40 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mimage/MHHillas.cc (modified) (6 diffs)
• mimage/MHHillas.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
    * mfileio/MWriteRootFile.[h,cc]:
      - added cd() member function
+
+   * mimage/MHHillas.[h,cc]:
+     - added display of camera on top of MeanXY-plot
 
 

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  2001 <mailto:tbretz@uni-sw.gwdg.de>
-!              Wolfgang Wittek  2002 <mailto:wittek@mppmu.mpg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Author(s): Thomas Bretz  2001 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Wolfgang Wittek  2002 <mailto:wittek@mppmu.mpg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -50 +50 @@
 #include "MBinning.h"
 
+#include "MHCamera.h"
 
 ClassImp(MHHillas);
@@ -60 +61 @@
 //
 MHHillas::MHHillas(const char *name, const char *title)
-    : fMm2Deg(1), fUseMmScale(kTRUE)
+    : fGeomCam(0), fMm2Deg(1), fUseMmScale(kTRUE)
 {
     //
@@ -141 +142 @@
 Bool_t MHHillas::SetupFill(const MParList *plist)
 {
-    const MGeomCam *geom = (MGeomCam*)plist->FindObject("MGeomCam");
-    if (!geom)
+    fGeomCam = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!fGeomCam)
         *fLog << warn << GetDescriptor() << ": No Camera Geometry available. Using mm-scale for histograms." << endl;
     else
     {
-        fMm2Deg = geom->GetConvMm2Deg();
+        fMm2Deg = fGeomCam->GetConvMm2Deg();
         SetMmScale(kFALSE);
     }
@@ -159 +160 @@
     if (!bins)
     {
-        float r = geom ? geom->GetMaxRadius() : 600;
+        float r = fGeomCam ? fGeomCam->GetMaxRadius() : 600;
         r *= 0.9;
         if (!fUseMmScale)
@@ -312 +313 @@
     SetColors();
     fCenter->Draw("colz");
+    if (fGeomCam)
+    {
+        MHCamera *cam = new MHCamera(*fGeomCam);
+        cam->Draw("same");
+        cam->SetBit(kCanDelete);
+    }
 
     pad->cd(5);

trunk/MagicSoft/Mars/mimage/MHHillas.h

@@ -9 +9 @@
 class TH2F;
 class MHillas;
+class MGeomCam;
 
 class MHHillas : public MH
@@ -24 +25 @@
 
     void SetColors() const;
+
+    MGeomCam *fGeomCam; //! Camera geometry for plots (for the moment this is a feature for a loop only!)
 
     Float_t fMm2Deg;