Changeset 3431

Timestamp:

03/07/04 18:23:24 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MGeomApply.cc (modified) (2 diffs)
• manalysis/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -11 +11 @@
 
   * mcalib/Makefile
+    - include directory mbadpixels
+
+  * manalysis/Makefile
     - include directory mbadpixels
 
@@ -42 +45 @@
   * mbadpixels/MBadPixelsCalc.cc
     - exchange "SetUnsuitable" by "SetUnsuitableEvt"
+
+  * manalysis/MGeomApply.cc
+    - remove obsolete MArrivalTime
+    - add MBadPixelsCam
 
 

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -72 +72 @@
 #include "MCalibrationChargeCam.h"
 #include "MPedPhotCam.h"
-#include "MArrivalTime.h"
 #include "MExtractedSignalCam.h"
 #include "MBlindPixels.h"
 #include "MArrivalTimeCam.h"
-
+#include "MBadPixelsCam.h"
 
 ClassImp(MGeomApply);
@@ -149 +148 @@
         bnd->InitSize(cam->GetNumPixels());
 
-    MArrivalTime *tme = (MArrivalTime*)pList->FindObject(AddSerialNumber("MArrivalTime"));
+    MArrivalTimeCam *tme = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
     if (tme)
-        tme->InitSize(cam->GetNumPixels());
+      tme->InitSize(cam->GetNumPixels());
 
-    MArrivalTimeCam *tmecam = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
-    if (tmecam)
-      tmecam->InitSize(cam->GetNumPixels());
-
+    MBadPixelsCam *bad = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+    if (bad)
+      bad->InitSize(cam->GetNumPixels());
 
     return kTRUE;

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -25 +25 @@
            -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
            -I../mhistmc -I../mfileio -I../mmain -I../mcalib -I../msignal         \
-           -I../mpointing -I../mtools -I../mfbase
+           -I../mpointing -I../mtools -I../mfbase -I../mbadpixels
 # mcalib: MGeomApply (MCalibrationCam)