Changeset 5429 for trunk/MagicSoft/Mars/mgeom

Timestamp:

11/18/04 15:35:43 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

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

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -285 +285 @@
     //
     *fLog << all << " Number of Pixels (" << GetTitle() << "): " << fNumPixels << endl;
+    *fLog << " Number of Sectors: " << GetNumSectors() << "  Area-Indices: " << GetNumAreas() << endl;
+    *fLog << " Min.Radius: " << GetMinRadius() << "  Max.Radius: " << GetMaxRadius() << endl;
 
     fPixels.Print();
@@ -296 +298 @@
 TObject *MGeomCam::Clone(const char *newname) const
 {
+    if (IsA()==MGeomCam::Class())
+    {
+        MGeomCam *cam = new MGeomCam(fNumPixels, fCamDist);
+        for (UInt_t i=0; i<fNumPixels; i++)
+            (*this)[i].Copy((*cam)[i]);
+        cam->InitGeometry();
+        return cam;
+    }
+
     return (TObject*)IsA()->New();
 }

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -39 +39 @@
     void CalcNumAreas();
     void InitOuterRing();
-    void InitGeometry()
-    {
-        CalcNumSectors();
-        CalcNumAreas();
-        CalcMaxRadius();
-        CalcPixRatio();
-        InitOuterRing();
-    }
 
 
@@ -59 +51 @@
     // the use of some camera files from the 0.7 beta version in which the 
     // array containing pixel ratios is not initialized.
+    void InitGeometry()
+    {
+        CalcNumSectors();
+        CalcNumAreas();
+        CalcMaxRadius();
+        CalcPixRatio();
+        InitOuterRing();
+    }
 
     Float_t GetCameraDist() const { return fCamDist; }

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -33 +33 @@
 public:
     MGeomPix(Float_t x=0, Float_t y=0, Float_t d=0, UInt_t s=0, UInt_t aidx=0);
+
+    void Copy(TObject &obj) const
+    {
+        MGeomPix &pix = (MGeomPix&)obj;
+        pix.fX = fX;
+        pix.fY = fY;
+        pix.fD = fD;
+        pix.fA = fA;
+        pix.fNumNeighbors = fNumNeighbors;
+        pix.fSector = fSector;
+        pix.fAidx = fAidx;
+        for (int i=0; i<6; i++)
+            pix.fNeighbors[i] = fNeighbors[i];
+    }
 
     void Print(Option_t *opt=NULL) const;