Index: trunk/MagicSoft/Mars/mgui/MCamDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 959) +++ trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 961) @@ -89,7 +89,10 @@ // if (!gPad) - new TCanvas("CamDisplay", "Magic Camera Display", 0, 0, 650, 500); + fDrawingPad = new TCanvas("CamDisplay", "Magic Camera Display", 0, 0, 650, 500); else + { gPad->Clear(); + fDrawingPad = gPad; + } // @@ -123,4 +126,5 @@ void MCamDisplay::DrawPhotNum(const MCerPhotEvt *event) { + fDrawingPad->cd(); // @@ -172,4 +176,6 @@ void MCamDisplay::DrawPhotErr(const MCerPhotEvt *event) { + fDrawingPad->cd(); + // // reset the all pixel colors to a default value Index: trunk/MagicSoft/Mars/mgui/MCamDisplay.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamDisplay.h (revision 959) +++ trunk/MagicSoft/Mars/mgui/MCamDisplay.h (revision 961) @@ -20,4 +20,5 @@ class TBox; class TText; +class TVirtualPad; class TClonesArray; @@ -38,4 +39,6 @@ TClonesArray *fLegend; TClonesArray *fLegText; + + TVirtualPad *fDrawingPad; TBox *GetBox(Int_t i) { return (TBox*) fLegend->At(i); } @@ -71,5 +74,5 @@ } - ClassDef(MCamDisplay, 0) // Display the magic camera + ClassDef(MCamDisplay, 0) // Displays the magic camera }; Index: trunk/MagicSoft/Mars/mgui/MGeomCam.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MGeomCam.h (revision 959) +++ trunk/MagicSoft/Mars/mgui/MGeomCam.h (revision 961) @@ -36,5 +36,5 @@ virtual void Print(Option_t *opt=NULL); - ClassDef(MGeomCam, 1) // Geometry base class for the camera + ClassDef(MGeomCam, 1) // Geometry base class for the camera }; Index: trunk/MagicSoft/Mars/mgui/MGeomPix.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MGeomPix.h (revision 959) +++ trunk/MagicSoft/Mars/mgui/MGeomPix.h (revision 961) @@ -9,35 +9,35 @@ { private: - Float_t fX; // the x coordinate - Float_t fY; // the y coordinate - Float_t fR; // the r coordinate + Float_t fX; // the x coordinate + Float_t fY; // the y coordinate + Float_t fR; // the r coordinate - Byte_t fNumNeighbors; // number of valid neighbors - Short_t fNeighbors[6]; // the IDs of the pixel next to it - // we are assuming an hexagonal geometry + Byte_t fNumNeighbors; // number of valid neighbors + Short_t fNeighbors[6]; // the IDs of the pixel next to it + // we are assuming an hexagonal geometry public: - MGeomPix(Float_t x=0. , Float_t y=0., Float_t r=0.) ; - - void Print(Option_t *opt=NULL) ; + MGeomPix(Float_t x=0, Float_t y=0, Float_t r=0); - void Set (Float_t x, Float_t y, Float_t r) { fX=x; fY=y; fR=r; } + void Print(Option_t *opt=NULL); - void SetNeighbors(Short_t i0=-1, Short_t i1=-1, Short_t i2=-1, - Short_t i3=-1, Short_t i4=-1, Short_t i5=-1); - - void SetX (Float_t x) { fX = x; } - void SetY (Float_t y) { fY = y; } - void SetR (Float_t r) { fR = r; } + void Set (Float_t x, Float_t y, Float_t r) { fX=x; fY=y; fR=r; } - Float_t GetX() const { return fX; } - Float_t GetY() const { return fY; } - Float_t GetR() const { return fR; } + void SetNeighbors(Short_t i0=-1, Short_t i1=-1, Short_t i2=-1, + Short_t i3=-1, Short_t i4=-1, Short_t i5=-1); - Byte_t GetNumNeighbors() const { return fNumNeighbors; } - Short_t GetNeighbor(Byte_t i) const { return fNeighbors[i]; } + void SetX (Float_t x) { fX = x; } + void SetY (Float_t y) { fY = y; } + void SetR (Float_t r) { fR = r; } - ClassDef(MGeomPix, 1) // Geometric class for one pixel -} ; + Float_t GetX() const { return fX; } + Float_t GetY() const { return fY; } + Float_t GetR() const { return fR; } + + Byte_t GetNumNeighbors() const { return fNumNeighbors; } + Short_t GetNeighbor(Byte_t i) const { return fNeighbors[i]; } + + ClassDef(MGeomPix, 1) // Geometry class describing the geometry of one pixel +}; #endif Index: trunk/MagicSoft/Mars/mgui/MHexagon.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MHexagon.h (revision 959) +++ trunk/MagicSoft/Mars/mgui/MHexagon.h (revision 961) @@ -24,36 +24,35 @@ class MGeomPix; -class MHexagon : public TObject, public TAttLine, public TAttFill -{ - protected: - - Float_t fX ; // X coordinate of center - Float_t fY ; // Y coordinate of center - Float_t fD ; // diameter D or better distance between opposite sides - - public: - - MHexagon() ; - MHexagon(Float_t x, Float_t y, Float_t d ) ; - MHexagon(MGeomPix &pix); - MHexagon( const MHexagon &hexagon) ; - virtual ~MHexagon() ; +class MHexagon : public TObject, public TAttLine, public TAttFill +{ +protected: - void Copy ( TObject &hexagon ) ; + Float_t fX; // X coordinate of center + Float_t fY; // Y coordinate of center + Float_t fD; // diameter D or better distance between opposite sides - virtual Int_t DistancetoPrimitive(Int_t px, Int_t py ) ; - virtual void DrawHexagon( Float_t x, Float_t y, Float_t d ) ; - - virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py ) ; - - virtual void ls (Option_t *Option="") ; - virtual void Paint(Option_t *Option="") ; - virtual void PaintHexagon(Float_t x, Float_t y, Float_t d) ; - virtual void Print(Option_t *Option="") ; +public: - ClassDef ( MHexagon, 0 ) // a hexagon for MAGIC + MHexagon(); + MHexagon(Float_t x, Float_t y, Float_t d); + MHexagon(MGeomPix &pix); + MHexagon(const MHexagon &hexagon); + virtual ~MHexagon(); -} ; + void Copy (TObject &hexagon); -#endif + virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); + virtual void DrawHexagon( Float_t x, Float_t y, Float_t d); + virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); + + virtual void ls (Option_t *Option=""); + virtual void Paint(Option_t *Option=""); + virtual void PaintHexagon(Float_t x, Float_t y, Float_t d); + virtual void Print(Option_t *Option=""); + + ClassDef(MHexagon, 0) // A hexagon for MAGIC +}; + +#endif +