Changeset 7898 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mjobs/MJCalibTest.cc (modified) (3 diffs)
• mjobs/MJCalibration.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
      - made sure that dsum is always set correctly
 
-   * msignal/Makefile, msignal/SignalDef.h:
+   * msignal/Makefile, msignal/SignalLinkDef.h:
      - took out the following classes from make:
        + MExtractFixedWindow
@@ -39 +39 @@
        + MExtractFixedWindowSpline
        + MExtractAmplitudeSpline
+       + MExtrcatTimeSpline
        + MExtractTimeFastSpline
        + MExtractTimeHighestIntegral
        + MExtractTimeAndChargeSlidingWindow
        + MExtractTimeAndChargeDigitalFilterPeakSearch
+
+   * mjobs/MJCalibration.cc, mjobs/MJCalibTest.cc:
+     - replaced default extractor bt our default spline extractor
 
 

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -71 +71 @@
 #include "MGeomApply.h"
 #include "MGeomCam.h"
-#include "MExtractTimeAndChargeSlidingWindow.h"
+#include "MExtractTimeAndChargeSpline.h"
 #include "MExtractor.h"
 #include "MExtractTime.h"
-#include "MExtractTimeFastSpline.h"
+//#include "MExtractTimeFastSpline.h"
 #include "MFCosmics.h"
 #include "MContinue.h"
@@ -406 +406 @@
   MBadPixelsMerge       merge(&badpix);
 
-  MExtractTimeAndChargeSlidingWindow extrsw;
-  MExtractTimeFastSpline             extime;
-  extime.SetPedestals(&pedcam);
+//  MExtractTimeAndChargeSlidingWindow extrsw;
+//  MExtractTimeFastSpline             extime;
+
+  MExtractTimeAndChargeSpline spline;
+
+  spline.SetPedestals(&pedcam);
 
   MTaskEnv taskenv1("ExtractSignal");
@@ -426 +429 @@
   else if (!(extractor1->InheritsFrom("MExtractTimeAndCharge")))
     {
-      extrsw.SetPedestals(&pedcam);
-      extrsw.SetWindowSize(8,8);
-      taskenv2.SetDefault(&extrsw);
+      spline.SetPedestals(&pedcam);
+      spline.SetWindowSize(8,8);
+      taskenv2.SetDefault(&spline);
       *fLog << warn << GetDescriptor() 
             << ": No extractor has been chosen, take default MExtractTimeAndChargeSlidingWindow " << endl;

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