Changeset 4274 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/03/04 11:10:01 (21 years ago)

Author:

merck

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJExtractSignal.cc (modified) (5 diffs)
• MJExtractSignal.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

@@ -42 +42 @@
 #include "MTaskList.h"
 #include "MEvtLoop.h"
+#include "MPrint.h"
 
 #include "MHCamera.h"
@@ -59 +60 @@
 #include "MWriteRootFile.h"
 
+#include "MExtractSlidingWindow.h"
+#include "MExtractor.h"
+#include "MExtractTime.h"
+#include "MExtractTimeFastSpline.h"
+
 #include "MJExtractSignal.h"
 #include "MStatusDisplay.h"
@@ -176 +182 @@
   static_cast<MRead&>(read).AddFiles(*fRuns);
   
-  MGeomApply      apply; // Only necessary to craete geometry
-  MBadPixelsMerge merge(&fBadPixels);
-  MExtractSignal  extract;
+  MGeomApply               apply; // Only necessary to craete geometry
+  MBadPixelsMerge          merge(&fBadPixels);
+  MExtractTimeFastSpline   exttime;
+  MExtractSlidingWindow    extcharge; // Only for the cosmics filter
   
   MHCamEvent evt("ExtSignal");
@@ -186 +193 @@
   MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2);
   write.AddContainer("MExtractedSignalCam", "Events");
+  write.AddContainer("MArrivalTimeCam",     "Events");
   write.AddContainer("MTime",               "Events");
   write.AddContainer("MRawEvtHeader",       "Events");
@@ -195 +203 @@
   tlist.AddToList(&apply);
   tlist.AddToList(&merge);
-  tlist.AddToList(&extract);
+  
+  if (fTimeExtractor)
+    tlist.AddToList(fTimeExtractor);
+  else
+  {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractTimeFastSpline " << endl;
+      tlist.AddToList(&exttime);
+  }
+
+  if (fExtractor)
+    tlist.AddToList(fExtractor);
+  else
+  {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+      tlist.AddToList(&extcharge);
+  }
+
+//  MPrint print("MExtractedSignalCam");
+//  tlist.AddToList(&print);
+  
   if (TestBit(kEnableGraphicalOutput))
     tlist.AddToList(&fill);

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h

@@ -17 +17 @@
 class MCalibrationChargeCam;
 class MCalibrationQECam;
+class MExtractor;
+class MExtractTime;
 
 class MJExtractSignal : public MParContainer
@@ -24 +26 @@
 
     MRunIter *fRuns;
+    
+    MExtractor   *fExtractor;                  // Signal extractor
+    MExtractTime *fTimeExtractor;              // Arrival time extractor  
 
     MPedPhotCam   fPedPhotCam;
@@ -48 +53 @@
     const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }
 
+    void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
+    void SetTimeExtractor(MExtractTime* ext)         { fTimeExtractor = ext; }
     void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }