Changeset 2161 for trunk

Timestamp:

06/05/03 10:18:20 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (2 diffs)
• meventdisp/MGCamDisplay.cc (modified) (4 diffs)
• meventdisp/MGEvtDisplay.cc (modified) (4 diffs)
• mfileio/MReadCurrents.cc (modified) (1 diff)
• mhist/MHCerPhotEvt.h (modified) (1 diff)
• mimage/MHillasSrcCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/06/05: Thomas Bretz
+
+   * mbase/MEvtLoop.cc:
+     - fixed some typos in the comments
+     
+   * meventdisp/MGCamDisplay.cc:
+     - added MHillasSrc to eventloop
+     
+   * meventdisp/MGEvtDisplay.cc:
+     - print MC informations to screen, too
+     
+   * mfileio/MReadCurrents.cc:
+     - added a comment
+     
+   * mhist/MHCerPhotEvt.h:
+     - removed typo
+     
+   * mimage/MHillasSrcCalc.cc:
+     - create a default source if now source is available
+
+
 
  2003/06/03: Thomas Bretz

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -35 +35 @@
 // object.                                                                  //
 //                                                                          //
-// If you call Eventloop first all PreProcess functions - with the          //
+// If you call Eventloop() first all PreProcess functions - with the        //
 // parameter list as an argument - of the tasks in the task list are        //
 // executed. If one of them returns kFALSE then the execution is stopped.   //
-// If the preprocessing was ok. The Process funtion of the tasks are        //
-// as long as one function returns kSTOP. Only the tasks which are marked   //
-// marked as "All" or with a string which matches the MInputStreamID of     //
-// MTaskList are executed. If one tasks returns kCONTINUE the pending       //
+// If the preprocessing was ok, The Process function of the tasks are       //
+// executed as long as one function returns kSTOP. Only the tasks which     //
+// are marked as "All" or with a string which matches the MInputStreamID    //
+// of MTaskList are executed. If one tasks returns kCONTINUE the pending    //
 // tasks in the list are skipped and the execution in continued with        //
 // the first one in the list.                                               //
@@ -496 +496 @@
 // --------------------------------------------------------------------------
 //
-//  After you setup (or read) an Evtloop you can use this to write the
-//  eventloop setup as a macro. The default name is "evtloop.C". The default
-//  extension is .C If the extension is not given, .C is added.
-//  I the last character in the argument is a '+' the file is not closed.
+//  After you setup (or read) an Evtloop you can use MakeMacro() to write
+//  the eventloop setup as a macro. The default name is "evtloop.C". The
+//  default extension is .C If the extension is not given, .C is added.
+//  If the last character in the argument is a '+' the file is not closed.
 //  This is usefull if you have an eventloop which runs three times and
 //  you want to write one macro. If the first character is a '+' no

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -38 +38 @@
 #include "MCamDisplay.h"         // MCamDisplay
 #include "MHillasCalc.h"         // MHillasCalc
+#include "MHillasSrcCalc.h"      // MHillasSrcCalc
 #include "MPedestalCam.h"        // MPedestalCam
 #include "MCerPhotCalc.h"        // MCerPhotCalc
@@ -123 +124 @@
     MBlindPixelCalc   *blind = new MBlindPixelCalc;
     MHillasCalc       *hcalc = new MHillasCalc;
+    MHillasSrcCalc    *scalc = new MHillasSrcCalc;
 
     tlist->AddToList(pcopy);
@@ -131 +133 @@
     tlist->AddToList(blind);
     tlist->AddToList(hcalc);
+    tlist->AddToList(scalc);
 
     MGeomCamMagic *geom   = new MGeomCamMagic;
@@ -210 +213 @@
     MHillas *hillas = (MHillas*)plist->FindObject("MHillas");
 
+    hillas->Print();
     plist->FindObject("MHillasExt")->Print();
+    plist->FindObject("MHillasSrc")->Print();
     plist->FindObject("MNewImagePar")->Print();
 
-    hillas->Print();
     if (fDisplayHillas)
     {

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz, 10/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -39 +39 @@
 #include <TG3DLine.h>             // TGHorizontal3DLine
                                   // use TGSplitter instead for root<3.00
+
+#include "MLog.h"
+#include "MLogManip.h"
 
 #include "MParList.h"
@@ -516 +519 @@
     fEvtInfo->SetText(txt);
 
+    gLog << all;
+    gLog.Separator(txt);
+
     //
     // Seems to be necessary to newly layout the upper part to display
@@ -535 +541 @@
     {
         GetReader()->DecEventNum();
+        UpdateMcLabel();
         UpdateDisplay();
-        UpdateMcLabel();
     }
 

trunk/MagicSoft/Mars/mfileio/MReadCurrents.cc

@@ -175 +175 @@
         return kFALSE;
 
+    // FIXME: Calculate number of events!
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.h

@@ -11 +11 @@
 
 class TH1D;
-class MGeamCam;
 class MCamDisplay;
 

trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.cc

@@ -82 +82 @@
     if (!fSrcPos)
     {
-        *fLog << err << dbginf << fSrcName << " [MSrcPosCam] not found... aborting." << endl;
-        return kFALSE;
+        *fLog << warn << fSrcName << " [MSrcPosCam] not found... creating default MSrcPosCam." << endl;
+        fSrcPos = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", fSrcName);
+        if (!fSrcPos)
+            return kFALSE;
     }