Changeset 3438

Timestamp:

03/07/04 21:11:42 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/pedphotcalc.C (modified) (4 diffs)
• mjobs/MJCalibration.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -50 +50 @@
     - add MBadPixelsCam
 
+  * mcalib/MCalibrate.[h,cc]
+  * mcalib/MCalibrateData.[h,cc]
+    - implemented calls to MBadPixelsCam
+
+  * macros/calibration.C
+  * macros/bootcampstandardanalysis.C
+  * macros/pedphotcalc.C
+    - implemented calls to MBadPixelsCam
+
+  * mjobs/MJCalibration.cc
+    - call to MBadPixelsCam
+     
 
 2004/03/05: Nadia Tonello

trunk/MagicSoft/Mars/macros/pedphotcalc.C

@@ -17 +17 @@
 !   Author(s): Josep  Flix,  01/2004 <mailto:jflix@ifae.es>
 !              Javier Rico,  01/2004 <mailto:jrico@ifae.es>
+!              Markus Gaug,  03/2004 <mailto:markus@ifae.es>
 !
 !   (based on bootcampstandardanalysis.C by Javier López)
@@ -51 +52 @@
 #include "MPedPhotCalc.h"
 #include "MPedPhotCam.h"
+#include "MBadPixelsCam.h"
 #include "MHCamera.h"
 
@@ -120 +122 @@
   MCalibrationChargeCam calcam;
   MExtractedSignalCam   sigcam;
+  MBadPixelsCam         badcam;
 
   MCalibrationChargeCam        chargecam;
@@ -131 +134 @@
   plist2.AddToList(&calcam);
   plist2.AddToList(&sigcam);
+  plist2.AddToList(&badcam);  
   plist2.AddToList(&chargecam);
   plist2.AddToList(&chargepin);  

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz, 1/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
+!              Markus Gaug, 02/2004 <mailto:markus@ifae.es>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -55 +56 @@
 #include "MGeomApply.h"
 #include "MBadPixelsMerge.h"
+#include "MBadPixelsCam.h"
 #include "MExtractSignal.h"
 #include "MExtractPINDiode.h"
@@ -498 +500 @@
     plist.AddToList(&tlist);
 
-    MGeomApply              apply;
-    MBadPixelsMerge         merge(&fBadPixels);
-    // MExtractSignal   extract; // Do not use this at the moment...
+    MGeomApply               apply;
+    MBadPixelsMerge          merge(&fBadPixels);
     MExtractPINDiode         pinext;
     MExtractBlindPixel       blindext;
+    // MExtractSignal   extract; // Do not use this at the moment...
     MExtractSignal2          extract;
     MCalibrationChargeCalc   calcalc;