Changeset 4068 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/13/04 17:42:46 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc

@@ -60 +60 @@
 #include "MExtractTime.h"
 #include "MExtractTimeFastSpline.h"
+#include "MFCosmics.h"
+#include "MContinue.h"
 #include "MFillH.h"
 #include "MCalibrate.h"
@@ -263 +265 @@
   fillcam.SetNameTab("Test");
 
-
+  MFCosmics cosmics;
+  MContinue cont(&cosmics);
+  
   tlist.AddToList(&read);
   tlist.AddToList(&apply);
@@ -269 +273 @@
   if (fExtractor)
     tlist.AddToList(fExtractor);
-    else
-    {
+  else
+  {
       *fLog << warn << GetDescriptor() 
             << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
       tlist.AddToList(&extract2);
-    }
+  }
 
   //  if (TestBit(kEnableGraphicalOutput))
+  tlist.AddToList(&cont);
   tlist.AddToList(&fill);
   tlist.AddToList(&photcalc);
@@ -337 +342 @@
   *fLog << endl;
   
-  MArrivalTime  arrtime;
+  MArrivalTime     arrtime;
 
   // Setup Lists
@@ -357 +362 @@
   MGeomApply             apply; // Only necessary to craete geometry
   MExtractTimeFastSpline extract;
+  MExtractSlidingWindow  extcharge; // Only for the cosmics filter
   MCalibrateRelTimes     timecalc;
+  MFCosmics              cosmics;
+  MContinue              cont(&cosmics);
 
   MHCamEvent evt("ExtTimes");
@@ -371 +379 @@
   if (fTimeExtractor)
     tlist.AddToList(fTimeExtractor);
-    else
-    {
+  else
+  {
       *fLog << warn << GetDescriptor() 
             << ": No extractor has been chosen, take default MExtractTimeFastSpline " << endl;
       tlist.AddToList(&extract);
-    }
-
-  //  if (TestBit(kEnableGraphicalOutput))
+  }
+
+  tlist.AddToList(&extcharge);
+  tlist.AddToList(&cont);
   tlist.AddToList(&fill);
   tlist.AddToList(&timecalc);