Index: trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -84,8 +84,6 @@ const Int_t entries = fPixels->GetEntries(); - *fLog << "MCerPhotEvt::Print()" << endl - << "Number of Pixels: " << fNumPixels - << "(" << entries << ")" - << endl ; + *fLog << GetDescriptor() << dec << endl; + *fLog << " Number of Pixels: " << fNumPixels << "(" << entries << ")" << endl; for (Int_t i=0; i ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -58,13 +58,8 @@ void MCerPhotPix::Print(Option_t *) const { - gLog << "MCerPhotPix: Pixel: "<< fPixId ; - + gLog << GetDescriptor() <<" Pixel: "<< fPixId; gLog << (fIsUsed?" Used ":" Unused "); - gLog << (fIsCore?" Core ":" "); - - gLog << " Nphot= " << fPhot - << " Error(Nphot) = " << fErrPhot - << endl ; + gLog << " Nphot= " << fPhot << " Error(Nphot) = " << fErrPhot << endl; } Index: trunk/MagicSoft/Mars/manalysis/MHillas.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -42,4 +42,10 @@ ///////////////////////////////////////////////////////////////////////////// #include "MImgCleanStd.h" + +#include // atof + +#include // TGFrame +#include // TGLabel +#include // TGTextEntry #include "MLog.h" @@ -52,5 +58,12 @@ #include "MCerPhotEvt.h" +#include "MGGroupFrame.h" // MGGroupFrame + ClassImp(MImgCleanStd); + +enum { + kImgCleanLvl1, + kImgCleanLvl2 +}; // -------------------------------------------------------------------------- @@ -67,5 +80,5 @@ fTitle = title ? title : "Task which does a standard image cleaning"; - *fLog << "Cleaning initialized. Using noise level " << lvl1 << " and " << lvl2 << endl; + Print(); } @@ -273,17 +286,19 @@ } -#include // atof - -#include // TGFrame -#include // TGLabel -#include // TGTextEntry - -#include "MGGroupFrame.h" // MGGroupFrame - -enum { - kImgCleanLvl1, - kImgCleanLvl2 -}; - +// -------------------------------------------------------------------------- +// +// Print descriptor and cleaning levels. +// +void MImgCleanStd::Print(Option_t *o) const +{ + *fLog << GetDescriptor() << " initialized with noise level "; + *fLog << fCleanLvl1 << " and " << fCleanLvl2 << endl; +} + +// -------------------------------------------------------------------------- +// +// Craete two text entry fields, one for each cleaning level and a +// describing text line. +// void MImgCleanStd::CreateGuiElements(MGGroupFrame *f) { @@ -315,6 +330,6 @@ entry2->Associate(f); - TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1 for standard image cleaning."); - TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2 for standard image cleaning."); + TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1"); + TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2"); l1->SetTextJustify(kTextLeft); @@ -348,4 +363,8 @@ } +// -------------------------------------------------------------------------- +// +// Process the GUI Events comming from the two text entry fields. +// Bool_t MImgCleanStd::ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2) { Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -84,4 +84,6 @@ pedcam->InitSize(num); + *fLog << "Pixels: " << num << endl; + for (int i=0; i +! Author(s): Thomas Bretz 05/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc (revision 1077) +++ trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001