Changeset 1216 for trunk/MagicSoft/Mars/mgui

Timestamp:

02/13/02 16:40:37 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MGeomCam.cc (modified) (1 diff)
• MGeomCam.h (modified) (2 diffs)
• MGeomCamCT1.cc (modified) (1 diff)
• MGeomCamMagic.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mgui/MGeomCam.cc

@@ -49 +49 @@
 // are deleted when the corresponding array is deleted.
 //
-MGeomCam::MGeomCam(UInt_t npix, const char *name, const char *title)
-    : fNumPixels(npix)
+MGeomCam::MGeomCam(UInt_t npix, Float_t dist, const char *name, const char *title)
+    : fNumPixels(npix), fCamDist(dist), fMm2Deg(kRad2Deg/(dist*1000))
 {
     fName  = name  ? name  : "MGeomCam";

trunk/MagicSoft/Mars/mgui/MGeomCam.h

@@ -17 +17 @@
     Float_t  fMaxRadius;  // maximum radius of the camera (eg. for GUI layout)
 
+    Float_t  fCamDist;    // [m] Average distance of the camera from the mirror
+    Float_t  fMm2Deg;     // conversion factor to convert mm in the camera plain into degrees
+
     TObjArray *fPixels;   // Array of singel pixels storing the geometry
 
@@ -24 +27 @@
 public:
 
-    MGeomCam(UInt_t npix, const char *name=NULL, const char *title=NULL);
+    MGeomCam(UInt_t npix, Float_t dist, const char *name=NULL, const char *title=NULL);
 
     virtual ~MGeomCam();
+
+    Float_t GetCameraDist() const { return fCamDist; }
+    Float_t GetConvMm2Deg() const { return fMm2Deg; }
 
     UInt_t  GetNumPixels() const { return fNumPixels; }

trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc

@@ -53 +53 @@
 //  CreateCam and CreateNN
 //
-MGeomCamCT1::MGeomCamCT1(const char *name) : MGeomCam(127, name, "Geometry information of CT1 camera")
+MGeomCamCT1::MGeomCamCT1(const char *name)
+    : MGeomCam(127, 4.88, name, "Geometry information of CT1 camera")
 {
     CreateCam();

trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc

@@ -42 +42 @@
 #include "MGeomPix.h"
 
-ClassImp(MGeomCamMagic)
+ClassImp(MGeomCamMagic);
 
 // --------------------------------------------------------------------------
@@ -49 +49 @@
 //  CreateCam and CreateNN
 //
-MGeomCamMagic::MGeomCamMagic(const char *name) : MGeomCam(577, name, "Geometry information of Magic Camera")
+MGeomCamMagic::MGeomCamMagic(const char *name)
+    : MGeomCam(577, 17, name, "Geometry information of Magic Camera")
 {
     CreateCam();