Changeset 3205 for trunk/MagicSoft/Mars

Timestamp:

02/16/04 16:45:37 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
    * macros/bootcampstandardanalysis.C
    * macros/pedphotcalc.C
+   * mjobs/MJCalibration.cc
      - introduce the blind pixel and PIN diode extraction in the macro
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -53 +53 @@
 #include "MBadPixelsMerge.h"
 #include "MExtractSignal.h"
+#include "MExtractPINDiode.h"
+#include "MExtractBlindPixel.h"
 #include "MExtractSignal2.h"
 #include "MCalibrationCalc.h"
 #include "MFCosmics.h"
 #include "MContinue.h"
+#include "MFillH.h"
 
 #include "MJCalibration.h"
@@ -484 +487 @@
     MBadPixelsMerge  merge(&fBadPixels);
     // MExtractSignal   extract; // Do not use this at the moment...
-    MExtractSignal2  extract;
-    MCalibrationCalc calcalc;
-
+    MExtractPINDiode   pinext;
+    MExtractBlindPixel blindext;
+    MExtractSignal2    extract;
+    MCalibrationCalc   calcalc;
+
+    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     // 
     // Apply a filter against cosmics
@@ -506 +512 @@
     tlist.AddToList(&merge);
     tlist.AddToList(&extract);
+    tlist.AddToList(&pinext);  
+    tlist.AddToList(&blindext);
     tlist.AddToList(&cont);
     tlist.AddToList(&calcalc);
+    tlist.AddToList(&fillpin);
 
     // Create and setup the eventloop