Changeset 3392 for trunk/MagicSoft/Mars
- Timestamp:
- 03/04/04 09:59:10 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r3390 r3392 4 4 5 5 -*-*- END OF LINE -*-*- 6 2004/03/04: Thomas Bretz 7 8 * mgeom/MGeomCam.[h,cc]: 9 - added new data member fNumAreas 10 - added new function CalcNumAreas 11 - increased class version to 3 12 13 * mgeom/MGeomCamMagic.cc: 14 - added setting of area index 15 16 * mgeom/MGeomPix.[h,cc]: 17 - added fAidx data member 18 - added getter function fAidx 19 - increased class version to 3 20 21 22 6 23 2004/03/03: Thomas Bretz 7 24 … … 39 56 - The calculation of the arrival times is made only when needed 40 57 (when the HalfMax is over the pedestal) 58 41 59 * mtools/MCubicSpline.cc 42 60 - Commented out an annoying warn 61 62 43 63 44 64 2004/03/03: Abelardo Moralejo -
trunk/MagicSoft/Mars/mgeom/MGeomCam.cc
r3387 r3392 45 45 // - added fPixRatioSqrt 46 46 // 47 // Version 3: 48 // ---------- 49 // - added fNumAreas 50 // 47 51 ///////////////////////////////////////////////////////////////////////////// 48 52 #include "MGeomCam.h" … … 166 170 // -------------------------------------------------------------------------- 167 171 // 172 // Calculate the highest area index+1 of all pixels, please make sure 173 // the the area indices are continous. 174 // 175 void MGeomCam::CalcNumAreas() 176 { 177 fNumAreas = 0; 178 179 for (UInt_t i=0; i<fNumPixels; i++) 180 { 181 const UInt_t s = (*this)[i].GetAidx(); 182 183 if (s>fNumAreas) 184 fNumAreas = s; 185 } 186 187 fNumAreas++; 188 } 189 190 // -------------------------------------------------------------------------- 191 // 168 192 // Calculate the maximum radius of the camera. This is ment for GUI layout. 169 193 // … … 235 259 return (TObject*)IsA()->New(); 236 260 } 261 /* 262 void MGeomCam::Streamer(TBuffer &R__b) 263 { 264 // Stream an object of class MGeomCam. 265 266 if (R__b.IsReading()) 267 { 268 MGeomCam::Class()->ReadBuffer(R__b, this); 269 270 UInt_t R__s, R__c; 271 Version_t R__v = b.ReadVersion(&R__s, &R__c); 272 if (R__v > 2) { 273 MGeomCam::Class()->ReadBuffer(b, this, R__v, R__s, R__c); 274 275 Version_t v = MGeomCam::Class()->GetClassVersion(); 276 } 277 else 278 { 279 MGeomCam::Class()->WriteBuffer(R__b, this); 280 } 281 } 282 */ -
trunk/MagicSoft/Mars/mgeom/MGeomCam.h
r3064 r3392 29 29 30 30 UInt_t fNumSectors; // Number of sectors 31 UInt_t fNumAreas; // Number of different pixel sizes 31 32 32 33 protected: 33 34 void CalcMaxRadius(); 34 35 void CalcNumSectors(); 36 void CalcNumAreas(); 35 37 void InitOuterRing(); 36 38 void InitGeometry() 37 39 { 38 40 CalcNumSectors(); 41 CalcNumAreas(); 39 42 CalcMaxRadius(); 40 43 CalcPixRatio(); … … 60 63 Float_t GetMaxRadius() const { return fMaxRadius; } 61 64 UInt_t GetNumSectors() const { return fNumSectors; } 65 UInt_t GetNumAreas() const { return fNumAreas; } 62 66 Float_t GetPixRatio(UInt_t i) const; 63 67 Float_t GetPixRatioSqrt(UInt_t i) const; … … 68 72 virtual void Print(Option_t *opt=NULL) const; 69 73 70 ClassDef(MGeomCam, 2) // Geometry base class for the camera74 ClassDef(MGeomCam, 3) // Geometry base class for the camera 71 75 }; 72 76 -
trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc
r2521 r3392 329 329 // 330 330 for (UInt_t i=0; i<GetNumPixels(); i++) 331 (*this)[i].Set(xtemp[i], ytemp[i], i>396?60:30, sector[i]); 331 (*this)[i].Set(xtemp[i], ytemp[i], i>396?60:30, sector[i], i>396?1:0); 332 // (*this)[i].Set(xtemp[i], ytemp[i], i>396?60:30, i>396?sector[i]+6:sector[i]); 332 333 } 333 334 -
trunk/MagicSoft/Mars/mgeom/MGeomPix.cc
r2470 r3392 44 44 // - added fA 45 45 // 46 // Version 3: 47 // ---------- 48 // - added fAidx 49 // 46 50 // 47 51 // FIXME: According to an agreement we have to change the name 'Id' to 'idx' … … 67 71 // Initializes one pixel 68 72 // 69 MGeomPix::MGeomPix(Float_t x, Float_t y, Float_t r, UInt_t s )73 MGeomPix::MGeomPix(Float_t x, Float_t y, Float_t r, UInt_t s, UInt_t a) 70 74 { 71 75 // default constructor 72 Set(x, y, r, s );76 Set(x, y, r, s, a); 73 77 } 74 78 -
trunk/MagicSoft/Mars/mgeom/MGeomPix.h
r3112 r3392 28 28 29 29 UInt_t fSector; // Number of sector the pixels corresponds to 30 UInt_t fAidx; // Area index of the pixel 30 31 31 32 public: 32 MGeomPix(Float_t x=0, Float_t y=0, Float_t d=0, UInt_t s=0 );33 MGeomPix(Float_t x=0, Float_t y=0, Float_t d=0, UInt_t s=0, UInt_t aidx=0); 33 34 34 35 void Print(Option_t *opt=NULL) const; 35 36 36 void Set(Float_t x, Float_t y, Float_t d, UInt_t s=0 ) { fX=x; fY=y; fD=d; fA=d*d*gsTan60/2; fSector=s; }37 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; } 37 38 38 39 void SetNeighbors(Short_t i0=-1, Short_t i1=-1, Short_t i2=-1, … … 46 47 UInt_t GetSector() const { return fSector; } 47 48 48 Float_t GetA() const { return fA; /*fD*fD*gsTan60/2;*/ } 49 Float_t GetA() const { return fA; /*fD*fD*gsTan60/2;*/ } 50 Int_t GetAidx() const { return fAidx; } 49 51 50 52 Byte_t GetNumNeighbors() const { return fNumNeighbors; } … … 65 67 */ 66 68 67 ClassDef(MGeomPix, 1) // Geometry class describing the geometry of one pixel69 ClassDef(MGeomPix, 3) // Geometry class describing the geometry of one pixel 68 70 }; 69 71 70 72 #endif 71
Note:
See TracChangeset
for help on using the changeset viewer.