Changeset 3862 for trunk/MagicSoft/Mars/macros

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• bootcampstandardanalysis.C (modified) (6 diffs)
• calibration.C (modified) (3 diffs)
• pedphotcalc.C (modified) (5 diffs)

trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C

@@ -60 +60 @@
 {
 
+  MExtractSlidingWindow extractor;
+
   MRunIter pruns;
   MRunIter cruns;
@@ -118 +120 @@
   MJCalibration     calloop;
   calloop.SetInput(&cruns);
-  //
-  // Use as signal extractor MExtractSignal:
-  //
-  calloop.SetExtractorLevel(1);
+  calloop.SetExtractor(&extractor);
   //
   // Set the corr. cams:
@@ -186 +185 @@
   static_cast<MRead&>(read3).AddFiles(pruns);  
 
-  MExtractSignal   extsig;
   MCalibrate       photcalc;
   photcalc.SetCalibrationMode(MCalibrate::kFfactor);
@@ -193 +191 @@
   tlist3.AddToList(&read3);
   tlist3.AddToList(&geomapl);
-  tlist3.AddToList(&extsig);
+  tlist3.AddToList(&extractor);
   tlist3.AddToList(&photcalc);
   //    tlist3.AddToList(&photrmscalc);
@@ -252 +250 @@
   tlist4.AddToList(&read4);
   tlist4.AddToList(&geomapl);
-  tlist4.AddToList(&extsig);
+  tlist4.AddToList(&extractor);
   tlist4.AddToList(&timecalc);
   tlist4.AddToList(&photcalc);
@@ -264 +262 @@
 
   if (!evtloop4.PreProcess())
-
     return;
   

trunk/MagicSoft/Mars/macros/calibration.C

@@ -63 +63 @@
 {
 
+  MExtractFixedWindowPeakSearch extractor;
   
   MRunIter pruns;
@@ -120 +121 @@
   //
   //  calloop.SetRelTimeCalibration();
+  calloop.SetExtractor(&extractor);
   calloop.SetInput(&cruns);
   calloop.SetDisplay(display);
@@ -134 +136 @@
   MJExtractCalibTest testloop;
 
+  testloop.SetExtractor(&extractor);
   testloop.SetInput(&cruns);
   testloop.SetDisplay(display);

trunk/MagicSoft/Mars/macros/pedphotcalc.C

@@ -65 +65 @@
 #include "MCalibrationQEPix.h"
 #include "MExtractedSignalCam.h"
-#include "MExtractSignal.h" 
+#include "MExtractSlidingWindow.h" 
+#include "MExtractFixedWindow.h" 
 #include "MCerPhotEvt.h"
 #include "MCalibrate.h"
@@ -210 +211 @@
                  )
 {
+
+  MExtractFixedWindow extractor;
   
   MRunIter pruns;
@@ -266 +269 @@
   // Use as signal extractor MExtractSignal:
   //
-  calloop.SetExtractorLevel(1);
+  calloop.SetExtractor(&extractor);
   //
   // The next two commands are for the display:
@@ -313 +316 @@
   static_cast<MRead&>(read3).AddFiles(pruns);  
 
-  MExtractSignal  sigcalc;
   MCalibrate      photcalc;
   photcalc.SetCalibrationMode(MCalibrate::kFfactor);
@@ -320 +322 @@
   tlist3.AddToList(&read3);
   tlist3.AddToList(&geomapl);
-  tlist3.AddToList(&sigcalc);
+  tlist3.AddToList(&extractor);
   tlist3.AddToList(&photcalc);
   tlist3.AddToList(&pedphotcalc);