Changeset 3718

Timestamp:

04/13/04 17:36:05 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -35 +35 @@
      - include <TVector3.h>, otherwise it does not compile on my machine  
 
+   * mjobs/MJPedestals.cc
+     - replaced MBadPixelsMerge by MParList.AddToList(fBadPixels) until 
+       bug in MBadPixelsMerge is resolved (see bugtracker).
 
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -50 +50 @@
 #include "MHCamera.h"
 #include "MPedestalCam.h"
+#include "MBadPixelsCam.h"
 
 #include "MReadMarsFile.h"
@@ -342 +343 @@
     MParList plist;
     plist.AddToList(&fPedestalCam);
+    plist.AddToList(&fBadPixels);
 
     MTaskList tlist;
@@ -347 +349 @@
 
     MGeomApply      geomapl;
-    MBadPixelsMerge merge(&fBadPixels);
+    // MBadPixelsMerge merge(&fBadPixels);
     //MExtractSignal sigcalc;
     MPedCalcPedRun  pedcalc;
@@ -353 +355 @@
     tlist.AddToList(&read);
     tlist.AddToList(&geomapl);
-    tlist.AddToList(&merge);
+    //    tlist.AddToList(&merge);
     //tlist.AddToList(&sigcalc);
     tlist.AddToList(&pedcalc);