Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 2623) +++ trunk/MagicSoft/Mars/Changelog (revision 2624) @@ -11,4 +11,11 @@ * star.cc, macros/star.C: - works now with MC files and real data. + + * mimage/MHillas.[h.cc], mimage/MHillasExt.[h.cc], + mimage/MHillasSrc.[h.cc]: + - implemented member functions Print(const MGeomCam&) + + * macros/readMagic.C, macros/readCT1.C, mmain/MEventDisplay.cc: + - changed to display deg instead of millimeters Index: trunk/MagicSoft/Mars/macros/readCT1.C =================================================================== --- trunk/MagicSoft/Mars/macros/readCT1.C (revision 2623) +++ trunk/MagicSoft/Mars/macros/readCT1.C (revision 2624) @@ -123,6 +123,6 @@ } - hillas.Print(); - hillasext.Print(); + hillas.Print(*geomcam); + hillasext.Print(*geomcam); newimgpar.Print(); Index: trunk/MagicSoft/Mars/macros/readMagic.C =================================================================== --- trunk/MagicSoft/Mars/macros/readMagic.C (revision 2623) +++ trunk/MagicSoft/Mars/macros/readMagic.C (revision 2624) @@ -134,6 +134,6 @@ } - hillas.Print(); - hillasext.Print(); + hillas.Print(*geomcam); + hillasext.Print(*geomcam); newimgpar.Print(); Index: trunk/MagicSoft/Mars/mimage/MHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mimage/MHillas.cc (revision 2623) +++ trunk/MagicSoft/Mars/mimage/MHillas.cc (revision 2624) @@ -127,11 +127,34 @@ *fLog << all; *fLog << "Basic Image Parameters (" << GetName() << ")" << endl; - *fLog << " - Length [mm] = " << fLength << endl; - *fLog << " - Width [mm] = " << fWidth << endl; - *fLog << " - Delta [deg] = " << fDelta*kRad2Deg << endl; - *fLog << " - Size [1] = " << fSize << " #CherPhot" << endl; - *fLog << " - Meanx [mm] = " << fMeanX << endl; - *fLog << " - Meany [mm] = " << fMeanY << endl; - *fLog << " - atg(y/x) [deg] = " << atg << endl; + *fLog << " - Length [mm] = " << fLength << endl; + *fLog << " - Width [mm] = " << fWidth << endl; + *fLog << " - Delta [deg] = " << fDelta*kRad2Deg << endl; + *fLog << " - Size [1] = " << fSize << " #CherPhot" << endl; + *fLog << " - Meanx [mm] = " << fMeanX << endl; + *fLog << " - Meany [mm] = " << fMeanY << endl; + *fLog << " - atg(y/x) [deg] = " << atg << endl; +} + +// -------------------------------------------------------------------------- +// +// Print the hillas Parameters to *fLog, depending on the geometry in +// units of deg +// +void MHillas::Print(const MGeomCam &geom) const +{ + Double_t atg = atan2(fMeanY, fMeanX)*kRad2Deg; + + if (atg<0) + atg += 180; + + *fLog << all; + *fLog << "Basic Image Parameters (" << GetName() << ")" << endl; + *fLog << " - Length [deg] = " << fLength*geom.GetConvMm2Deg() << endl; + *fLog << " - Width [deg] = " << fWidth *geom.GetConvMm2Deg() << endl; + *fLog << " - Delta [deg] = " << fDelta*kRad2Deg << endl; + *fLog << " - Size [1] = " << fSize << " #CherPhot" << endl; + *fLog << " - Meanx [deg] = " << fMeanX *geom.GetConvMm2Deg() << endl; + *fLog << " - Meany [deg] = " << fMeanY *geom.GetConvMm2Deg() << endl; + *fLog << " - atg(y/x) [deg] = " << atg << endl; } Index: trunk/MagicSoft/Mars/mimage/MHillas.h =================================================================== --- trunk/MagicSoft/Mars/mimage/MHillas.h (revision 2623) +++ trunk/MagicSoft/Mars/mimage/MHillas.h (revision 2624) @@ -33,4 +33,5 @@ Int_t Calc(const MGeomCam &geom, const MCerPhotEvt &pix); + void Print(const MGeomCam &geom) const; void Print(Option_t *opt=NULL) const; void Paint(Option_t *opt=NULL); Index: trunk/MagicSoft/Mars/mimage/MHillasExt.cc =================================================================== --- trunk/MagicSoft/Mars/mimage/MHillasExt.cc (revision 2623) +++ trunk/MagicSoft/Mars/mimage/MHillasExt.cc (revision 2624) @@ -100,10 +100,27 @@ // ------------------------------------------------------------------------- // +// Print contents of MHillasExt to *fLog. +// void MHillasExt::Print(Option_t *) const { + *fLog << all; *fLog << "Extended Image Parameters (" << GetName() << ")" << endl; - *fLog << " - Asymmetry = " << fAsym << " mm" << endl; - *fLog << " - 3rd Moment Long = " << fM3Long << " mm" << endl; - *fLog << " - 3rd Moment Trans = " << fM3Trans << " mm" << endl; + *fLog << " - Asymmetry = " << fAsym << endl; + *fLog << " - 3.Moment Long [mm] = " << fM3Long << endl; + *fLog << " - 3.Moment Trans [mm] = " << fM3Trans << endl; +} + +// ------------------------------------------------------------------------- +// +// Print contents of MHillasExt to *fLog, depending on the geometry in +// units of deg. +// +void MHillasExt::Print(const MGeomCam &geom) const +{ + *fLog << all; + *fLog << "Extended Image Parameters (" << GetName() << ")" << endl; + *fLog << " - Asymmetry = " << fAsym *geom.GetConvMm2Deg() << endl; + *fLog << " - 3.Moment Long [deg] = " << fM3Long *geom.GetConvMm2Deg() << endl; + *fLog << " - 3.Moment Trans [deg] = " << fM3Trans*geom.GetConvMm2Deg() << endl; } Index: trunk/MagicSoft/Mars/mimage/MHillasExt.h =================================================================== --- trunk/MagicSoft/Mars/mimage/MHillasExt.h (revision 2623) +++ trunk/MagicSoft/Mars/mimage/MHillasExt.h (revision 2624) @@ -32,4 +32,5 @@ void Print(Option_t *opt=NULL) const; + void Print(const MGeomCam &geom) const; void Set(const TArrayF &arr); Index: trunk/MagicSoft/Mars/mimage/MHillasSrc.cc =================================================================== --- trunk/MagicSoft/Mars/mimage/MHillasSrc.cc (revision 2623) +++ trunk/MagicSoft/Mars/mimage/MHillasSrc.cc (revision 2624) @@ -69,4 +69,5 @@ #include "MLogManip.h" +#include "MGeomCam.h" #include "MSrcPosCam.h" @@ -148,12 +149,31 @@ } +// -------------------------------------------------------------------------- +// +// Print contents of MHillasSrc to *fLog +// void MHillasSrc::Print(Option_t *) const { *fLog << all; *fLog << "Source dependant Image Parameters (" << GetName() << ")" << endl; - *fLog << " - Dist [mm] = " << fDist << endl; - *fLog << " - Alpha [deg] = " << fAlpha << endl; - *fLog << " - CosDeltaAlpha = " << fCosDeltaAlpha << endl; + *fLog << " - Dist [mm] = " << fDist << endl; + *fLog << " - Alpha [deg] = " << fAlpha << endl; + *fLog << " - CosDeltaAlpha = " << fCosDeltaAlpha << endl; } + +// -------------------------------------------------------------------------- +// +// Print contents of MHillasSrc to *fLog depending on the geometry in +// units of deg. +// +void MHillasSrc::Print(const MGeomCam &geom) const +{ + *fLog << all; + *fLog << "Source dependant Image Parameters (" << GetName() << ")" << endl; + *fLog << " - Dist [deg] = " << fDist*geom.GetConvMm2Deg() << endl; + *fLog << " - Alpha [deg] = " << fAlpha << endl; + *fLog << " - CosDeltaAlpha = " << fCosDeltaAlpha << endl; +} + // -------------------------------------------------------------------------- // Index: trunk/MagicSoft/Mars/mimage/MHillasSrc.h =================================================================== --- trunk/MagicSoft/Mars/mimage/MHillasSrc.h (revision 2623) +++ trunk/MagicSoft/Mars/mimage/MHillasSrc.h (revision 2624) @@ -30,4 +30,5 @@ void Print(Option_t *opt=NULL) const; + void Print(const MGeomCam &geom) const; virtual Bool_t Calc(const MHillas *hillas); Index: trunk/MagicSoft/Mars/mimage/MNewImagePar.cc =================================================================== --- trunk/MagicSoft/Mars/mimage/MNewImagePar.cc (revision 2623) +++ trunk/MagicSoft/Mars/mimage/MNewImagePar.cc (revision 2624) @@ -154,9 +154,9 @@ *fLog << all; *fLog << "New Image Parameters (" << GetName() << ")" << endl; - *fLog << " - Leakage1 = " << fLeakage1 << endl; - *fLog << " - Leakage2 = " << fLeakage2 << endl; - *fLog << " - Conc = " << fConc << " (ratio)" << endl; - *fLog << " - Conc1 = " << fConc1 << " (ratio)" << endl; - *fLog << " - Used Pixels [#] = " << fNumUsedPixels << " Pixels" << endl; - *fLog << " - Core Pixels [#] = " << fNumCorePixels << " Pixels" << endl; + *fLog << " - Leakage1 [1] = " << fLeakage1 << endl; + *fLog << " - Leakage2 [1] = " << fLeakage2 << endl; + *fLog << " - Conc [1] = " << fConc << " (ratio)" << endl; + *fLog << " - Conc1 [1] = " << fConc1 << " (ratio)" << endl; + *fLog << " - Used Pixels [#] = " << fNumUsedPixels << " Pixels" << endl; + *fLog << " - Core Pixels [#] = " << fNumCorePixels << " Pixels" << endl; } Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 2623) +++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 2624) @@ -74,4 +74,7 @@ // Container // +#include "MHillas.h" // MHillas::Print(const MGeomCam&) +#include "MHillasExt.h" // MHillasExt::Print(const MGeomCam&) +#include "MHillasSrc.h" // MHillasSrc::Print(const MGeomCam&) #include "MHEvent.h" // MHEvent #include "MHCamera.h" // MHCamera @@ -372,4 +375,5 @@ { MParList *plist = (MParList*)fEvtLoop->GetParList(); + MGeomCam *geom = (MGeomCam*) plist->FindObject("MGeomCam"); MTaskList *tlist = (MTaskList*)plist->FindObject("MTaskList"); MRawEvtData *raw = (MRawEvtData*)plist->FindObject("MRawEvtData"); @@ -414,7 +418,7 @@ // Print parameters // - plist->FindObject("MHillas")->Print(); - plist->FindObject("MHillasExt")->Print(); - plist->FindObject("MHillasSrc")->Print(); + ((MHillas*) plist->FindObject("MHillas"))->Print(*geom); + ((MHillasExt*)plist->FindObject("MHillasExt"))->Print(*geom); + ((MHillasSrc*)plist->FindObject("MHillasSrc"))->Print(*geom); plist->FindObject("MNewImagePar")->Print();