Changeset 8923 for trunk

Timestamp:

06/03/08 16:27:48 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MGeomApply.cc (modified) (1 diff)
• mcalib/MCalibrationChargeCam.cc (modified) (3 diffs)
• mcalib/MCalibrationChargePINDiode.cc (modified) (2 diffs)
• mgeom/MGeomPix.cc (modified) (1 diff)
• mgeom/MGeomPix.h (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -205 +205 @@
     // the use of some MC camera files from the 0.7 beta version in which the 
     // array containing pixel ratios is not initialized.
+    geom->StreamerWorkaround();
     geom->CalcPixRatio();
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.71 2007-05-11 13:33:40 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.72 2008-06-03 15:26:39 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -20 +20 @@
 !   Author(s): Markus Gaug   11/2003 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -85 +85 @@
 #include "MCalibrationChargePix.h"
 
+#include <TMath.h>
+
+#include <TH1.h>
+#include <TF1.h>
 #include <TOrdCollection.h>
-#include <TH1D.h>
-#include <TF1.h>
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc

@@ -18 +18 @@
 !   Author(s): Markus Gaug   02/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -52 +52 @@
 #include "MCalibrationChargePINDiode.h"
 #include "MCalibrationChargePix.h"
+
+#include <TMath.h>
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -133 +133 @@
 { 
     //   information about a pixel
-    *fLog << all << "MPixGeom:  x= " << fX << "mm  y= " << fY << "mm ";
-    *fLog << "d= " << fD << "mm  A= " << fA << "mm²" << endl;
+    *fLog << all << "MPixGeom:  x/y=" << fX << "/" << fY << "mm ";
+    *fLog << "d= " << fD << "mm  A= " << fA << "mm² (";
+    for (int i=0; i<fNumNeighbors; i++)
+        *fLog << fNeighbors[i] << (i<fNumNeighbors-1?",":"");
+    *fLog << ")" << endl;
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -25 +25 @@
 private:
     enum {
-        kIsInOutermostRing = BIT(22),
-        kIsInOuterRing     = BIT(23),
-        kUserBits          = 0x1fc000 // 14-21 are allowed
+        kIsInOutermostRing = 0,
+        kIsInOuterRing     = 1,
     };
 
@@ -40 +39 @@
     UInt_t fSector;        // Number of sector the pixels corresponds to
     UInt_t fAidx;          // Area index of the pixel
+
+    Byte_t fUserBits;
 
 public:
@@ -54 +55 @@
         pix.fSector = fSector;
         pix.fAidx = fAidx;
+        pix.fUserBits = fUserBits;
         for (int i=0; i<6; i++)
             pix.fNeighbors[i] = fNeighbors[i];
+
+        TObject::Copy(obj);
     }
 
@@ -83 +87 @@
     Short_t GetNeighbor(Byte_t i) const { return fNeighbors[i]; }
 
-    Bool_t IsInOutermostRing() const { return TestBit(kIsInOutermostRing); }
-    Bool_t IsInOuterRing() const     { return TestBit(kIsInOuterRing); }
+    Bool_t IsInOutermostRing() const { return TESTBIT(fUserBits, kIsInOutermostRing); }
+    Bool_t IsInOuterRing() const     { return TESTBIT(fUserBits, kIsInOuterRing); }
 
     Bool_t IsInside(Float_t px, Float_t py) const;
     Int_t  GetDirection(const MGeomPix &pix) const;
 
-    /*
-     //
-     // These function are for future usage. They are not virtual in
-     // root by now.
-     //
-     void SetBit(UInt_t f, Bool_t set) { set ? TObject::SetBit(f) : TObject::ResetBit(f); }
-     void SetBit(UInt_t f)    { TObject::SetBit(f & kUserBits); }
-     void ResetBit(UInt_t f)  { TObject::ResetBit(f & kUserBits); }
-     void InvertBit(UInt_t f) { TObject InvertBit(f & kUserBits); }
-     */
-
-    ClassDef(MGeomPix, 3) // Geometry class describing the geometry of one pixel
+    ClassDef(MGeomPix, 4) // Geometry class describing the geometry of one pixel
 };