Changeset 7898 for trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

Timestamp:

08/21/06 15:26:50 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -159 +159 @@
 #include "MExtractPINDiode.h"
 #include "MExtractBlindPixel.h"
-#include "MExtractSlidingWindow.h"
-#include "MExtractTimeHighestIntegral.h"
+//#include "MExtractSlidingWindow.h"
+//#include "MExtractTimeHighestIntegral.h"
+#include "MExtractTimeAndChargeSpline.h"
 #include "MFCosmics.h"
 #include "MFTriggerPattern.h"
@@ -1833 +1834 @@
         InitBlindPixel(blindext, blindcam);
 
-    MExtractSlidingWindow    extract2;
-    MExtractTimeHighestIntegral timehigh;
+//    MExtractSlidingWindow    extract2;
+//    MExtractTimeHighestIntegral timehigh;
     MCalibrationChargeCalc   calcalc;
     MCalibrationRelTimeCalc  timecalc;
@@ -1862 +1863 @@
     // Set default extractors in case, none has been set...
     //
+    /*
     if (!fExtractor)
       fExtractor = &extract2;
     if (!fTimeExtractor)
       fTimeExtractor = &timehigh;
+     */
+    MExtractTimeAndChargeSpline spline;
+    if (!fExtractor)
+      fExtractor = &spline;
+//    if (!fTimeExtractor)
+//      fTimeExtractor = &timehigh;
 
     const Bool_t istimecharge = fExtractor->InheritsFrom("MExtractTimeAndCharge");
+
     //
     // Look if the extractor is a pure charge or also a time extractor