Changeset 4000 for trunk

Timestamp:

05/07/04 10:45:33 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/bootcampstandardanalysis.C (modified) (4 diffs)
• mpedestal/MPedCalcPedRun.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
      - updated to the latest version of MPedCalcPedRun
 
+   * macros/bootcampstandardanalysis.C
+     - updated to the latest changes in the ArrivalTime Extraction
 
  2004/05/05: Markus Gaug

trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C

@@ -60 +60 @@
 {
 
+  //
+  // Choose the signal Extractor:
+  //
   MExtractSlidingWindow extractor;
+  //  MExtractFixedWindowPeakSearch extractor;
+  //  MExtractFixedWindow    extractor;   
+
+  //
+  // Set Ranges or Windows
+  //
+  extractor.SetRange(5,14,5,14);
+  //  extractor.SetWindows(8,8);
+
+  //
+  // Choose the arrival time Extractor:
+  //
+  MExtractTimeFastSpline       timeext;
+  //  MExtractTimeHighestIntegral timeext;
+  //  MExtractTimeSpline          timeext;
+  //
+  // Set Ranges or Windows
+  //
+  timeext.SetRange(3,12,6,14);
+
 
   MRunIter pruns;
@@ -105 +128 @@
     }
   pedloop.SetBadPixels(badcam);
+  pedloop.SetExtractor(&extractor);
 
   if (!pedloop.Process())
@@ -122 +146 @@
   calloop.SetExtractor(&extractor);
   //
+  // Apply rel. time calibration:
+  //
+  calloop.SetRelTimeCalibration();
+  calloop.SetTimeExtractor(&timeext);
+  //
   // Set the corr. cams:
   //
@@ -131 +160 @@
   if (usedisplay)
       calloop.SetDisplay(display);
-  
-  //
-  // Apply rel. time calibration:
-  //
-  calloop.SetRelTimeCalibration();
-  //
-  // Use as arrival time extractor MArrivalTimeCalc2:
-  //
-  calloop.SetArrivalTimeLevel(2);
   
   //

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -520 +520 @@
   fPedestals->SetReadyToSave();
   fNumSamplesTot += fWindowSizeHiGain + fWindowSizeLoGain;
-  
+
   return kTRUE;
 }