Changeset 1081 for trunk/MagicSoft/Mars/manalysis

Timestamp:

11/15/01 11:24:06 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1ReadAscii.cc (modified) (1 diff)
• MCerPhotCalc.cc (modified) (1 diff)
• MCerPhotEvt.cc (modified) (2 diffs)
• MCerPhotPix.cc (modified) (2 diffs)
• MHillas.cc (modified) (1 diff)
• MHillasCalc.cc (modified) (1 diff)
• MImgCleanStd.cc (modified) (7 diffs)
• MMcPedestalCopy.cc (modified) (2 diffs)
• MPedCalcPedRun.cc (modified) (1 diff)
• MPedestalCam.cc (modified) (1 diff)
• MPedestalPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

@@ -16 +16 @@
 !
 !
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !   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

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -16 +16 @@
 !
 !
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !   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 +84 @@
     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<entries; i++ )

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

@@ -16 +16 @@
 !
 !
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !   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 +58 @@
 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;
 }
 

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -16 +16 @@
 !
 !
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !   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

trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc

@@ -16 +16 @@
 !
 !
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !   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

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -16 +16 @@
 !
 !
+!   Author(s): Thomas Bretz    12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !   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 +42 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MImgCleanStd.h"
+
+#include <stdlib.h>       // atof
+
+#include <TGFrame.h>      // TGFrame
+#include <TGLabel.h>      // TGLabel
+#include <TGTextEntry.h>  // TGTextEntry
 
 #include "MLog.h"
@@ -52 +58 @@
 #include "MCerPhotEvt.h"
 
+#include "MGGroupFrame.h" // MGGroupFrame
+
 ClassImp(MImgCleanStd);
+
+enum {
+    kImgCleanLvl1,
+    kImgCleanLvl2
+};
 
 // --------------------------------------------------------------------------
@@ -67 +80 @@
     fTitle = title ? title : "Task which does a standard image cleaning";
 
-    *fLog << "Cleaning initialized. Using noise level " << lvl1 << " and " << lvl2 << endl;
+    Print();
 }
 
@@ -273 +286 @@
 }
 
-#include <stdlib.h>       // atof
-
-#include <TGFrame.h>      // TGFrame
-#include <TGLabel.h>      // TGLabel
-#include <TGTextEntry.h>  // 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 +330 @@
     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 +363 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//  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)
 {

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -84 +84 @@
     pedcam->InitSize(num);
 
+    *fLog << "Pixels: " << num << endl;
+
     for (int i=0; i<num; i++)
     {

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Josep Flix 04/2001 (jflix@ifae.es)
-!              Thomas Bretz 05/2001 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Josep Flix 04/2001 <mailto:jflix@ifae.es>
+!   Author(s): Thomas Bretz 05/2001 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001

trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001