Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8385) +++ /trunk/MagicSoft/Mars/Changelog (revision 8386) @@ -25,4 +25,10 @@ origin + * mgeom/MGeomCamDwarf.[h,cc]: + - added + + * mgeom/Makefile, mgeom/GeomLinkDef.h: + - added MGeomCamDwarf + Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 8385) +++ /trunk/MagicSoft/Mars/NEWS (revision 8386) @@ -2,4 +2,8 @@ *** + + - mars: The default cleaning is now Abolsute 8.5/4.0. + + - mars: The resource file mars.rc now contains examples for MUX data - merpp: Implemented file format version 8 (MUX FADC data). The 16-bit @@ -14,4 +18,10 @@ - callisto: The code calculating the pulse position checknow takes the pedestal into account + + - ganymed: The output files now contain run- and event-number for all + events, accessible as RunNumber.fVal and EvtNumber.fVal + + - ganymed: Added a plot showing the source position in the camera also + for wobble mode Index: /trunk/MagicSoft/Mars/mgeom/GeomLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mgeom/GeomLinkDef.h (revision 8385) +++ /trunk/MagicSoft/Mars/mgeom/GeomLinkDef.h (revision 8386) @@ -14,4 +14,5 @@ //#pragma link C++ class MGeomCamCT1Daniel+; +#pragma link C++ class MGeomCamDwarf+; #pragma link C++ class MGeomCamMagic+; //#pragma link C++ class MGeomCamMagicHG+; Index: /trunk/MagicSoft/Mars/mgeom/MGeomCamDwarf.cc =================================================================== --- /trunk/MagicSoft/Mars/mgeom/MGeomCamDwarf.cc (revision 8386) +++ /trunk/MagicSoft/Mars/mgeom/MGeomCamDwarf.cc (revision 8386) @@ -0,0 +1,314 @@ +/* ======================================================================== *\ +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Thomas Bretz 03/2007 +! Author(s): Michael Backes 03/2007 +! +! Copyright: MAGIC Software Development, 2000-2007 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MGeomCamDwarf +// +// This class stores the geometry information of the Dwarf camera. +// MGeomCamDwarf cam; // Creates the 313 pixel dwarf camera +// +// It can also be used to create a hexagonal camera with identical sized +// pixels and n rings (while the central pixel is counted as ring 0). +// MGeomCamDwarf cam(9, 21); // Creates the CT3 camera +// +// Or it can be used to create a roundish camera, similar to a +// hexagonal camera, but the edges filled with additional pixels +// inside a circle. +// MGeomCamDwarf cam( +// +//////////////////////////////////////////////////////////////////////////// +#include "MGeomCamDwarf.h" + +#include +#include + +#include "MGeomPix.h" + +ClassImp(MGeomCamDwarf); + +using namespace std; + +// -------------------------------------------------------------------------- +// +// Dwarf camera has 313 pixels. For geometry and Next Neighbor info see +// CreateCam and CreateNN +// +MGeomCamDwarf::MGeomCamDwarf(const char *name) + : MGeomCam(CalcNumPix(9.5), 4.57, name, "Geometry information of Dwarf Camera") +{ + CreateCam(21, 9.5); + CreateNN(); + InitGeometry(); +} + +// -------------------------------------------------------------------------- +// +// Use this to create a camera with a roundish shape and a radius rad in +// millimeter containing the pixel centers. The pixel will have a diameter +// diameter in millimeters, and a distance dist in meters. +// +MGeomCamDwarf::MGeomCamDwarf(Double_t rad, Double_t diameter, Double_t dist, const char *name) + : MGeomCam(CalcNumPix(diameter<=0 ? rad : rad/diameter), dist, name, "Geometry information for a roundish camera") +{ + CreateCam(diameter, diameter<=0 ? rad : rad/diameter); + CreateNN(); + InitGeometry(); +} + +// -------------------------------------------------------------------------- +// +// Use this to create a camera with a hexagonal shape and rings rings. +// The first ring around the central pixel is 1. The pixel will have a +// diameter diameter in millimeters, and a distance dist in meters. +// +MGeomCamDwarf::MGeomCamDwarf(Int_t rings, Double_t diameter, Double_t dist, const char *name) + : MGeomCam(CalcNumPix(rings), dist, name, "Geometry information for a hexagonal camera") +{ + CreateCam(diameter, rings); + CreateNN(); + InitGeometry(); +} + +// -------------------------------------------------------------------------- +// +// Create a clone of this container. This is very easy, because we +// simply have to create a new object of the same type. +// +TObject *MGeomCamDwarf::Clone(const char *newname) const +{ + MGeomCam *cam = new MGeomCam(GetNumPixels(), GetCameraDist()); + for (UInt_t i=0; iInitGeometry(); + return cam; +} + +// -------------------------------------------------------------------------- +// +// Calculate in the direction 0-5 (kind of sector) in the ring-th ring +// the x and y coordinate of the i-th pixel. The unitx are unity, +// distance to (0,0) is retruned. +// +Double_t MGeomCamDwarf::CalcXY(Int_t dir, Int_t ring, Int_t i, Double_t &x, Double_t &y) +{ + const Double_t kSqrt32 = MGeomPix::gsTan60/2; + + switch (dir) + { + case kDirCenter: // Center + x = 0; + y = 0; + break; + + case kDirNE: // Direction North East + x = ring-i*0.5; + y = i*kSqrt32; + break; + + case kDirN: // Direction North + x = ring*0.5-i; + y = ring*kSqrt32; + break; + + case kDirNW: // Direction North West + x = -(ring+i)*0.5; + y = (ring-i)*kSqrt32; + break; + + case kDirSW: // Direction South West + x = 0.5*i-ring; + y = -i*kSqrt32; + break; + + case kDirS: // Direction South + x = i-ring*0.5; + y = -ring*kSqrt32; + break; + + case kDirSE: // Direction South East + x = (ring+i)*0.5; + y = (-ring+i)*kSqrt32; + break; + } + return TMath::Hypot(x, y); +} + +// -------------------------------------------------------------------------- +// +// Calculate in the direction 0-5 (kind of sector) in the ring-th ring +// the x and y coordinate of the i-th pixel. The units are unity, +// distance to (0,0) is retruned. +// +Int_t MGeomCamDwarf::CalcNumPix(Int_t rings) +{ + // + // add the first pixel to the list + // + Int_t cnt = 1; + + for (Int_t ring=0; ring