Index: trunk/MagicSoft/Mars/mhist/MFillH.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillH.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MFillH.cc (revision 1082) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 07/2001 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 07/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -44,4 +44,6 @@ // yourself, using MReadTree::EnableBranch() // // // +// Checkout the Warning in MTaskList. // +// // // Input Containers: // // A parameter container // @@ -88,6 +90,6 @@ Init(name, title); + fHName = hist; fParContainerName = par; - fHName = hist; } @@ -105,6 +107,7 @@ Init(name, title); + fHName = hist; fParContainer = par; - fHName = hist; + fParContainerName = par->GetName(); } @@ -122,6 +125,7 @@ Init(name, title); + fH = hist; + fHName = hist->GetName(); fParContainerName = par; - fH = hist; } @@ -139,6 +143,8 @@ Init(name, title); + fH = hist; + fHName = hist->GetName(); fParContainer = par; - fH = hist; + fParContainerName = par->GetName(); } @@ -158,5 +164,5 @@ if (!fParContainer) { - *fLog << dbginf << fParContainerName << " [MParContainer] not found... aborting." << endl; + *fLog << err << dbginf << fParContainerName << " [MParContainer] not found... aborting." << endl; return kFALSE; } @@ -172,5 +178,5 @@ if (!fH->InheritsFrom("MH")) { - *fLog << dbginf << fH->GetDescriptor() << " "; + *fLog << err << dbginf << fH->GetDescriptor() << " "; *fLog << "doesn't inherit from MH - cannot be used for MFillH... aborting." << endl; return kFALSE; Index: trunk/MagicSoft/Mars/mhist/MH.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MH.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MH.cc (revision 1082) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 07/2001 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 07/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/mhist/MHFadcCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHFadcCam.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MHFadcCam.cc (revision 1082) @@ -16,6 +16,6 @@ ! ! -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 +! Author(s): Harald Kornmayer 1/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -44,5 +44,4 @@ // creates an a list of histograms for all pixels and both gain channels // -#include MHFadcCam::MHFadcCam(const char *name, const char *title) { Index: trunk/MagicSoft/Mars/mhist/MHFadcPix.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHFadcPix.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MHFadcPix.cc (revision 1082) @@ -16,6 +16,6 @@ ! ! -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 +! Author(s): Harald Kornmayer 1/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/mhist/MHHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHHillas.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MHHillas.cc (revision 1082) @@ -1,2 +1,26 @@ +/* ======================================================================== *\ +! +! * +! * 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 2001 +! +! Copyright: MAGIC Software Development, 2000-2001 +! +! +\* ======================================================================== */ + /////////////////////////////////////////////////////////////////////// // Index: trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 1082) @@ -16,6 +16,6 @@ ! ! -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 +! Author(s): Harald Kornmayer 1/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc (revision 1082) @@ -16,5 +16,6 @@ ! ! -! Author(s): Javier Lopez 05/2001 (jlopez@ifae.es) +! Author(s): Javier Lopez 05/2001 +! Author(s): Thomas Bretz 05/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -42,4 +43,7 @@ #include "MH.h" + +#include "MLog.h" +#include "MLogManip.h" ClassImp(MHMcEnergy); @@ -210,5 +214,5 @@ void MHMcEnergy::Print(Option_t*) const { - cout << "Threshold: " << fThreshold << " +- " << fThresholdErr << endl; + *fLog << all << "Threshold: " << fThreshold << " +- " << fThresholdErr << endl; } Index: trunk/MagicSoft/Mars/mhist/MHMcRate.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcRate.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MHMcRate.cc (revision 1082) @@ -16,6 +16,6 @@ ! ! -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 +! Author(s): Harald Kornmayer 1/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -196,5 +196,5 @@ void MHMcRate::Print(Option_t *) const { - *fLog << "Incident rate " << fShowerRate << " Hz " << endl; + *fLog << all << "Incident rate " << fShowerRate << " Hz " << endl; *fLog << "Trigger Rate " << fTriggerRate << " +- " << fTriggerRateError << " Hz" << endl; } @@ -206,10 +206,10 @@ void MHMcRate::Draw(Option_t *) { - *fLog << dbginf << "To be iplemented" << endl; + *fLog << all << dbginf << " - MHMcRate::Draw: To be iplemented" << endl; } TObject *MHMcRate::DrawClone(Option_t *) const { - *fLog << dbginf << "To be iplemented" << endl; + *fLog << all << dbginf << " - MHMcRate::DrawClone: To be iplemented" << endl; return NULL; } Index: trunk/MagicSoft/Mars/mhist/MHStarMap.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 1077) +++ trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 1082) @@ -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