Changeset 7342 for trunk/MagicSoft/Mars/mgeom

Timestamp:

09/06/05 11:58:35 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

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

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -68 +68 @@
 //
 // Default Constructor
-//
+/*
 MGeomCam::MGeomCam()
-    : fNumPixels(0), fCamDist(0), fConvMm2Deg(0), /*fPixels(1000),*/ fMaxRadius(1), fMinRadius(1)
+    : fNumPixels(0), fCamDist(0), fConvMm2Deg(0),  fMaxRadius(1), fMinRadius(1)
 {
     fName  = "MGeomCam";
     fTitle = "Storage container for a camera geometry";
 }
-
+*/
 // --------------------------------------------------------------------------
 //
@@ -313 +313 @@
 TObject *MGeomCam::Clone(const char *newname) const
 {
-    if (IsA()==MGeomCam::Class())
+    //if (IsA()==MGeomCam::Class())
     {
         MGeomCam *cam = new MGeomCam(fNumPixels, fCamDist);

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -43 +43 @@
 
 public:
-    MGeomCam();
-    MGeomCam(UInt_t npix, Float_t dist, const char *name=NULL, const char *title=NULL);
+    //MGeomCam();
+    MGeomCam(UInt_t npix=0, Float_t dist=1, const char *name=NULL, const char *title=NULL);
 
     virtual TObject *Clone(const char *newname=NULL) const;

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -76 +76 @@
     //  default constructor
     Set(x, y, r, s, a);
+    SetNeighbors();
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -32 +32 @@
 
 public:
-    MGeomPix(Float_t x=0, Float_t y=0, Float_t d=0, UInt_t s=0, UInt_t aidx=0);
+    MGeomPix(Float_t x=0, Float_t y=0, Float_t d=1, UInt_t s=0, UInt_t aidx=0);
 
     void Copy(TObject &obj) const
@@ -50 +50 @@
     void Print(Option_t *opt=NULL) const;
 
-    void Set(Float_t x, Float_t y, Float_t d, UInt_t s=0, UInt_t aidx=0) { fX=x; fY=y; fD=d; fA=d*d*gsTan60/2; fSector=s; fAidx=aidx; }
+    void Set(Float_t x, Float_t y, Float_t d=1, UInt_t s=0, UInt_t aidx=0) { fX=x; fY=y; fD=d; fA=d*d*gsTan60/2; fSector=s; fAidx=aidx; }
 
     void SetNeighbors(Short_t i0=-1, Short_t i1=-1, Short_t i2=-1,