Changeset 3862 for trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc

Timestamp:

04/28/04 11:15:08 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc

@@ -54 +54 @@
 #include "MReadMarsFile.h"
 #include "MGeomApply.h"
-#include "MExtractSignal.h"
+#include "MExtractSlidingWindow.h"
+#include "MExtractor.h"
 #include "MFillH.h"
 #include "MCalibrate.h"
@@ -65 +66 @@
 
 using namespace std;
-
-MJExtractCalibTest::MJExtractCalibTest(const char *name, const char *title) : fRuns(0)
+// --------------------------------------------------------------------------
+//
+// Default constructor. 
+//
+// Sets fRuns to 0, fExtractor to NULL
+//
+MJExtractCalibTest::MJExtractCalibTest(const char *name, const char *title) 
+    : fRuns(NULL), fExtractor(NULL)
 {
     fName  = name  ? name  : "MJExtractCalibTest";
@@ -93 +100 @@
   
   // Create histograms to display
-  MHCamera disp1 (geomcam, "Cal;Photons",           "Mean of calibrated Photons");
-  MHCamera disp2 (geomcam, "Cal;SigmaPhotons",      "Sigma of calibrated photons");
-  MHCamera disp3 (geomcam, "Cal;PhotonsPerArea",    "Mean Photons per Area");
-  MHCamera disp4 (geomcam, "Cal;SigmaPhotPerArea",  "Sigma Photons per Area");
+  MHCamera disp1 (geomcam, "Test;Photons",           "Mean of calibrated Photons");
+  MHCamera disp2 (geomcam, "Test;SigmaPhotons",      "Sigma of calibrated photons");
+  MHCamera disp3 (geomcam, "Test;PhotonsPerArea",    "Equiv. Cherenkov Photons per Area");
+  MHCamera disp4 (geomcam, "Test;SigmaPhotPerArea",  "Sigma equiv. Cher. Photons per Area");
 
   // Fitted charge means and sigmas
@@ -199 +206 @@
   static_cast<MRead&>(read).AddFiles(*fRuns);
   
-  MGeomApply      apply; // Only necessary to craete geometry
-  MExtractSignal  extract;
-  MCalibrate      photcalc;
+  MGeomApply            apply; // Only necessary to craete geometry
+  MExtractSlidingWindow extract2;
+  MCalibrate            photcalc;
   photcalc.SetCalibrationMode(MCalibrate::kFfactor);
 
@@ -223 +230 @@
   tlist.AddToList(&read);
   tlist.AddToList(&apply);
-  tlist.AddToList(&extract);
+
+  if (fExtractor)
+    tlist.AddToList(fExtractor);
+    else
+    {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+      tlist.AddToList(&extract2);
+    }
+
   if (TestBit(kEnableGraphicalOutput))
     tlist.AddToList(&fill);
@@ -328 +344 @@
     plist.AddToList(&tlist);
 
-    MGeomApply      apply; // Only necessary to craete geometry
-    MExtractSignal  extract;
-    MCalibrate      calib;
-    MPedPhotCalc    calc;
+    MGeomApply            apply; // Only necessary to craete geometry
+    MExtractSlidingWindow extract2;
+    MCalibrate            calib;
+    MPedPhotCalc          calc;
 
     MHCamEvent evt1("ExtOffset");
@@ -342 +358 @@
     tlist.AddToList(&read);
     tlist.AddToList(&apply);
-    tlist.AddToList(&extract);
+
+    if (fExtractor)
+      tlist.AddToList(fExtractor);
+    else
+      {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+      tlist.AddToList(&extract2);
+    }
+
     if (TestBit(kEnableGraphicalOutput))
         tlist.AddToList(&fill1);